Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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"
}
]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion xapi-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<artifactId>xapi-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion xapi-model-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<artifactId>xapi-model-spring-boot-starter</artifactId>
<name>xAPI Spring Boot Starter</name>
Expand Down
2 changes: 1 addition & 1 deletion xapi-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<artifactId>xapi-model</artifactId>
<name>xAPI Model</name>
Expand Down
Loading