DRAFT: Bump java version and Pi4j

.github/workflows/ci-develop-snapshot.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Upload distribution files to staging
       uses: actions/upload-artifact@v4
       with:
-        name: pi4j-v2-dist
+        name: pi4j-dist
         path: staging
   DeployPackages:
       name: Deploy to APT/Download Repo
@@ -40,7 +40,7 @@ jobs:
         - name: Download staged artifacts from build 
           uses: actions/download-artifact@v4
           with:
-            name: pi4j-v2-dist  
+            name: pi4j-dist
         - name: Display downloaded build artifacts
           shell: bash
           run: tree

.github/workflows/ci-pull-request.yml

@@ -27,5 +27,5 @@ jobs:
     - name: Upload distribution files to staging
       uses: actions/upload-artifact@v4
       with:
-        name: pi4j-v2-dist
+        name: pi4j-dist
         path: staging

.github/workflows/ci-release-tags.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Upload distribution files to staging
       uses: actions/upload-artifact@v4
       with:
-        name: pi4j-v2-dist
+        name: pi4j-dist
         path: staging
   DeployPackages:
       name: Deploy to APT/Download Repo
@@ -41,7 +41,7 @@ jobs:
         - name: Download staged artifacts from build 
           uses: actions/download-artifact@v4
           with:
-            name: pi4j-v2-dist  
+            name: pi4j-dist
         - name: Display downloaded build artifacts
           shell: bash
           run: tree

README.md

@@ -4,7 +4,7 @@
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.pi4j/pi4j-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.pi4j/pi4j-core)
 [![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/com.pi4j/pi4j-core?server=https%3A%2F%2Foss.sonatype.org)](https://oss.sonatype.org/#nexus-search;gav~com.pi4j~~~~)
-[![License](https://img.shields.io/github/license/pi4j/pi4j-v2)](http://www.apache.org/licenses/LICENSE-2.0)
+[![License](https://img.shields.io/github/license/pi4j/pi4j)](http://www.apache.org/licenses/LICENSE-2.0)
 
 [![Site](https://img.shields.io/badge/Website-pi4j.com-green)](https://pi4j.com)
 [![Chat on Slack](https://img.shields.io/badge/Chat-on%20Slack-blue)](https://join.slack.com/t/pi4j/shared_invite/zt-1ttqt8wgj-E6t69qaLrNuCMPLiYnBCsg)
@@ -24,8 +24,8 @@ This project is intended to provide a **friendly object-oriented I/O API and imp
 
 ![Pi4J diagram](https://pi4j.com/assets/about/home/pi4j-overview.jpg)
 
-* Pi4J V2 Discussions: [github.com/Pi4J/pi4j-v2/discussions](https://github.com/Pi4J/pi4j-v2/discussions)
-* Pi4J V2 issues: [github.com/Pi4J/pi4j-v2/issues](https://github.com/Pi4J/pi4j-v2/issues)
+* Pi4J V2 Discussions: [github.com/Pi4J/pi4j/discussions](https://github.com/Pi4J/pi4j/discussions)
+* Pi4J V2 issues: [github.com/Pi4J/pi4j/issues](https://github.com/Pi4J/pi4j/issues)
 
 Builds are available from:
 
@@ -60,15 +60,15 @@ while (true) {
 For full description of the code structure, how to compile... see
 the ["About the code" on our website](https://pi4j.com/architecture/about-the-code/).
 
-![Pi4J V2 code structure](assets/draw.io/pi4j-v2-code-structure.jpg)
+![Pi4J V2 code structure](assets/draw.io/pi4j-code-structure.jpg)
 
 ### Project Overview
 
 Starting with the Pi4J 2.0 builds, the Pi4J project is prioritizing focus
 on providing Java programs access, control and communication with the core
 I/O capabilities of the Raspberry Pi platform.
 
-Read all about it on [pi4j.com: "What’s New in 2.0?"](https://pi4j.com/about/new-in-v2/).
+Read all about it on [pi4j.com: "What’s New in 2.0?"](https://pi4j.com/about/new-in/).
 
 ### Build Instructions
 
@@ -109,10 +109,10 @@ with your experience, ideas, and what you would like to contribute to the projec
 
 * **Releases**
   * V1: [github.com/Pi4J/pi4j-v1/releases](https://github.com/Pi4J/pi4j-v1/releases) (archived)
-  * V2: [github.com/Pi4J/pi4j-v2/releases](https://github.com/Pi4J/pi4j-v2/releases)
+  * V2: [github.com/Pi4J/pi4j/releases](https://github.com/Pi4J/pi4j/releases)
 * **Source Code**: 
   * V1: [github.com/Pi4J/pi4j-v1/branches](https://github.com/Pi4J/pi4j-v1/branches) (archived)
-  * V2: [github.com/Pi4J/pi4j-v2/branches](https://github.com/Pi4J/pi4j-v2/branches)
+  * V2: [github.com/Pi4J/pi4j/branches](https://github.com/Pi4J/pi4j/branches)
 
 ## License
 

libraries/pi4j-library-gpiod/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-library</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/pi4j-library-linuxfs/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>pi4j-library</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/pi4j-library-pigpio/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>pi4j-library</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/pi4j-library-pigpio/src/main/native/com_pi4j_library_pigpio_internal_PIGPIO.c

@@ -153,7 +153,7 @@ JNIEXPORT jint JNICALL Java_com_pi4j_library_pigpio_internal_PIGPIO_gpioHardware
 JNIEXPORT jint JNICALL Java_com_pi4j_library_pigpio_internal_PIGPIO_gpioInitialise
   (JNIEnv *env, jclass class)
 {
-    // SEE: https://github.com/Pi4J/pi4j-v2/issues/15
+    // SEE: https://github.com/Pi4J/pi4j/issues/15
     //  By default, PIGPIO steals all the signal handlers. The JVM doesn't like this
     //  as it uses them in running the JVM so it ends up with the program crashing.
     //  The following should disable the signal handlers inside the PIGPIO library.

libraries/pi4j-library/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pi4j-core/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-parent</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pi4j-distribution/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pi4j-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

plugins/pi4j-plugin-gpiod/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-plugin</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-plugin/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

plugins/pi4j-plugin-linuxfs/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-plugin</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-plugin/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

plugins/pi4j-plugin-mock/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-plugin</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-plugin/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

plugins/pi4j-plugin-pigpio/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-plugin</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-plugin/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

plugins/pi4j-plugin-raspberrypi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-plugin</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-plugin/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

plugins/pi4j-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -3,17 +3,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.pi4j</groupId>
 	<artifactId>pi4j-parent</artifactId>
-	<version>2.7.0-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<name>Pi4J :: Parent POM</name>
 	<description>Parent Maven POM for the Pi4J Project</description>
-	<url>https://v2.pi4j.com</url>
+	<url>https://pi4j.com</url>
 	<inceptionYear>2012</inceptionYear>
 	<packaging>pom</packaging>
 
 	<!-- ORGANIZATION -->
 	<organization>
 		<name>Pi4J</name>
-		<url>https://v2.pi4j.com</url>
+		<url>https://pi4j.com</url>
 	</organization>
 
 	<!-- LICENSE -->
@@ -111,14 +111,14 @@
 
 	<!-- SOURCE CONTROL -->
 	<scm>
-		<developerConnection>scm:git:ssh://[email protected]/Pi4J/pi4j-v2.git</developerConnection>
-		<connection>scm:git:ssh://[email protected]/Pi4J/pi4j-v2.git</connection>
-		<url>https://github.com/Pi4J/pi4j-v2.git</url>
+		<developerConnection>scm:git:ssh://[email protected]/Pi4J/pi4j.git</developerConnection>
+		<connection>scm:git:ssh://[email protected]/Pi4J/pi4j.git</connection>
+		<url>https://github.com/Pi4J/pi4j.git</url>
 	</scm>
 
 	<!-- ISSUE MANAGEMENT -->
 	<issueManagement>
-		<url>https://github.com/Pi4J/pi4j-v2/issues</url>
+		<url>https://github.com/Pi4J/pi4j/issues</url>
 		<system>github</system>
 	</issueManagement>
 
@@ -249,7 +249,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- JAVA COMPILER VERSIONS -->
-        <java.version>11</java.version>
+        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
@@ -260,15 +260,15 @@
         org.apache.tools.ant.util.FileUtils.getFileUtils()
         -->
         <ant-contrib.version>20020829</ant-contrib.version>
-        <ant-jsch.version>1.10.8</ant-jsch.version>
+        <ant-jsch.version>1.10.15</ant-jsch.version>
         <jsch.version>0.1.55</jsch.version>
-        <junit.jupiter.version>5.10.2</junit.jupiter.version>
+        <junit.jupiter.version>5.11.3</junit.jupiter.version>
         <slf4j.version>2.0.12</slf4j.version>
-        <jserialcomm.version>2.10.4</jserialcomm.version>
+        <jserialcomm.version>2.11.0</jserialcomm.version>
 
         <!-- PLUGIN VERSIONS -->
         <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
-        <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
+        <exec-maven-plugin.version>3.5.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>
@@ -708,6 +708,28 @@
 
         <!-- GLOBAL BUILD PLUGINS (used when building all modules) -->
 		<plugins>
+            <!-- SPECIFY MINIMAL MAVEN VERSION -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[3.9,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
 			<!-- USE LATEST SCM PLUGIN TO SUPPORT GIT -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>