- Added sonatype snapshot deployment to main workflow for main branch…

… commits (postgis#98)

(cherry picked from commit 36ac392)

- download-maven-plugin updated to v1.6.3
- exec-maven-plugin updated from v1.6.0 to v3.0.0
- git-commit-id-plugin updated to v4.0.4
- jacoco-maven-plugin updated from v0.8.5 to v0.8.7
- maven-checkstyle-plugin updated from v3.1.1 to v3.1.2
- maven-ear-plugin updated from v3.0.2 to v3.2.0
- maven-gpg-plugin updated from v1.6 to v3.0.1
- maven-jxr-plugin updated from v3.0.0 to v3.1.1
- maven-war-plugin updated from v3.2.3 to v3.3.1
- Re-arrange maven plugin declarations to move version specification to plugin management section
  and execution/config info to plugins section
(cherry picked from commit 0dfc7e6)

- git-commit-id-plugin updated from v4.0.4 to v4.0.5
- maven-dependency-plugin updated from v3.1.2 to v3.2.0
- maven-javadoc-plugin updated from v3.2.0 to v3.3.0
- checkstyle updated from v8.42 to v8.43
- postgresql-jdbc updated from v42.2.20 to v42.2.22
- slf4j updated from v1.7.30 to v1.7.31
(cherry picked from commit 046f9e4)

- download-maven-plugin updated from v1.6.3 to v1.6.6
- checkstyle updated from v8.43 to v8.44
- logback-jdbc updated from v1.2.3 to v1.2.4
- postgresql-jdbc updated from v42.2.22 to v4.2.23
- slf4j updated from v1.7.31 to v1.7.32
- testcontainers updated from v1.15.3 to v1.16.0
- zulu8 updated from v8.0.292-1 to v8.0.302-1
- zulu11 updated from v11.0.11-1 to v11.0.12-1
(cherry picked from commit a1bda73)

- add rule to maven-version-rules.xml to pin git-commit-id plugin version (postgis#105)
(cherry picked from commit 2112643)

.github/install-zulu11.sh

@@ -4,7 +4,7 @@ set -euf
 
 AZUL_GPG_KEY=0xB1998361219BD9C9
 ZULU_VERSION=11
-ZULU_RELEASE=11.0.11-1
+ZULU_RELEASE=11.0.12-1
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ${AZUL_GPG_KEY}
 sudo apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main'

.github/install-zulu8.sh

@@ -4,7 +4,7 @@ set -euf
 
 AZUL_GPG_KEY=0xB1998361219BD9C9
 ZULU_VERSION=8
-ZULU_RELEASE=8.0.292-1
+ZULU_RELEASE=8.0.302-1
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ${AZUL_GPG_KEY}
 sudo apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main'

.github/workflows/main.yml

@@ -13,6 +13,11 @@ jobs:
         os: [ubuntu-20.04]
         java_version: [8]
         maven_version: [3.8.1]
+        include:
+          - os: ubuntu-20.04
+            java_version: 8
+            maven_version: 3.8.1
+            maven_deploy: true
     name: Build on OS ${{ matrix.os }} with Maven ${{ matrix.maven_version }} using Zulu ${{ matrix.java_version }}
     runs-on: ${{ matrix.os }}
     env:
@@ -59,3 +64,10 @@ jobs:
 
     - name: Maven build/test
       run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} clean install
+
+    - name: Maven deploy
+      if: ${{ matrix.maven_deploy && (github.ref == 'refs/heads/main') && (github.event_name != 'pull_request')  }}
+      env:
+        OSSRHU: ${{ secrets.OSSRHU }}
+        OSSRHT: ${{ secrets.OSSRHT }}
+      run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} deploy

.travis/install-maven.sh

@@ -3,8 +3,8 @@
 set -euf
 
 MAVEN_BASE_URL=https://archive.apache.org/dist/maven/maven-3/
-MAVEN_VERSION=3.6.3
-MAVEN_SHA=26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5
+MAVEN_VERSION=3.8.1
+MAVEN_SHA=b98a1905eb554d07427b2e5509ff09bd53e2f1dd7a0afa38384968b113abef02
 
 sudo apt-get update
 sudo apt-get install -y curl
@@ -13,7 +13,7 @@ sudo curl -fsSL -o /tmp/apache-maven.tar.gz ${MAVEN_BASE_URL}/${MAVEN_VERSION}/b
 echo "${MAVEN_SHA} /tmp/apache-maven.tar.gz" | sha256sum -c -
 sudo tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1
 sudo rm -f /tmp/apache-maven.tar.gz
-sudo ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+sudo ln -fs /usr/share/maven/bin/mvn /usr/bin/mvn
 mvn -version
 
 set +euf

.travis/install-zulu.sh

@@ -4,7 +4,7 @@ set -euf
 
 AZUL_GPG_KEY=0xB1998361219BD9C9
 ZULU_VERSION=8
-ZULU_RELEASE=8.0.292-1
+ZULU_RELEASE=8.0.302-1
 JAVA_HOME=/usr/lib/jvm/zulu-8-amd64
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ${AZUL_GPG_KEY}
@@ -13,8 +13,8 @@ sudo apt-get update
 sudo apt-get install -y zulu-repo
 sudo apt-get update
 sudo apt-get install -y zulu${ZULU_VERSION}=${ZULU_RELEASE}
-sudo sed -i.orig -e "s/^hl /jre /g" -e "s/^jdkhl /jdk /g" /usr/lib/jvm/.zulu8-ca-amd64.jinfo
-sudo update-java-alternatives --set zulu8-ca-amd64
+sudo sed -i.orig -e "s/^hl /jre /g" -e "s/^jdkhl /jdk /g" /usr/lib/jvm/.zulu${ZULU_VERSION}-ca-amd64.jinfo
+sudo update-java-alternatives --set zulu${ZULU_VERSION}-ca-amd64
 export ALTERNATIVES_JAVAC=$(realpath /etc/alternatives/javac)
 export JAVA_HOME=${ALTERNATIVES_JAVAC%/bin/javac}
 export PATH=$JAVA_HOME/bin:$PATH

maven-version-rules.xml

@@ -9,8 +9,14 @@
         <ignoreVersion type="regex">.*\.jre[6-7]</ignoreVersion>
     </ignoreVersions>
     <rules>
+        <!-- Pin git-commit-id-plugin version to final release version before V5 until codebase migrates to Java11 -->
+        <rule groupId="pl.project13.maven" artifactId="git-commit-id-plugin">
+            <ignoreVersions>
+                <ignoreVersion type="regex">4\.9\.9</ignoreVersion>
+            </ignoreVersions>
+        </rule>
         <!-- Pin testng version to pre-V7 -->
-        <rule groupId="org.testng" artifactId="testng" comparisonMethod="maven">
+        <rule groupId="org.testng" artifactId="testng">
             <ignoreVersions>
                 <ignoreVersion type="regex">7\..*</ignoreVersion>
             </ignoreVersions>