Merge pull request #1 from codecentric/codecentric-refactoring

Codecentric refactoring

.github/workflows/maven.yml

@@ -0,0 +1,18 @@
+name: Maven Build
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+
+ - uses: actions/checkout@v2
+
+ - name: Set up JDK 11
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+
+ - name: Build with Maven
+ run: mvn -B install --no-transfer-progress --file pom.xml

.github/workflows/release-to-maven-central.yml

@@ -0,0 +1,56 @@
+name: release-to-maven-central
+on:
+ workflow_dispatch:
+ inputs:
+ releaseversion:
+ description: 'Release version'
+ required: true
+ default: '1.1.0'
+jobs:
+ publish:
+ runs-on: ubuntu-latest
+ steps:
+ - run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"
+
+ - uses: actions/checkout@v2
+
+ - name: Set up settings.xml for Maven Central Repository
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ server-id: oss.sonatype.org
+ server-username: MAVEN_USERNAME
+ server-password: MAVEN_PASSWORD
+ gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+ gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+ - name: Set projects Maven version to GitHub Action GUI set version
+ run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress
+
+ - name: Publish package
+ run: mvn --batch-mode clean deploy --no-transfer-progress -P central-deploy -DskipTests=true
+ env:
+ MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+ MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+
+ - name: Generate changelog
+ id: changelog
+ uses: metcalfc/[email protected]
+ with:
+ myToken: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Create GitHub Release
+ id: create_release
+ uses: actions/create-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ tag_name: ${{ github.event.inputs.releaseversion }}
+ release_name: ${{ github.event.inputs.releaseversion }}
+ body: |
+ Grab the new version from Maven central https://repo1.maven.org/maven2/de/codecentric/reedelk/reedelk-runtime/${{ github.event.inputs.releaseversion }}/
+ ### Things that changed in this release
+ ${{ steps.changelog.outputs.changelog }}
+ draft: false
+ prerelease: false

README.md

@@ -4,7 +4,7 @@ REST components and connectors for Reedelk Integration Platform: https://www.ree
 
 ### Creating a test only SSL Certificate
 
-* Create a certificate with com.reedelk.rest.utils.SelfSignedCertificateBuilder
+* Create a certificate with SelfSignedCertificateBuilder
 * cacerts file (stores the certificates) is in the Java Home (e.g /Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/jre/lib/security)
 * List certificates: keytool -list -keystore cacerts
 * Delete certificate (by given alias): sudo keytool -delete -alias reedelktest -keystore cacerts

pom.xml

@@ -5,17 +5,17 @@
  <modelVersion>4.0.0</modelVersion>
 
  <parent>
- <groupId>com.reedelk</groupId>
+ <groupId>de.codecentric.reedelk</groupId>
  <artifactId>module-parent</artifactId>
- <version>1.0.6</version>
+ <version>2.0.0</version>
  </parent>
 
  <packaging>bundle</packaging>
- <version>1.0.6</version>
+ <version>2.0.0</version>
  <artifactId>module-rest</artifactId> <!-- NAME_CONVENTION -->
 
  <properties>
- <reedelk.openapi.version>1.0.6</reedelk.openapi.version>
+ <reedelk.openapi.version>2.0.0</reedelk.openapi.version>
  <maven.compiler.release>8</maven.compiler.release>
  <reactor.addons.version>3.3.3.RELEASE</reactor.addons.version>
  <reactor.netty.version>0.9.8.RELEASE</reactor.netty.version>
@@ -29,6 +29,14 @@
  <jacoco.version>0.8.2</jacoco.version>
  <mockito.version>2.23.0</mockito.version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <!-- Maven Central Release tools -->
+ <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
+ <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
+ <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+ <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+ <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
  </properties>
 
  <dependencies>
@@ -43,7 +51,7 @@
  <version>${reactor.addons.version}</version>
  </dependency>
  <dependency>
- <groupId>com.reedelk</groupId>
+ <groupId>de.codecentric.reedelk</groupId>
  <artifactId>reedelk-openapi</artifactId>
  <version>${reedelk.openapi.version}</version>
  </dependency>
@@ -154,4 +162,96 @@
  </plugin>
  </plugins>
  </build>
+ <profiles>
+ <!-- plugins needed to deploy to Maven Central -->
+ <profile>
+ <id>central-deploy</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${maven-gpg-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <!-- This is necessary for gpg to not try to use the pinentry programs -->
+ <gpgArguments>
+ <arg>--pinentry-mode</arg>
+ <arg>loopback</arg>
+ </gpgArguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>${versions-maven-plugin.version}</version>
+ <configuration>
+ <generateBackupPoms>false</generateBackupPoms>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${maven-deploy-plugin.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>${nexus-staging-maven-plugin.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>oss.sonatype.org</serverId>
+ <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+ <description>${project.version}</description>
+ </configuration>
+ <executions>
+ <execution>
+ <id>deploy-to-sonatype</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>deploy</goal>
+ <goal>release</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
 </project>

src/main/java/de/codecentric/reedelk/rest/ModuleDefinition.java

@@ -0,0 +1,7 @@
+package de.codecentric.reedelk.rest;
+
+import de.codecentric.reedelk.runtime.api.annotation.Module;
+
+@Module("REST Module")
+public class ModuleDefinition {
+}

src/main/java/com/reedelk/rest/component/MultipartMessage.java → src/main/java/de/codecentric/reedelk/rest/component/MultipartMessage.java

@@ -1,17 +1,17 @@
-package com.reedelk.rest.component;
-
-import com.reedelk.rest.component.multipart.PartDefinition;
-import com.reedelk.runtime.api.annotation.*;
-import com.reedelk.runtime.api.commons.StringUtils;
-import com.reedelk.runtime.api.component.ProcessorSync;
-import com.reedelk.runtime.api.flow.FlowContext;
-import com.reedelk.runtime.api.message.Message;
-import com.reedelk.runtime.api.message.MessageBuilder;
-import com.reedelk.runtime.api.message.content.Attachment;
-import com.reedelk.runtime.api.message.content.MimeType;
-import com.reedelk.runtime.api.script.ScriptEngineService;
-import com.reedelk.runtime.api.script.dynamicmap.DynamicStringMap;
-import com.reedelk.runtime.api.script.dynamicvalue.DynamicByteArray;
+package de.codecentric.reedelk.rest.component;
+
+import de.codecentric.reedelk.rest.component.multipart.PartDefinition;
+import de.codecentric.reedelk.runtime.api.annotation.*;
+import de.codecentric.reedelk.runtime.api.commons.StringUtils;
+import de.codecentric.reedelk.runtime.api.component.ProcessorSync;
+import de.codecentric.reedelk.runtime.api.flow.FlowContext;
+import de.codecentric.reedelk.runtime.api.message.Message;
+import de.codecentric.reedelk.runtime.api.message.MessageBuilder;
+import de.codecentric.reedelk.runtime.api.message.content.Attachment;
+import de.codecentric.reedelk.runtime.api.message.content.MimeType;
+import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
+import de.codecentric.reedelk.runtime.api.script.dynamicmap.DynamicStringMap;
+import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicByteArray;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 

src/main/java/com/reedelk/rest/component/RESTClient.java → src/main/java/de/codecentric/reedelk/rest/component/RESTClient.java

@@ -1,29 +1,29 @@
-package com.reedelk.rest.component;
-
-import com.reedelk.rest.component.client.BufferConfiguration;
-import com.reedelk.rest.internal.attribute.RESTClientAttributes;
-import com.reedelk.rest.internal.client.HttpClient;
-import com.reedelk.rest.internal.client.HttpClientFactory;
-import com.reedelk.rest.internal.client.HttpClientResultCallback;
-import com.reedelk.rest.internal.client.body.BodyEvaluator;
-import com.reedelk.rest.internal.client.body.BodyProvider;
-import com.reedelk.rest.internal.client.header.HeaderProvider;
-import com.reedelk.rest.internal.client.header.HeadersEvaluator;
-import com.reedelk.rest.internal.client.strategy.ExecutionStrategyBuilder;
-import com.reedelk.rest.internal.client.strategy.Strategy;
-import com.reedelk.rest.internal.client.uri.UriEvaluator;
-import com.reedelk.rest.internal.client.uri.UriProvider;
-import com.reedelk.rest.internal.commons.RestMethod;
-import com.reedelk.rest.internal.commons.StreamingMode;
-import com.reedelk.runtime.api.annotation.*;
-import com.reedelk.runtime.api.component.OnResult;
-import com.reedelk.runtime.api.component.ProcessorAsync;
-import com.reedelk.runtime.api.converter.ConverterService;
-import com.reedelk.runtime.api.flow.FlowContext;
-import com.reedelk.runtime.api.message.Message;
-import com.reedelk.runtime.api.script.ScriptEngineService;
-import com.reedelk.runtime.api.script.dynamicmap.DynamicStringMap;
-import com.reedelk.runtime.api.script.dynamicvalue.DynamicObject;
+package de.codecentric.reedelk.rest.component;
+
+import de.codecentric.reedelk.rest.component.client.BufferConfiguration;
+import de.codecentric.reedelk.rest.internal.attribute.RESTClientAttributes;
+import de.codecentric.reedelk.rest.internal.client.HttpClient;
+import de.codecentric.reedelk.rest.internal.client.HttpClientFactory;
+import de.codecentric.reedelk.rest.internal.client.HttpClientResultCallback;
+import de.codecentric.reedelk.rest.internal.client.body.BodyEvaluator;
+import de.codecentric.reedelk.rest.internal.client.body.BodyProvider;
+import de.codecentric.reedelk.rest.internal.client.header.HeaderProvider;
+import de.codecentric.reedelk.rest.internal.client.header.HeadersEvaluator;
+import de.codecentric.reedelk.rest.internal.client.strategy.ExecutionStrategyBuilder;
+import de.codecentric.reedelk.rest.internal.client.strategy.Strategy;
+import de.codecentric.reedelk.rest.internal.client.uri.UriEvaluator;
+import de.codecentric.reedelk.rest.internal.client.uri.UriProvider;
+import de.codecentric.reedelk.rest.internal.commons.RestMethod;
+import de.codecentric.reedelk.rest.internal.commons.StreamingMode;
+import de.codecentric.reedelk.runtime.api.annotation.*;
+import de.codecentric.reedelk.runtime.api.component.OnResult;
+import de.codecentric.reedelk.runtime.api.component.ProcessorAsync;
+import de.codecentric.reedelk.runtime.api.converter.ConverterService;
+import de.codecentric.reedelk.runtime.api.flow.FlowContext;
+import de.codecentric.reedelk.runtime.api.message.Message;
+import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
+import de.codecentric.reedelk.runtime.api.script.dynamicmap.DynamicStringMap;
+import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicObject;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 

src/main/java/com/reedelk/rest/component/RESTClientConfiguration.java → src/main/java/de/codecentric/reedelk/rest/component/RESTClientConfiguration.java

@@ -1,9 +1,9 @@
-package com.reedelk.rest.component;
+package de.codecentric.reedelk.rest.component;
 
-import com.reedelk.rest.component.client.*;
-import com.reedelk.rest.internal.commons.HttpProtocol;
-import com.reedelk.runtime.api.annotation.*;
-import com.reedelk.runtime.api.component.Implementor;
+import de.codecentric.reedelk.rest.component.client.*;
+import de.codecentric.reedelk.rest.internal.commons.HttpProtocol;
+import de.codecentric.reedelk.runtime.api.annotation.*;
+import de.codecentric.reedelk.runtime.api.component.Implementor;
 import org.osgi.service.component.annotations.Component;
 
 import static org.osgi.service.component.annotations.ServiceScope.PROTOTYPE;