From 2d4e21614b16521100207a67a35babf9c83020c1 Mon Sep 17 00:00:00 2001
From: Frank Delporte <fdelporte@azul.com>
Date: Wed, 20 Mar 2024 16:30:48 +0100
Subject: [PATCH 1/7] Bumping versions (WIP)

---
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index d99ecbc4..fd9811d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,13 +254,13 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <!-- DEPENDENCY VERSIONS -->
-        <ant-jsch.version>1.10.8</ant-jsch.version>
+        <ant-jsch.version>1.10.14</ant-jsch.version>
         <jsch.version>0.1.55</jsch.version>
-        <ant-contrib.version>20020829</ant-contrib.version>
-        <junit.jupiter.version>5.6.2</junit.jupiter.version>
+        <ant-contrib.version>1.0b3</ant-contrib.version>
+        <junit.jupiter.version>5.10.2</junit.jupiter.version>
         <junit.platform.version>1.6.2</junit.platform.version>
-        <slf4j.version>1.7.32</slf4j.version>
-        <jSerialComm.version>2.6.2</jSerialComm.version>
+        <slf4j.version>2.0.12</slf4j.version>
+        <jserialcomm.version>2.10.4</jserialcomm.version>
         <gson.version>2.8.6</gson.version>
         <json.version>20200518</json.version>
 
@@ -273,7 +273,7 @@
         <maven-resource-plugin.version>3.2.0</maven-resource-plugin.version>
         <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+        <maven-gpg-plugin.version>3.2.1</maven-gpg-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <maven-scm-plugin.version>1.11.2</maven-scm-plugin.version>
         <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
@@ -289,7 +289,7 @@
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
 
         <!-- REPORTS VERSIONS -->
-        <maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version>
+        <maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
 
         <!-- SPECIAL ACCESS PROPERTIES -->
         <!-- These are only used by project committer/publisher -->
@@ -383,7 +383,7 @@
         <dependency>
             <groupId>com.fazecast</groupId>
             <artifactId>jSerialComm</artifactId>
-            <version>2.5.1</version>
+            <version>${jserialcomm.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 6952572f6d92411c6f988120a40f63c7d24bb469 Mon Sep 17 00:00:00 2001
From: Frank Delporte <fdelporte@azul.com>
Date: Wed, 20 Mar 2024 16:56:10 +0100
Subject: [PATCH 2/7] Remove unused variables and dependencies (WIP)

---
 pom.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd9811d3..60d12196 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,11 +258,8 @@
         <jsch.version>0.1.55</jsch.version>
         <ant-contrib.version>1.0b3</ant-contrib.version>
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
-        <junit.platform.version>1.6.2</junit.platform.version>
         <slf4j.version>2.0.12</slf4j.version>
         <jserialcomm.version>2.10.4</jserialcomm.version>
-        <gson.version>2.8.6</gson.version>
-        <json.version>20200518</json.version>
 
         <!-- PLUGIN VERSIONS -->
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -277,15 +274,13 @@
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <maven-scm-plugin.version>1.11.2</maven-scm-plugin.version>
         <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
-        <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
+        <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <native-maven-plugin.version>1.0-alpha-9</native-maven-plugin.version>
         <maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version>
-        <license-maven-plugin.version>2.0.0</license-maven-plugin.version>
         <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
         <jdeb.version>1.8</jdeb.version>
         <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
-        <s3-upload-maven-plugin.version>1.5</s3-upload-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
 
         <!-- REPORTS VERSIONS -->
@@ -313,7 +308,6 @@
         <raspberrypi.password>raspberry</raspberrypi.password>
         <raspberrypi.deploydirectory>/home/pi/deploy</raspberrypi.deploydirectory>
         <raspberrypi.jvmOptions/>
-
 	</properties>
 
     <!-- PROJECT DEPENDENCIES -->
@@ -665,13 +659,6 @@
                     <version>${jdeb.version}</version>
                 </plugin>
 
-                <!-- AWS S3 UPLOAD PLUGIN -->
-                <plugin>
-                    <groupId>com.bazaarvoice.maven.plugins</groupId>
-                    <artifactId>s3-upload-maven-plugin</artifactId>
-                    <version>${s3-upload-maven-plugin.version}</version>
-                </plugin>
-
                 <!-- ENFORCER PLUGIN -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From bbbcad3ec49b068d72336629bd6ce0b5bc1e8751 Mon Sep 17 00:00:00 2001
From: Frank Delporte <fdelporte@azul.com>
Date: Wed, 20 Mar 2024 17:11:17 +0100
Subject: [PATCH 3/7] Bumping versions (WIP)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 60d12196..31217bc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,7 +280,7 @@
         <maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version>
         <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
         <jdeb.version>1.8</jdeb.version>
-        <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
+        <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
 
         <!-- REPORTS VERSIONS -->

From 8a31b198353efd56b8dbe0193f7c1906358fc4a9 Mon Sep 17 00:00:00 2001
From: Frank Delporte <fdelporte@azul.com>
Date: Wed, 20 Mar 2024 17:20:18 +0100
Subject: [PATCH 4/7] Bumping versions (WIP)

---
 pi4j-distribution/pom.xml                                       | 1 -
 .../src/test/java/com/pi4j/test/provider/AutoProvidersTest.java | 2 +-
 .../test/java/com/pi4j/test/registry/RegistryGetIoInstance.java | 2 +-
 pom.xml                                                         | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pi4j-distribution/pom.xml b/pi4j-distribution/pom.xml
index e1bfaad8..ebbfd014 100644
--- a/pi4j-distribution/pom.xml
+++ b/pi4j-distribution/pom.xml
@@ -13,7 +13,6 @@
     <description>Pi4J Distribution Packages</description>
     <packaging>deb</packaging>
 
-
     <!-- PROJECT DEPENDENCIES -->
     <dependencies>
 
diff --git a/pi4j-test/src/test/java/com/pi4j/test/provider/AutoProvidersTest.java b/pi4j-test/src/test/java/com/pi4j/test/provider/AutoProvidersTest.java
index 192f909b..02410476 100644
--- a/pi4j-test/src/test/java/com/pi4j/test/provider/AutoProvidersTest.java
+++ b/pi4j-test/src/test/java/com/pi4j/test/provider/AutoProvidersTest.java
@@ -45,7 +45,7 @@ public class AutoProvidersTest {
     @BeforeAll
     public void beforeTest() {
 
-        System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "TRACE");
+        System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "TRACE");
 
         // initialize Pi4J with an auto context
         // An auto context includes AUTO-DETECT BINDINGS enabled
diff --git a/pi4j-test/src/test/java/com/pi4j/test/registry/RegistryGetIoInstance.java b/pi4j-test/src/test/java/com/pi4j/test/registry/RegistryGetIoInstance.java
index 5a598559..1c1c5859 100644
--- a/pi4j-test/src/test/java/com/pi4j/test/registry/RegistryGetIoInstance.java
+++ b/pi4j-test/src/test/java/com/pi4j/test/registry/RegistryGetIoInstance.java
@@ -47,7 +47,7 @@ public class RegistryGetIoInstance {
 
     @BeforeAll
     public void beforeTest() throws Pi4JException {
-        System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "INFO");
+        System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "INFO");
 
         // initialize Pi4J with an auto context
         // An auto context includes AUTO-DETECT BINDINGS enabled
diff --git a/pom.xml b/pom.xml
index 31217bc6..e8b9d0ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
 
 	<!-- DISTRIBUTION REPOSITORIES -->
 	<distributionManagement>
-		<downloadUrl>https://v2.pi4j.com/download</downloadUrl>
+		<downloadUrl>https://pi4j.com/download</downloadUrl>
 		<repository>
 			<id>sonatype-oss-staging</id>
 			<name>Sonatype Open Source Maven Repository</name>

From e736ac62b4be2d4f2c19766625f6713cfa3d1783 Mon Sep 17 00:00:00 2001
From: Frank Delporte <fdelporte@azul.com>
Date: Tue, 2 Apr 2024 10:31:10 +0200
Subject: [PATCH 5/7] Reverting ant bump

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e8b9d0ec..c1e97d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <!-- DEPENDENCY VERSIONS -->
-        <ant-jsch.version>1.10.14</ant-jsch.version>
+        <ant-jsch.version>1.10.8</ant-jsch.version>
         <jsch.version>0.1.55</jsch.version>
         <ant-contrib.version>1.0b3</ant-contrib.version>
         <junit.jupiter.version>5.10.2</junit.jupiter.version>

From 129472d07a58dda6ddbd014b191d7198d65f058b Mon Sep 17 00:00:00 2001
From: Frank Delporte <fdelporte@azul.com>
Date: Tue, 2 Apr 2024 10:37:31 +0200
Subject: [PATCH 6/7] Reverting ant-contrib bump

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c1e97d5c..b83a6729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,7 @@
         <!-- DEPENDENCY VERSIONS -->
         <ant-jsch.version>1.10.8</ant-jsch.version>
         <jsch.version>0.1.55</jsch.version>
-        <ant-contrib.version>1.0b3</ant-contrib.version>
+        <ant-contrib.version>20020829</ant-contrib.version>
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
         <slf4j.version>2.0.12</slf4j.version>
         <jserialcomm.version>2.10.4</jserialcomm.version>

From 89201e4a5fb3b7ca071b0db26249e2390fd423bd Mon Sep 17 00:00:00 2001
From: Frank Delporte <fdelporte@azul.com>
Date: Tue, 2 Apr 2024 10:44:58 +0200
Subject: [PATCH 7/7] Alphabetic sort of plugin versions

---
 pom.xml | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index b83a6729..52620c62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,34 +254,39 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <!-- DEPENDENCY VERSIONS -->
+        <!--
+        Seems we are stuck at this version of ant-contrib. Bumping it leads to:
+        Error executing Ant tasks: 'org.apache.tools.ant.util.FileUtils
+        org.apache.tools.ant.util.FileUtils.getFileUtils()
+        -->
+        <ant-contrib.version>20020829</ant-contrib.version>
         <ant-jsch.version>1.10.8</ant-jsch.version>
         <jsch.version>0.1.55</jsch.version>
-        <ant-contrib.version>20020829</ant-contrib.version>
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
         <slf4j.version>2.0.12</slf4j.version>
         <jserialcomm.version>2.10.4</jserialcomm.version>
 
         <!-- PLUGIN VERSIONS -->
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+        <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
+        <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
+        <jdeb.version>1.8</jdeb.version>
+        <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
+        <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
+        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+        <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
+        <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+        <maven-gpg-plugin.version>3.2.1</maven-gpg-plugin.version>
+        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+        <maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version>
         <maven-resource-plugin.version>3.2.0</maven-resource-plugin.version>
-        <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
-        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-        <maven-gpg-plugin.version>3.2.1</maven-gpg-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <maven-scm-plugin.version>1.11.2</maven-scm-plugin.version>
-        <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
-        <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
+        <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
+        <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <native-maven-plugin.version>1.0-alpha-9</native-maven-plugin.version>
-        <maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version>
-        <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
-        <jdeb.version>1.8</jdeb.version>
-        <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
-        <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
+        <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
 
         <!-- REPORTS VERSIONS -->
         <maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>