Merge branch 'develop'

Author: stefanseifert

.github/workflows/maven-build.yml

@@ -19,33 +19,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
         java: [8, 11, 17]
+        os: [ubuntu-latest]
+        distribution: [temurin]
 
     steps:
-      # Check out Git repository
       - name: Checkout code
         uses: actions/checkout@v2
 
-      # Set up environment with Java and Maven
       - name: Setup JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
+          cache: 'maven'
 
-      # Set up dependency cache
-      - 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-
-
-      # Build & verify
       - name: Build and verify
         run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify
-
-      # Run code coverage check
-      - name: Run code coverage check
-        run: bash <(curl -s https://codecov.io/bash)

.github/workflows/maven-deploy.yml

@@ -14,39 +14,27 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      # Check out Git repository
       - name: Checkout code
         uses: actions/checkout@v2
 
-      # Configure GIT
       - name: Configure GIT
         run: |
           git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
-      # Set up environment with Java and Maven
       - name: Setup JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: temurin
+          java-version: 8
+          cache: 'maven'
 
-      # Set up dependency cache
-      - 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-
-
-      # Build, deploy to ossrh, generate and stage site
       - name: Build, verify, deploy, generate site
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
 
-      # Deploy site to Github Pages
       - name: Stage and deploy site
         run: >
           ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,2 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

.mvn/wrapper/maven-wrapper.jar

@@ -23,6 +23,21 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.3.0" date="2022-03-15">
+      <action type="update" dev="sseifert">
+        Update to global-parent 43.
+      </action>
+      <action type="update" dev="sseifert">
+        Set SonarCloud properties.
+      </action>
+      <action type="update" dev="sseifert">
+        Remove log4j dependency, update slf4j dependency.
+      </action>
+      <action type="update" dev="sseifert">
+        Set OddEvenVersionPolicy for gitflow-maven-plugin.
+      </action>
+    </release>
+
     <release version="1.2.10" date="2021-12-18">
       <action type="update" dev="sseifert">
         Update to global-parent 40.