Merge branch 'develop'

.github/workflows/maven-publish.yml

@@ -6,6 +6,8 @@ name: Maven Package
 on:
   push:
     # Sequence of patterns matched against refs/tags
+    branches: 
+      - 'test-github-actions*' # Allow a special branch for testing
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 

.github/workflows/maven.yml

@@ -38,17 +38,27 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
+        server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+        server-username: OSSRH_USERNAME  # env variable for username in deploy
+        server-password: OSSRH_PASSWORD  # env variable for token in deploy
 
     - name: Build and analyze
+      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-
-    - run: mkdir staging && cp target/*.jar staging
+        BUILD_NUMBER: ${{ github.run_id }}-${{ github.run_number }}
 
     - name: Upload Maven build artifact
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: artifact
-        path: staging
+        path: target/*.jar
+
+    # Upload if develop branch
+    - name: Upload snapshot to OSSRH if development release
+      if: ${{ github.ref == 'refs/heads/develop' && github.event_name == 'push' }}
+      run: mvn deploy --batch-mode --update-snapshots -P !sign,!build-extras,deploy-ossrh -Dmaven.test.skip=true -DskipChecks -DskipTest
+      env:
+        OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
+        OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}

.gitignore

@@ -1,3 +1,21 @@
-/target/
-/bin/
-local-upload.bat
+.antlr*
+.classpath
+.idea
+.project
+.DS_Store
+*.iml
+npm-debug.log
+.build.log
+
+.metadata/
+bin/
+target/
+src-gen/
+xtend-gen/
+.history/
+
+*/plugin.xml_gen
+**/.settings/org.eclipse.*
+
+.vscode
+.factorypath

pom.xml

@@ -1,13 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
 	<name>eBUS library configuration</name>
 	<description>eBUS library configuration</description>
 	<groupId>de.cs-dev.ebus</groupId>
 	<artifactId>ebus-configuration</artifactId>
-	<version>1.1.2</version>
+	<version>1.1.3</version>
 	<url>https://github.com/csowada/ebus-configuration</url>
 	<packaging>bundle</packaging>
 
@@ -18,10 +18,12 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.release>8</maven.compiler.release>
 		<license.year>2020</license.year>
-		<!-- <bundle.version>1.1.0.${maven.build.timestamp}</bundle.version> -->
+		<bundle.version>${project.version}</bundle.version>
 		<sonar.projectKey>csowada_ebus-configuration</sonar.projectKey>
 		<sonar.organization>csowada</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
+
+		<ebus.core.version>1.1.3</ebus.core.version>
 	</properties>
 
 	<organization>
@@ -107,7 +109,7 @@
 						<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Name>${project.name}</Bundle-Name>
 						<Bundle-Version>${bundle.version}</Bundle-Version>
-						<Export-Package>de.csdev.ebus.configuration.*</Export-Package>                      
+						<Export-Package>de.csdev.ebus.configuration.*</Export-Package>
 						<Build-Timestamp>${maven.build.timestamp}</Build-Timestamp>
 						<Build-Commit>${buildNumber}</Build-Commit>
 						<Build-Branch>${scmBranch}</Build-Branch>
@@ -116,18 +118,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.8</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>ossrh</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>false</autoReleaseAfterClose>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
@@ -174,7 +164,6 @@
 	</build>
 
 	<profiles>
-
 		<profile>
 			<id>sign</id>
 			<build>
@@ -190,6 +179,13 @@
 								<goals>
 									<goal>sign</goal>
 								</goals>
+								<configuration>
+									<!-- Prevent `gpg` from using pinentry programs -->
+									<gpgArguments>
+										<arg>--pinentry-mode</arg>
+										<arg>loopback</arg>
+									</gpgArguments>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>
@@ -276,44 +272,56 @@
 
 			<distributionManagement>
 				<repository>
-				<id>github</id>
-				<name>GitHub Packages</name>
-				<url>https://maven.pkg.github.com/csowada/ebus-configuration</url>
+					<id>github</id>
+					<name>GitHub Packages</name>
+					<url>https://maven.pkg.github.com/csowada/ebus-configuration</url>
 				</repository>
 			</distributionManagement>
 		</profile>
-
 	</profiles>
 
+	<repositories>
+		<repository>
+			<id>snapshots-repo</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>4.13.1</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 			<version>2.5</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 			<version>2.6</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>de.cs-dev.ebus</groupId>
 			<artifactId>ebus-core</artifactId>
-			<version>1.1.2</version>
+			<version>${ebus.core.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.osgi.core</artifactId>
@@ -341,9 +349,6 @@
 			<version>2.2.100</version>
 			<scope>provided</scope>
 		</dependency>
-
-
-
 	</dependencies>
 
 </project>

src/main/java/de/csdev/ebus/configuration/EBusConfigurationVersion.java

@@ -12,6 +12,10 @@
 
 public class EBusConfigurationVersion extends EBusVersion {
 
+    private EBusConfigurationVersion() {
+        throw new IllegalStateException("Utility class");
+    }
+
     public static String getVersion() {
         return getVersion(EBusConfigurationVersion.class);
     }