Migrate project to Java 25 and bump version to 2.0.0-SNAPSHOT

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "xAPI Java Development",
-  "image": "mcr.microsoft.com/devcontainers/java:17",
+  "image": "mcr.microsoft.com/devcontainers/java:25",
 
   "features": {
      "ghcr.io/devcontainers/features/java:1": {
@@ -15,7 +15,7 @@
         "java.jdt.ls.java.home": "/usr/lib/jvm/msopenjdk-current",
         "java.configuration.runtimes": [
           {
-            "name": "JavaSE-17",
+            "name": "JavaSE-25",
             "path": "/usr/lib/jvm/msopenjdk-current"
           }
         ]

.github/workflows/codeql.yml

@@ -57,7 +57,7 @@ jobs:
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '25'
 
     # Initializes the CodeQL tools for scanning.
     # Uses custom configuration file to exclude test directories from analysis.

.github/workflows/copilot-setup-steps.yml

@@ -32,10 +32,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
 
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: "17"
+          java-version: "25"
           distribution: "temurin"
           cache: maven
 

.github/workflows/maven_pull_request.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: "17"
+          java-version: "25"
           distribution: "temurin"
           cache: maven
           cache-dependency-path: |

.github/workflows/maven_push.yml

@@ -14,10 +14,10 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: "17"
+          java-version: "25"
           distribution: "temurin"
           cache: maven
           cache-dependency-path: |

CONTRIBUTING.md

@@ -32,24 +32,24 @@ This project adheres to a [Code of Conduct](CODE_OF_CONDUCT.md). By participatin
 
 ### Prerequisites
 
-xAPI Java requires **Java 17 or newer**.
+xAPI Java requires **Java 25 or newer**.
 
-#### Installing Java 17
+#### Installing Java 25
 
 We recommend using [SDKMAN!](https://sdkman.io/) to install and manage Java versions:
 
 ```bash
 # Install SDKMAN (if not already installed)
 curl -s "https://get.sdkman.io" | bash
 
-# Install Java 17 (Temurin distribution recommended)
-sdk install java 17.0.13-tem
+# Install Java 25 (Temurin distribution recommended)
+sdk install java 25.0.1-tem
 
 # Verify installation
 java -version
 ```
 
-**Note**: The exact identifier (e.g., `17.0.13-tem`) may vary by platform and availability. Run `sdk list java` to see available Java 17 versions for your system and choose the appropriate one for your platform.
+**Note**: The exact identifier (e.g., `25.0.1-tem`) may vary by platform and availability. Run `sdk list java` to see available Java 25 versions for your system and choose the appropriate one for your platform.
 
 ### Setting Up Your Development Environment
 

README.md

@@ -8,7 +8,14 @@ Both the xAPI Client and xAPI Model use a [fluent interface](https://en.wikipedi
 
 ## Requirements
 
-xAPI Java requires **Java 17 or newer**. See [CONTRIBUTING.md](CONTRIBUTING.md#prerequisites) for detailed installation instructions.
+xAPI Java requires **Java 25 or newer**. See [CONTRIBUTING.md](CONTRIBUTING.md#prerequisites) for detailed installation instructions.
+
+### Version Compatibility
+
+- **Version 2.x** - Requires Java 25 or newer
+- **Version 1.x** - Requires Java 17 or newer
+
+If you need to use Java 17, please use version 1.x of xAPI Java.
 
 ## xAPI Java Client
 

pom.xml

@@ -9,13 +9,13 @@
   </parent>
   <groupId>dev.learning.xapi</groupId>
   <artifactId>xapi-build</artifactId>
-  <version>1.1.23-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>xAPI Build</name>
   <description>learning.dev xAPI Build</description>
   <url>https://github.com/BerryCloud/xapi-java</url>
   <properties>
-    <java.version>17</java.version>
+    <java.version>25</java.version>
     <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
     <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
     <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
@@ -296,17 +296,17 @@
       <dependency>
         <groupId>dev.learning.xapi</groupId>
         <artifactId>xapi-model</artifactId>
-        <version>1.1.23-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>dev.learning.xapi</groupId>
         <artifactId>xapi-model-spring-boot-starter</artifactId>
-        <version>1.1.23-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>dev.learning.xapi</groupId>
         <artifactId>xapi-client</artifactId>
-        <version>1.1.23-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>io.jsonwebtoken</groupId>

samples/core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>core</artifactId>
   <name>xAPI Samples Core</name>

samples/delete-activity-profile/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>delete-activity-profile</artifactId>
   <name>Delete xAPI Activity Profile Sample</name>

samples/delete-agent-profile/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>delete-agent-profile</artifactId>
   <name>Delete xAPI Agent Profile Sample</name>

samples/delete-state/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>delete-state</artifactId>
   <name>Delete xAPI State Sample</name>

samples/delete-states/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>delete-states</artifactId>
   <name>Delete xAPI States Sample</name>

samples/get-about/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-about</artifactId>
   <name>Get xAPI About Sample</name>

samples/get-activity-profile/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-activity-profile</artifactId>
   <name>Get xAPI Activity Profile Sample</name>

samples/get-activity-profiles/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-activity-profiles</artifactId>
   <name>Get xAPI Activity Profiles Sample</name>

samples/get-activity/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-activity</artifactId>
   <name>Get xAPI Activity Sample</name>

samples/get-agent-profile/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-agent-profile</artifactId>
   <name>Get xAPI Agent Profile Sample</name>

samples/get-agent-profiles/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-agent-profiles</artifactId>
   <name>Get xAPI Agent Profiles Sample</name>

samples/get-agents/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-agents</artifactId>
   <name>Get xAPI Agents Sample</name>

samples/get-more-statements/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-more-statements</artifactId>
   <name>Get xAPI More Statements Sample</name>

samples/get-state/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-state</artifactId>
   <name>Get xAPI State Sample</name>

samples/get-statement-iterator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-statement-iterator</artifactId>
   <name>Get xAPI StatementIterator Sample</name>

samples/get-statement-with-attachment/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-statement-with-attachment</artifactId>
   <name>Get xAPI Statement With Attachment Sample</name>

samples/get-statement/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-statement</artifactId>
   <name>Get xAPI Statement Sample</name>

samples/get-statements/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-statements</artifactId>
   <name>Get xAPI Statements Sample</name>

samples/get-states/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-states</artifactId>
   <name>Get xAPI States Sample</name>

samples/get-voided-statement/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>get-voided-statement</artifactId>
   <name>Get xAPI Voided Statement Sample</name>

samples/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi</groupId>
     <artifactId>xapi-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <groupId>dev.learning.xapi.samples</groupId>
   <artifactId>xapi-samples-build</artifactId>
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>dev.learning.xapi.samples</groupId>
         <artifactId>core</artifactId>
-        <version>1.1.23-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

samples/post-activity-profile/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>post-activity-profile</artifactId>
   <name>Post xAPI Activity Profile Sample</name>

samples/post-agent-profile/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>post-agent-profile</artifactId>
   <name>Post xAPI Agent Profile Sample</name>

samples/post-signed-statement/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>post-signed-statement</artifactId>
   <name>Post xAPI Signed Statement Sample</name>

samples/post-state/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>post-state</artifactId>
   <name>Post xAPI State Sample</name>

samples/post-statement-with-attachment/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>post-statement-with-attachment</artifactId>
   <name>Post xAPI Statement With Attachment Sample</name>

samples/post-statement/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.learning.xapi.samples</groupId>
     <artifactId>xapi-samples-build</artifactId>
-    <version>1.1.23-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>post-statement</artifactId>
   <name>Post xAPI Statement Sample</name>