Skip to content

Commit d283ac1

Browse files
authored
Merge pull request #1 from codecentric/codecentric-refactoring
Codecentric refactoring
2 parents 2a826f5 + 21266fb commit d283ac1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+286
-215
lines changed

.github/workflows/maven.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Maven Build
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
10+
- uses: actions/checkout@v2
11+
12+
- name: Set up JDK 11
13+
uses: actions/setup-java@v1
14+
with:
15+
java-version: 11
16+
17+
- name: Build with Maven
18+
run: mvn -B install --no-transfer-progress --file pom.xml
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: release-to-maven-central
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
releaseversion:
6+
description: 'Release version'
7+
required: true
8+
default: '2.0.0'
9+
jobs:
10+
publish:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"
14+
15+
- uses: actions/checkout@v2
16+
17+
- name: Set up settings.xml for Maven Central Repository
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: 11
21+
server-id: oss.sonatype.org
22+
server-username: MAVEN_USERNAME
23+
server-password: MAVEN_PASSWORD
24+
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
25+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
26+
27+
- name: Set projects Maven version to GitHub Action GUI set version
28+
run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress
29+
30+
- name: Publish package
31+
run: mvn --batch-mode clean deploy --no-transfer-progress -P central-deploy -DskipTests=true
32+
env:
33+
MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
34+
MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
35+
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
36+
37+
- name: Generate changelog
38+
id: changelog
39+
uses: metcalfc/[email protected]
40+
with:
41+
myToken: ${{ secrets.GITHUB_TOKEN }}
42+
43+
- name: Create GitHub Release
44+
id: create_release
45+
uses: actions/create-release@v1
46+
env:
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48+
with:
49+
tag_name: ${{ github.event.inputs.releaseversion }}
50+
release_name: ${{ github.event.inputs.releaseversion }}
51+
body: |
52+
Grab the new version from Maven central https://repo1.maven.org/maven2/de/codecentric/reedelk/module-file/${{ github.event.inputs.releaseversion }}/
53+
### Things that changed in this release
54+
${{ steps.changelog.outputs.changelog }}
55+
draft: false
56+
prerelease: false

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>com.reedelk</groupId>
8+
<groupId>de.codecentric.reedelk</groupId>
99
<artifactId>module-parent</artifactId>
10-
<version>1.0.6</version>
10+
<version>2.0.0</version>
1111
</parent>
1212

1313
<packaging>bundle</packaging>
14-
<version>1.0.6</version>
14+
<version>2.0.0</version>
1515
<artifactId>module-file</artifactId>
1616

1717
<properties>

src/main/java/com/reedelk/file/ModuleDefinition.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/main/java/com/reedelk/file/internal/attribute/FileAttribute.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/com/reedelk/file/internal/commons/FileOperation.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/java/com/reedelk/file/internal/commons/LockType.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/java/com/reedelk/file/internal/read/ReadMode.java

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package de.codecentric.reedelk.file;
2+
3+
import de.codecentric.reedelk.runtime.api.annotation.Module;
4+
5+
@Module("File Module")
6+
public class ModuleDefinition {
7+
}
8+

src/main/java/com/reedelk/file/component/FileDelete.java renamed to src/main/java/de/codecentric/reedelk/file/component/FileDelete.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package com.reedelk.file.component;
2-
3-
import com.reedelk.file.internal.attribute.FileAttribute;
4-
import com.reedelk.file.internal.exception.FileDeleteException;
5-
import com.reedelk.file.internal.exception.NotValidFileException;
6-
import com.reedelk.runtime.api.annotation.*;
7-
import com.reedelk.runtime.api.component.ProcessorSync;
8-
import com.reedelk.runtime.api.flow.FlowContext;
9-
import com.reedelk.runtime.api.message.Message;
10-
import com.reedelk.runtime.api.message.MessageBuilder;
11-
import com.reedelk.runtime.api.message.content.MimeType;
12-
import com.reedelk.runtime.api.script.ScriptEngineService;
13-
import com.reedelk.runtime.api.script.dynamicvalue.DynamicString;
1+
package de.codecentric.reedelk.file.component;
2+
3+
import de.codecentric.reedelk.file.internal.attribute.FileAttribute;
4+
import de.codecentric.reedelk.file.internal.exception.FileDeleteException;
5+
import de.codecentric.reedelk.file.internal.exception.NotValidFileException;
6+
import de.codecentric.reedelk.runtime.api.annotation.*;
7+
import de.codecentric.reedelk.runtime.api.component.ProcessorSync;
8+
import de.codecentric.reedelk.runtime.api.flow.FlowContext;
9+
import de.codecentric.reedelk.runtime.api.message.Message;
10+
import de.codecentric.reedelk.runtime.api.message.MessageBuilder;
11+
import de.codecentric.reedelk.runtime.api.message.content.MimeType;
12+
import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
13+
import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicString;
1414
import org.osgi.service.component.annotations.Component;
1515
import org.osgi.service.component.annotations.Reference;
1616
import org.osgi.service.component.annotations.ServiceScope;
@@ -20,9 +20,9 @@
2020
import java.nio.file.Paths;
2121
import java.util.Optional;
2222

23-
import static com.reedelk.file.internal.commons.Messages.FileDelete.ERROR_FILE_DELETE;
24-
import static com.reedelk.file.internal.commons.Messages.FileDelete.FILE_NAME_ERROR;
25-
import static com.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotNull;
23+
import static de.codecentric.reedelk.file.internal.commons.Messages.FileDelete.ERROR_FILE_DELETE;
24+
import static de.codecentric.reedelk.file.internal.commons.Messages.FileDelete.FILE_NAME_ERROR;
25+
import static de.codecentric.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotNull;
2626

2727
@ModuleComponent("File Delete")
2828
@ComponentOutput(

0 commit comments

Comments
 (0)