From e3259ad375f4ab1f2d51657fccd7e66c8f06ceda Mon Sep 17 00:00:00 2001
From: Phillip Ross <phillipross@users.noreply.github.com>
Date: Wed, 21 Dec 2022 01:21:41 -0500
Subject: [PATCH] Updates (#124)

- jts updated from v1.18.2 to v1.19.0
- logging output adjustments
- cleanup maven-version-rules.xml

Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com>
---
 maven-version-rules.xml                       | 26 ++++++++++++-------
 pom.xml                                       |  2 +-
 .../src/test/resources/logback-test.xml       |  2 ++
 .../src/test/resources/logback-test.xml       |  2 ++
 .../src/test/resources/logback-test.xml       |  4 +--
 .../src/test/resources/logback-test.xml       |  2 +-
 .../src/test/resources/logback-test.xml       |  2 ++
 .../src/test/resources/logback-test.xml       |  2 ++
 8 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/maven-version-rules.xml b/maven-version-rules.xml
index 6abbab6..486018e 100644
--- a/maven-version-rules.xml
+++ b/maven-version-rules.xml
@@ -4,27 +4,33 @@
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
     <ignoreVersions>
         <!-- Exclude milestones, release candidates, alphas, and betas-->
-        <ignoreVersion type="regex">.*-[M|RC|alpha|beta|rc].*</ignoreVersion>
+        <ignoreVersion type="regex">.*[\.-](?i)([M|alpha|beta|rc]).*</ignoreVersion>
         <!-- Exclude milestones, release candidates, alphas, and betas, and Java7 qualifiers -->
         <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">
+        <!-- Pin logback version to v1.3.x (v1.4.0+ requires Java11) -->
+        <rule groupId="ch.qos.logback" comparisonMethod="maven">
             <ignoreVersions>
-                <ignoreVersion type="regex">4\.9\.9</ignoreVersion>
+                <ignoreVersion type="regex">1\.4\..*</ignoreVersion>
             </ignoreVersions>
         </rule>
-        <!-- Pin testng version to pre-V7 -->
-        <rule groupId="org.testng" artifactId="testng">
+        <!-- Pin checkstyle version to pre-v10 (v10 is requires Java11) -->
+        <rule groupId="com.puppycrawl.tools" artifactId="checkstyle" comparisonMethod="maven">
             <ignoreVersions>
-                <ignoreVersion type="regex">7\..*</ignoreVersion>
+                <ignoreVersion type="regex">10\..*</ignoreVersion>
             </ignoreVersions>
         </rule>
-        <!-- Ignore logback version with groovyless suffix -->
-        <rule groupId="ch.qos.logback">
+        <!-- Pin testng version to 7.5.x (v7.6+ requires Java11) -->
+        <rule groupId="org.testng" artifactId="testng" comparisonMethod="maven">
             <ignoreVersions>
-                <ignoreVersion type="regex">.*-groovyless</ignoreVersion>
+                <ignoreVersion type="regex">7\.[6-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <!-- Pin git-commit-id-plugin version to final 4.x release version (v5+ requires Java11 -->
+        <rule groupId="pl.project13.maven" artifactId="git-commit-id-plugin">
+            <ignoreVersions>
+                <ignoreVersion type="regex">4\.9\.9</ignoreVersion>
             </ignoreVersions>
         </rule>
     </rules>
diff --git a/pom.xml b/pom.xml
index f78610a..a4ecef9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
         <versions-maven-plugin.version>2.14.1</versions-maven-plugin.version>
         <!-- Dependency versions -->
         <dependency.checkstyle.version>9.3</dependency.checkstyle.version>
-        <dependency.jts-version.version>1.18.2</dependency.jts-version.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>
diff --git a/postgis-jdbc-geometry/src/test/resources/logback-test.xml b/postgis-jdbc-geometry/src/test/resources/logback-test.xml
index 7378bd0..1c321a2 100644
--- a/postgis-jdbc-geometry/src/test/resources/logback-test.xml
+++ b/postgis-jdbc-geometry/src/test/resources/logback-test.xml
@@ -12,6 +12,8 @@
 
     <logger name="com.github.dockerjava" level="ERROR"/>
     <logger name="org.testcontainers" level="ERROR"/>
+    <logger name="org.testng" level="ERROR"/>
+
     <logger name="net.postgis" level="ERROR"/>
 
 </configuration>
\ No newline at end of file
diff --git a/postgis-jdbc-java2d/src/test/resources/logback-test.xml b/postgis-jdbc-java2d/src/test/resources/logback-test.xml
index 6b63bc7..d8468d4 100644
--- a/postgis-jdbc-java2d/src/test/resources/logback-test.xml
+++ b/postgis-jdbc-java2d/src/test/resources/logback-test.xml
@@ -10,6 +10,8 @@
         <appender-ref ref="STDOUT" />
     </root>
 
+    <logger name="org.testng" level="ERROR"/>
+
     <logger name="net.postgis.jdbc.java2d" level="ERROR"/>
 
 </configuration>
\ No newline at end of file
diff --git a/postgis-jdbc-jts/src/test/resources/logback-test.xml b/postgis-jdbc-jts/src/test/resources/logback-test.xml
index 78243fe..1c321a2 100644
--- a/postgis-jdbc-jts/src/test/resources/logback-test.xml
+++ b/postgis-jdbc-jts/src/test/resources/logback-test.xml
@@ -12,8 +12,8 @@
 
     <logger name="com.github.dockerjava" level="ERROR"/>
     <logger name="org.testcontainers" level="ERROR"/>
-    <logger name="net.postgis" level="ERROR"/>
+    <logger name="org.testng" level="ERROR"/>
 
-    <logger name="net.postgis.jdbc.jts" level="ERROR"/>
+    <logger name="net.postgis" level="ERROR"/>
 
 </configuration>
\ No newline at end of file
diff --git a/postgis-jdbc/src/test/resources/logback-test.xml b/postgis-jdbc/src/test/resources/logback-test.xml
index d8615b9..1c321a2 100644
--- a/postgis-jdbc/src/test/resources/logback-test.xml
+++ b/postgis-jdbc/src/test/resources/logback-test.xml
@@ -12,7 +12,7 @@
 
     <logger name="com.github.dockerjava" level="ERROR"/>
     <logger name="org.testcontainers" level="ERROR"/>
-    <logger name="net.postgis" level="ERROR"/>
+    <logger name="org.testng" level="ERROR"/>
 
     <logger name="net.postgis" level="ERROR"/>
 
diff --git a/tools/smoketest/src/test/resources/logback-test.xml b/tools/smoketest/src/test/resources/logback-test.xml
index 7378bd0..1c321a2 100644
--- a/tools/smoketest/src/test/resources/logback-test.xml
+++ b/tools/smoketest/src/test/resources/logback-test.xml
@@ -12,6 +12,8 @@
 
     <logger name="com.github.dockerjava" level="ERROR"/>
     <logger name="org.testcontainers" level="ERROR"/>
+    <logger name="org.testng" level="ERROR"/>
+
     <logger name="net.postgis" level="ERROR"/>
 
 </configuration>
\ No newline at end of file
diff --git a/tools/test-utils/src/test/resources/logback-test.xml b/tools/test-utils/src/test/resources/logback-test.xml
index 848b0e4..8e10c12 100644
--- a/tools/test-utils/src/test/resources/logback-test.xml
+++ b/tools/test-utils/src/test/resources/logback-test.xml
@@ -12,6 +12,8 @@
 
     <logger name="com.github.dockerjava" level="ERROR"/>
     <logger name="org.testcontainers" level="ERROR"/>
+    <logger name="org.testng" level="ERROR"/>
+
     <logger name="net.postgis" level="ERROR"/>
     
 </configuration>
\ No newline at end of file