diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b321ae8d..54ed2863 100644 --- a/.devcontainer/devcontainer.json +++ b/.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" } ] diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ee4e5b9e..0e6e8f51 100644 --- a/.github/workflows/codeql.yml +++ b/.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. diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index 56cf2bb3..d023e7bd 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.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 diff --git a/.github/workflows/maven_pull_request.yml b/.github/workflows/maven_pull_request.yml index 32a33da1..c13d27bd 100644 --- a/.github/workflows/maven_pull_request.yml +++ b/.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: | diff --git a/.github/workflows/maven_push.yml b/.github/workflows/maven_push.yml index 94e2e4d7..3105af05 100644 --- a/.github/workflows/maven_push.yml +++ b/.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: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4cdd3ae7..ec08a59c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,9 +32,9 @@ 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: @@ -42,14 +42,14 @@ We recommend using [SDKMAN!](https://sdkman.io/) to install and manage Java vers # 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 diff --git a/README.md b/README.md index 7dcfdaec..9f6e5bb9 100644 --- a/README.md +++ b/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 diff --git a/pom.xml b/pom.xml index 45b26236..ed50a622 100644 --- a/pom.xml +++ b/pom.xml @@ -9,13 +9,13 @@ dev.learning.xapi xapi-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT pom xAPI Build learning.dev xAPI Build https://github.com/BerryCloud/xapi-java - 17 + 25 0.8.14 3.6.0 3.2.8 @@ -296,17 +296,17 @@ dev.learning.xapi xapi-model - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT dev.learning.xapi xapi-model-spring-boot-starter - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT dev.learning.xapi xapi-client - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT io.jsonwebtoken diff --git a/samples/core/pom.xml b/samples/core/pom.xml index 48d5463c..2345e749 100644 --- a/samples/core/pom.xml +++ b/samples/core/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT core xAPI Samples Core diff --git a/samples/delete-activity-profile/pom.xml b/samples/delete-activity-profile/pom.xml index e28ce1c9..6a0af4ba 100644 --- a/samples/delete-activity-profile/pom.xml +++ b/samples/delete-activity-profile/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT delete-activity-profile Delete xAPI Activity Profile Sample diff --git a/samples/delete-agent-profile/pom.xml b/samples/delete-agent-profile/pom.xml index 7129e740..3db66477 100644 --- a/samples/delete-agent-profile/pom.xml +++ b/samples/delete-agent-profile/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT delete-agent-profile Delete xAPI Agent Profile Sample diff --git a/samples/delete-state/pom.xml b/samples/delete-state/pom.xml index d98b0856..67362d9a 100644 --- a/samples/delete-state/pom.xml +++ b/samples/delete-state/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT delete-state Delete xAPI State Sample diff --git a/samples/delete-states/pom.xml b/samples/delete-states/pom.xml index 6e2b626d..ad6d0f44 100644 --- a/samples/delete-states/pom.xml +++ b/samples/delete-states/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT delete-states Delete xAPI States Sample diff --git a/samples/get-about/pom.xml b/samples/get-about/pom.xml index 3925d9ae..7ce48c4b 100644 --- a/samples/get-about/pom.xml +++ b/samples/get-about/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-about Get xAPI About Sample diff --git a/samples/get-activity-profile/pom.xml b/samples/get-activity-profile/pom.xml index f88e53e6..e970db5f 100644 --- a/samples/get-activity-profile/pom.xml +++ b/samples/get-activity-profile/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-activity-profile Get xAPI Activity Profile Sample diff --git a/samples/get-activity-profiles/pom.xml b/samples/get-activity-profiles/pom.xml index e1c4da20..3fbb23c8 100644 --- a/samples/get-activity-profiles/pom.xml +++ b/samples/get-activity-profiles/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-activity-profiles Get xAPI Activity Profiles Sample diff --git a/samples/get-activity/pom.xml b/samples/get-activity/pom.xml index 7f669ebb..7f0baba1 100644 --- a/samples/get-activity/pom.xml +++ b/samples/get-activity/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-activity Get xAPI Activity Sample diff --git a/samples/get-agent-profile/pom.xml b/samples/get-agent-profile/pom.xml index 5b14639c..82162ac8 100644 --- a/samples/get-agent-profile/pom.xml +++ b/samples/get-agent-profile/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-agent-profile Get xAPI Agent Profile Sample diff --git a/samples/get-agent-profiles/pom.xml b/samples/get-agent-profiles/pom.xml index 35afff7b..137d021e 100644 --- a/samples/get-agent-profiles/pom.xml +++ b/samples/get-agent-profiles/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-agent-profiles Get xAPI Agent Profiles Sample diff --git a/samples/get-agents/pom.xml b/samples/get-agents/pom.xml index 768ef816..26da4369 100644 --- a/samples/get-agents/pom.xml +++ b/samples/get-agents/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-agents Get xAPI Agents Sample diff --git a/samples/get-more-statements/pom.xml b/samples/get-more-statements/pom.xml index 8227589f..9ddbd74c 100644 --- a/samples/get-more-statements/pom.xml +++ b/samples/get-more-statements/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-more-statements Get xAPI More Statements Sample diff --git a/samples/get-state/pom.xml b/samples/get-state/pom.xml index eb4c6cf7..97e29d0a 100644 --- a/samples/get-state/pom.xml +++ b/samples/get-state/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-state Get xAPI State Sample diff --git a/samples/get-statement-iterator/pom.xml b/samples/get-statement-iterator/pom.xml index 9b903892..5440f3ae 100644 --- a/samples/get-statement-iterator/pom.xml +++ b/samples/get-statement-iterator/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-statement-iterator Get xAPI StatementIterator Sample diff --git a/samples/get-statement-with-attachment/pom.xml b/samples/get-statement-with-attachment/pom.xml index e0d6cb57..8ff0c605 100644 --- a/samples/get-statement-with-attachment/pom.xml +++ b/samples/get-statement-with-attachment/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-statement-with-attachment Get xAPI Statement With Attachment Sample diff --git a/samples/get-statement/pom.xml b/samples/get-statement/pom.xml index dd3a9cf1..0668e6cc 100644 --- a/samples/get-statement/pom.xml +++ b/samples/get-statement/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-statement Get xAPI Statement Sample diff --git a/samples/get-statements/pom.xml b/samples/get-statements/pom.xml index 7b8a99ea..5b77325a 100644 --- a/samples/get-statements/pom.xml +++ b/samples/get-statements/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-statements Get xAPI Statements Sample diff --git a/samples/get-states/pom.xml b/samples/get-states/pom.xml index 0db8f42e..e99ce2b6 100644 --- a/samples/get-states/pom.xml +++ b/samples/get-states/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-states Get xAPI States Sample diff --git a/samples/get-voided-statement/pom.xml b/samples/get-voided-statement/pom.xml index 8eb77b97..02bc4344 100644 --- a/samples/get-voided-statement/pom.xml +++ b/samples/get-voided-statement/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT get-voided-statement Get xAPI Voided Statement Sample diff --git a/samples/pom.xml b/samples/pom.xml index 2745d045..59c682af 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi xapi-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT dev.learning.xapi.samples xapi-samples-build @@ -27,7 +27,7 @@ dev.learning.xapi.samples core - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT diff --git a/samples/post-activity-profile/pom.xml b/samples/post-activity-profile/pom.xml index 27319625..da05fd54 100644 --- a/samples/post-activity-profile/pom.xml +++ b/samples/post-activity-profile/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT post-activity-profile Post xAPI Activity Profile Sample diff --git a/samples/post-agent-profile/pom.xml b/samples/post-agent-profile/pom.xml index 1361939e..428b0c85 100644 --- a/samples/post-agent-profile/pom.xml +++ b/samples/post-agent-profile/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT post-agent-profile Post xAPI Agent Profile Sample diff --git a/samples/post-signed-statement/pom.xml b/samples/post-signed-statement/pom.xml index c5740201..e07eb554 100644 --- a/samples/post-signed-statement/pom.xml +++ b/samples/post-signed-statement/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT post-signed-statement Post xAPI Signed Statement Sample diff --git a/samples/post-state/pom.xml b/samples/post-state/pom.xml index acc0fd4a..1dcceb47 100644 --- a/samples/post-state/pom.xml +++ b/samples/post-state/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT post-state Post xAPI State Sample diff --git a/samples/post-statement-with-attachment/pom.xml b/samples/post-statement-with-attachment/pom.xml index 7e2be87e..9a4deef2 100644 --- a/samples/post-statement-with-attachment/pom.xml +++ b/samples/post-statement-with-attachment/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT post-statement-with-attachment Post xAPI Statement With Attachment Sample diff --git a/samples/post-statement/pom.xml b/samples/post-statement/pom.xml index 92e40903..9e7aaf3c 100644 --- a/samples/post-statement/pom.xml +++ b/samples/post-statement/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT post-statement Post xAPI Statement Sample diff --git a/samples/post-statements/pom.xml b/samples/post-statements/pom.xml index e3ab60a3..18e2924c 100644 --- a/samples/post-statements/pom.xml +++ b/samples/post-statements/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT post-statements Post xAPI Statements Sample diff --git a/samples/put-activity-profile/pom.xml b/samples/put-activity-profile/pom.xml index ce9279f4..a4cb321f 100644 --- a/samples/put-activity-profile/pom.xml +++ b/samples/put-activity-profile/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT put-activity-profile Put xAPI Activity Profile Sample diff --git a/samples/put-agent-profile/pom.xml b/samples/put-agent-profile/pom.xml index 1462f518..ff084852 100644 --- a/samples/put-agent-profile/pom.xml +++ b/samples/put-agent-profile/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT put-agent-profile Put xAPI Agent Profile Sample diff --git a/samples/put-state/pom.xml b/samples/put-state/pom.xml index 3e9098ab..ae29c891 100644 --- a/samples/put-state/pom.xml +++ b/samples/put-state/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT put-state Put xAPI State Sample diff --git a/samples/xapi-server/pom.xml b/samples/xapi-server/pom.xml index a8f7746a..7fe212fe 100644 --- a/samples/xapi-server/pom.xml +++ b/samples/xapi-server/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi.samples xapi-samples-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT xapi-server xAPI Server Sample diff --git a/xapi-client/pom.xml b/xapi-client/pom.xml index f8df0898..381aa2d9 100644 --- a/xapi-client/pom.xml +++ b/xapi-client/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi xapi-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT xapi-client diff --git a/xapi-model-spring-boot-starter/pom.xml b/xapi-model-spring-boot-starter/pom.xml index 573bfd9e..f675abe4 100644 --- a/xapi-model-spring-boot-starter/pom.xml +++ b/xapi-model-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi xapi-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT xapi-model-spring-boot-starter xAPI Spring Boot Starter diff --git a/xapi-model/pom.xml b/xapi-model/pom.xml index b6c4c0ca..bba0ade2 100644 --- a/xapi-model/pom.xml +++ b/xapi-model/pom.xml @@ -4,7 +4,7 @@ dev.learning.xapi xapi-build - 1.1.23-SNAPSHOT + 2.0.0-SNAPSHOT xapi-model xAPI Model