From f6ac473c16e2aaa15f4e8da46d7fa3f93703a714 Mon Sep 17 00:00:00 2001
From: Phillip Ross <phillipross@users.noreply.github.com>
Date: Wed, 6 Dec 2023 07:58:50 -0500
Subject: [PATCH] Updates (#128)

- remove reporting output encoding properties from pom.xml file
- update minimum maven requirement from v3.6 to v3.8
- update test container image from postgis v15-3.3-alpine to v16-3.4-alpine
- build-helper-maven-plugin updated from v3.3.0 to v3.5.0
- download-maven-plugin updated from v1.6.8 to v1.7.1
- exec-maven-plugin updated from v3.1.0 to v3.1.1
- jacoco-maven-plugin updated from v0.8.8 to v0.8.11
- maven-assembly-plugin updated from v3.4.2 to v3.6.0
- maven-checkstyle-plugin updated from v3.2.0 to v3.3.1
- maven-clean-plugin updated from v3.2.0 to v3.3.2
- maven-compiler-plugin updated from v3.10.1 to v3.11.0
- maven-dependency-plugin updated from v3.4.0 to v3.6.1
- maven-deploy-plugin updated from v3.0.0 to v3.1.1
- maven-enforcer-plugin updated from v3.1.0 to v3.4.1
- maven-failsafe-plugin updated from v2.22.2 to v3.2.2
- maven-gpg-plugin updated from v3.0.1 to v3.1.0
- maven-install-plugin updated from v3.1.0 to v3.1.1
- maven-javadoc-plugin updated from v3.4.1 to v3.6.3
- maven-jxr-plugin updated from v3.3.0 to v3.3.1
- maven-pmd-plugin updated from v3.19.0 to v3.21.2
- maven-project-info-reports-plugin updated from v3.4.1 to v3.5.0
- maven-release-plugin updated from v2.5.3 to v3.0.1
- maven-resources-plugin updated from v3.3.0 to v3.3.1
- maven-shade-plugin updated from v3.4.1 to v3.5.1
- maven-source-plugin updated from v3.2.1 to v3.3.0
- maven-surefire-plugin updated from v2.22.2 to v3.2.2
- maven-surefire-report-plugin updated from v2.22.2 to v3.2.2
- maven-war-plugin updated from v3.3.2 to v3.4.0
- spotbugs-maven-plugin updated from v4.7.3.0 to v4.8.2.0
- versions-maven-plugin updated from v2.14.1 to v2.16.2
- logback updated from v1.3.5 to v1.3.14
- pmd updated from v6.52.0 to v6.55.0
- postgresql-jdbc updated from v42.5.1 to v42.7.0
- slf4j updated from v2.0.6 to v2.0.9
- spotbugs updated from v4.7.3 to v4.8.2
- testcontainers updated from v1.17.6 to v1.19.3
- testng updated from v7.5 to v7.5.1
- CI maven updated from v3.8.6 to v3.9.6
- CI zulu updated from v8.0.352/v11.0.17/v17.0.5/v19.0.1 to v8.0.392, v11.0.21, v17.0.9, v21.0.1

Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com>
---
 .github/install-maven.sh   | 20 -----------
 .github/install-zulu11.sh  | 23 ------------
 .github/install-zulu8.sh   | 23 ------------
 .github/workflows/main.yml | 17 ++++-----
 pom.xml                    | 73 +++++++++++++++++++-------------------
 5 files changed, 45 insertions(+), 111 deletions(-)
 delete mode 100755 .github/install-maven.sh
 delete mode 100755 .github/install-zulu11.sh
 delete mode 100755 .github/install-zulu8.sh

diff --git a/.github/install-maven.sh b/.github/install-maven.sh
deleted file mode 100755
index a1d06cf..0000000
--- a/.github/install-maven.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -euf
-
-MAVEN_BASE_URL=https://archive.apache.org/dist/maven/maven-3/
-MAVEN_VERSION=3.8.6
-MAVEN_SHA=c7047a48deb626abf26f71ab3643d296db9b1e67f1faa7d988637deac876b5a9
-
-sudo apt-get update
-sudo apt-get install -y curl
-sudo mkdir -p /usr/share/maven /usr/share/maven/ref
-sudo curl -fsSL -o /tmp/apache-maven.tar.gz ${MAVEN_BASE_URL}/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz
-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 -fs /usr/share/maven/bin/mvn /usr/bin/mvn
-mvn -version
-
-set +euf
-
diff --git a/.github/install-zulu11.sh b/.github/install-zulu11.sh
deleted file mode 100755
index cbf262c..0000000
--- a/.github/install-zulu11.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -euf
-
-AZUL_GPG_KEY=0xB1998361219BD9C9
-ZULU_VERSION=11
-ZULU_RELEASE=11.0.17-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'
-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/.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
-java -version
-
-set +euf
-
diff --git a/.github/install-zulu8.sh b/.github/install-zulu8.sh
deleted file mode 100755
index 0bdcf9c..0000000
--- a/.github/install-zulu8.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -euf
-
-AZUL_GPG_KEY=0xB1998361219BD9C9
-ZULU_VERSION=8
-ZULU_RELEASE=8.0.352-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'
-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/.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
-java -version
-
-set +euf
-
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 083b406..f976f78 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,14 +11,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        jdk_version: [8.0.352-zulu, 11.0.17-zulu, 17.0.5-zulu, 19.0.1-zulu]
-        maven_version: [3.8.6]
+        jdk_version: [8.0.392-zulu, 11.0.21-zulu, 17.0.9-zulu, 21.0.1-zulu]
+        maven_version: [3.9.6]
         include:
           - os: ubuntu-22.04
-            jdk_version: 8.0.352-zulu
-            maven_version: 3.8.6
+            jdk_version: 8.0.392-zulu
+            zulu_version: 8.74.0.17
+            maven_version: 3.9.6
             maven_deploy: true
             docker_build: true
+            maven_docker_container_image_repo: luminositylabs
+            maven_docker_container_image_name: maven
+            maven_docker_container_image_tag: 3.9.6_openjdk-8u392_zulu-8.74.0.17
     name: Build on OS ${{ matrix.os }} with Maven ${{ matrix.maven_version }} using JDK ${{ matrix.jdk_version }}
     runs-on: ${{ matrix.os }}
     env:
@@ -89,9 +93,6 @@ jobs:
     - name: Docker maven build
       if: ${{ matrix.docker_build }}
       env:
-        maven_docker_container_image_repo: luminositylabs
-        maven_docker_container_image_name: maven
-        maven_docker_container_image_tag: 3.8.6_openjdk-8u352_zulu-alpine-8.66.0.15
         CBD: /usr/src/build
         P: luminositylabs-oss
-      run: docker container run --rm -i -v "$(pwd)":"${CBD}" -v ${HOME}/.gnupg:/root/.gnupg -v ${P}-${{ env.maven_docker_container_image_tag }}-mvn-repo:/root/.m2 -w "${CBD}" ${{ env.maven_docker_container_image_repo }}/${{ env.maven_docker_container_image_name }}:${{ env.maven_docker_container_image_tag }} mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} -Djavadoc.path=/usr/bin/javadoc -Dmaven.integration.test.skip=true dependency:list-repositories dependency:tree help:active-profiles clean install site site:stage
+      run: docker container run --rm -i -v "$(pwd)":"${CBD}" -v ${HOME}/.gnupg:/root/.gnupg -v ${P}-${{ matrix.maven_docker_container_image_tag }}-mvn-repo:/root/.m2 -w "${CBD}" ${{ matrix.maven_docker_container_image_repo }}/${{ matrix.maven_docker_container_image_name }}:${{ matrix.maven_docker_container_image_tag }} mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} -Djavadoc.path=/usr/bin/javadoc -Dmaven.integration.test.skip=true dependency:list-repositories dependency:tree help:active-profiles clean install site site:stage
diff --git a/pom.xml b/pom.xml
index a4ecef9..046d9a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,9 +94,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.min.version>8</java.min.version>
-        <maven.min.version>3.6</maven.min.version>
+        <maven.min.version>3.8</maven.min.version>
         <maven.test.skip>false</maven.test.skip>
         <maven.integration.test.skip>false</maven.integration.test.skip>
         <failsafe.forkCount>1</failsafe.forkCount>
@@ -109,59 +108,59 @@
         <jxr.skip>false</jxr.skip>
         <pmd.skip>true</pmd.skip>
         <spotbugs.skip>true</spotbugs.skip>
-        <test.container.image>postgis/postgis:15-3.3-alpine</test.container.image>
+        <test.container.image>postgis/postgis:16-3.4-alpine</test.container.image>
         <test.db.username>postgis1</test.db.username>
         <test.db.password>postgis1</test.db.password>
         <test.db.name>postgis1</test.db.name>
         <test.db.port>5432</test.db.port>
         <!-- Plugin versioning -->
-        <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
+        <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
         <directory-maven-plugin.version>1.0</directory-maven-plugin.version>
-        <download-maven-plugin.version>1.6.8</download-maven-plugin.version>
-        <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+        <download-maven-plugin.version>1.7.1</download-maven-plugin.version>
+        <exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
         <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-archetype-plugin.version>3.2.1</maven-archetype-plugin.version>
-        <maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
-        <maven-checkstyle-plugin.version>3.2.0</maven-checkstyle-plugin.version>
-        <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-dependency-plugin.version>3.4.0</maven-dependency-plugin.version>
-        <maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
+        <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
+        <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
+        <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
+        <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
         <maven-ear-plugin.version>3.3.0</maven-ear-plugin.version>
         <maven-ejb-plugin.version>3.0.1</maven-ejb-plugin.version>
-        <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
-        <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-        <maven-install-plugin.version>3.1.0</maven-install-plugin.version>
+        <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+        <maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
+        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
+        <maven-install-plugin.version>3.1.1</maven-install-plugin.version>
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
         <maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
-        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
-        <maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
-        <maven-pmd-plugin.version>3.19.0</maven-pmd-plugin.version>
-        <maven-project-info-reports-plugin.version>3.4.1</maven-project-info-reports-plugin.version>
-        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-        <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
-        <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
+        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+        <maven-jxr-plugin.version>3.3.1</maven-jxr-plugin.version>
+        <maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
+        <maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+        <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
-        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
-        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-        <spotbugs-maven-plugin.version>4.7.3.0</spotbugs-maven-plugin.version>
-        <versions-maven-plugin.version>2.14.1</versions-maven-plugin.version>
+        <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+        <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
+        <maven-surefire-report-plugin.version>3.2.2</maven-surefire-report-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <spotbugs-maven-plugin.version>4.8.2.0</spotbugs-maven-plugin.version>
+        <versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
         <!-- Dependency versions -->
         <dependency.checkstyle.version>9.3</dependency.checkstyle.version>
         <dependency.jts-version.version>1.19.0</dependency.jts-version.version>
-        <dependency.logback.version>1.3.5</dependency.logback.version>
-        <dependency.pmd.version>6.52.0</dependency.pmd.version>
-        <dependency.postgresql-jdbc.version>42.5.1</dependency.postgresql-jdbc.version>
-        <dependency.slf4j.version>2.0.6</dependency.slf4j.version>
+        <dependency.logback.version>1.3.14</dependency.logback.version>
+        <dependency.pmd.version>6.55.0</dependency.pmd.version>
+        <dependency.postgresql-jdbc.version>42.7.0</dependency.postgresql-jdbc.version>
+        <dependency.slf4j.version>2.0.9</dependency.slf4j.version>
         <dependency.spatial4j.version>0.8</dependency.spatial4j.version>
-        <dependency.spotbugs.version>4.7.3</dependency.spotbugs.version>
-        <dependency.testcontainers.version>1.17.6</dependency.testcontainers.version>
-        <dependency.testng.version>7.5</dependency.testng.version>
+        <dependency.spotbugs.version>4.8.2</dependency.spotbugs.version>
+        <dependency.testcontainers.version>1.19.3</dependency.testcontainers.version>
+        <dependency.testng.version>7.5.1</dependency.testng.version>
     </properties>
 
     <dependencyManagement>