Merge pull request #26 from xdev-software/develop

Release 5.1.1

Author: AB-xdev

.github/dependabot.yml

@@ -4,11 +4,15 @@ updates:
   directory: "/"
   schedule:
     interval: daily
-    time: "04:00"
   open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: "*"
+    # GitHub actions are using git tags (v1 = v1.2 = v1.2.3) which should be compatible until a major change is performed
+    update-types: 
+    - "version-update:semver-minor"
+    - "version-update:semver-patch"
 - package-ecosystem: maven
   directory: "/"
   schedule:
     interval: daily
-    time: "04:00"
   open-pull-requests-limit: 10

.github/workflows/develop.yml .github/workflows/checkBuild.yml.github/workflows/develop.yml renamed to .github/workflows/checkBuild.yml

@@ -1,11 +1,15 @@
-name: Develop CI
+name: Check Build
 
 on:
   workflow_dispatch:
   push:
     branches: [ develop ]
+    paths-ignore: 
+      - '**.md'
   pull_request:
     branches: [ develop ]
+    paths-ignore: 
+      - '**.md'
 
 jobs:
   build:
@@ -14,10 +18,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
 
     - name: Cache local Maven repository
       uses: actions/cache@v2

.github/workflows/master.yml .github/workflows/release.yml.github/workflows/master.yml renamed to .github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Master CI
+name: Release
 
 on:
   push:
@@ -10,10 +10,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
 
     - name: Cache local Maven repository
       uses: actions/cache@v2
@@ -107,10 +108,11 @@ jobs:
         git config --global user.name "GitHub Actions"
         git pull
     
-    - name: Set up JDK 1.8 Apache Maven Central
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8 Apache Maven Central
+      uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
@@ -138,9 +140,10 @@ jobs:
         git pull
 
     - name: Setup - Java
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
 
     - name: Restore - Maven Cache
       uses: actions/cache@v1

.github/workflows/test-deploy.yml

@@ -0,0 +1,28 @@
+name: Test Deployment CI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  publish_central: # Publish the code to central
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Set up JDK 8 Apache Maven Central
+      uses: actions/setup-java@v2
+      with: # running setup-java again overwrites the settings.xml
+        distribution: 'adopt'
+        java-version: '8'
+        server-id: ossrh
+        server-username: MAVEN_CENTRAL_USERNAME
+        server-password: MAVEN_CENTRAL_TOKEN
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
+        gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+
+    - name: Publish to Apache Maven Central
+      run: mvn -B deploy -Possrh
+      env:
+        MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

README.md

@@ -1,6 +1,5 @@
-[![Build](https://img.shields.io/github/workflow/status/xdev-software/biapi/Master%20CI)](https://github.com/xdev-software/biapi/actions?query=workflow%3A%22Master+CI%22)
 [![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/biapi)](https://mvnrepository.com/artifact/com.xdev-software/biapi)
-[![Build Develop](https://img.shields.io/github/workflow/status/xdev-software/biapi/Develop%20CI/develop?label=build%20develop)](https://github.com/xdev-software/biapi/actions?query=workflow%3A%22Develop+CI%22+branch%3Adevelop)
+[![Build](https://img.shields.io/github/workflow/status/xdev-software/biapi/Check%20Build/develop)](https://github.com/xdev-software/biapi/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
 [![javadoc](https://javadoc.io/badge2/com.xdev-software/biapi/javadoc.svg)](https://javadoc.io/doc/com.xdev-software/biapi) 
 
 # XDEV BI Suite (BIAPI)
@@ -37,8 +36,10 @@ We encourage you to read the [contribution instructions by GitHub](https://guide
 The XDEV BIAPI is released under [GNU Lesser General Public License version 3](https://www.gnu.org/licenses/lgpl-3.0.en.html) aka LGPL 3
 View the [summary of all dependencies online](https://xdev-software.github.io/biapi/dependencies/)
 
-## Releasing
-If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
+## Releasing [![Build](https://img.shields.io/github/workflow/status/xdev-software/biapi/Release?label=Release)](https://github.com/xdev-software/biapi/actions/workflows/release.yml)
+Consider doing a [test-deployment](https://github.com/xdev-software/biapi/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+
+If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes.
 
 When the release is finished do the following:
 * Merge the auto-generated PR (with the incremented version number) back into the ``develop``

pom.xml

@@ -93,7 +93,7 @@
 		<dependency>
 			<groupId>net.sf.jasperreports</groupId>
 			<artifactId>jasperreports</artifactId>
-			<version>6.16.0</version>
+			<version>6.17.0</version>
 		</dependency>
 	</dependencies>
 
@@ -209,7 +209,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -235,7 +235,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>3.0.1</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>