Merge pull request #27 from xdev-software/develop

Release 6.0.0

Author: AB-xdev

.github/dependabot.yml

@@ -4,6 +4,8 @@ updates:
   directory: "/"
   schedule:
     interval: daily
+    # Run it at a specific time so that we don't get emails all day long
+    time: "00:00"
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: "*"
@@ -15,4 +17,6 @@ updates:
   directory: "/"
   schedule:
     interval: daily
+    # Run it at a specific time so that we don't get emails all day long
+    time: "00:00"
   open-pull-requests-limit: 10

.github/workflows/checkBuild.yml

@@ -15,23 +15,22 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        java: [8, 11, 17]
+        java-package: [jdk]
+        distribution: [temurin]
+
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 8
+    - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        distribution: 'zulu'
-        java-version: '8'
-        java-package: jdk+fx
-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
+        distribution: ${{ matrix.distribution }}
+        java-version: ${{ matrix.java }}
+        java-package: ${{ matrix.java-package }}
+        cache: 'maven'
 
     - name: Build with Maven
       run: mvn -B clean verify
@@ -53,3 +52,8 @@ jobs:
           echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && mvn -B clean verify"
           exit 1
         fi
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: jars-java-${{ matrix.java }}
+        path: target/*.jar

.github/workflows/release.yml

@@ -13,17 +13,8 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
-        java-package: jdk+fx
-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
 
     - name: Build with Maven
       run: mvn -B clean verify
@@ -85,7 +76,7 @@ jobs:
         release_name: v${{ steps.version.outputs.release }}
         commitish: master
         body: |
-          ## Installation
+          ## Installation [![Maven Central](https://img.shields.io/maven-central/v/com.xdev-software/xapi-db-mysql-5?versionPrefix=${{ steps.version.outputs.release }})](https://mvnrepository.com/artifact/com.xdev-software/xapi-db-mysql-5)
           Add the following lines to your pom:
           ```XML
           <dependency>
@@ -109,12 +100,11 @@ jobs:
         git config --global user.name "GitHub Actions"
         git pull
     
-    - name: Set up JDK 8 Apache Maven Central
+    - name: Set up JDK 8 OSSRH
       uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
-        java-package: jdk+fx
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
@@ -144,17 +134,8 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
-        java-package: jdk+fx
-
-    - name: Restore - Maven Cache
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-:  
 
     - name: Build dependencies/licenses files
       run: mvn -B project-info-reports:dependencies

.github/workflows/test-deploy.yml

@@ -12,9 +12,8 @@ jobs:
     - name: Set up JDK 8 Apache Maven Central
       uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
-        java-package: jdk+fx
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN

.gitignore

@@ -9,3 +9,4 @@ bin/
 .settings
 .classpath
 .project
+.checkstyle

CHANGELOG.md

@@ -0,0 +1,6 @@
+## 6.0.0
+* Updated to XAPI 6
+* Maven dependency/plugin updates
+
+## 5.0.0
+* Inital open-source release

README.md

@@ -33,10 +33,13 @@ The XDEV Application Framework is released under [GNU Lesser General Public Lice
 View the [summary of all dependencies online](https://xdev-software.github.io/xapi-db-mysql-5/dependencies/)
 
 ## Releasing [![Build](https://img.shields.io/github/workflow/status/xdev-software/xapi-db-mysql-5/Release?label=Release)](https://github.com/xdev-software/xapi-db-mysql-5/actions/workflows/release.yml)
-Consider doing a [test-deployment](https://github.com/xdev-software/xapi-db-mysql-5/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+
+Before releasing:
+* Consider doing a [test-deployment](https://github.com/xdev-software/xapi-db-mysql-5/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+* Check the [changelog](CHANGELOG.md)
 
 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``
-* Add the release notes to the [GitHub release](https://github.com/xdev-software/xapi-db-mysql-5/releases/latest)
+* Link the corresponding version from the [changelog](CHANGELOG.md) to the [GitHub release](https://github.com/xdev-software/xapi-db-mysql-5/releases/latest)