Skip to content

Commit dfc87fe

Browse files
authored
Migrate project to Java 25 and bump version to 2.0.0-SNAPSHOT (#470)
1 parent e8d38c5 commit dfc87fe

File tree

43 files changed

+63
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+63
-56
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "xAPI Java Development",
3-
"image": "mcr.microsoft.com/devcontainers/java:17",
3+
"image": "mcr.microsoft.com/devcontainers/java:25",
44

55
"features": {
66
"ghcr.io/devcontainers/features/java:1": {
@@ -15,7 +15,7 @@
1515
"java.jdt.ls.java.home": "/usr/lib/jvm/msopenjdk-current",
1616
"java.configuration.runtimes": [
1717
{
18-
"name": "JavaSE-17",
18+
"name": "JavaSE-25",
1919
"path": "/usr/lib/jvm/msopenjdk-current"
2020
}
2121
]

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- uses: actions/setup-java@v5
5858
with:
5959
distribution: 'temurin'
60-
java-version: '17'
60+
java-version: '25'
6161

6262
# Initializes the CodeQL tools for scanning.
6363
# Uses custom configuration file to exclude test directories from analysis.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
- name: Checkout code
3333
uses: actions/checkout@v6
3434

35-
- name: Set up JDK 17
35+
- name: Set up JDK 25
3636
uses: actions/setup-java@v5
3737
with:
38-
java-version: "17"
38+
java-version: "25"
3939
distribution: "temurin"
4040
cache: maven
4141

.github/workflows/maven_pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v6
15-
- name: Set up JDK 17
15+
- name: Set up JDK 25
1616
uses: actions/setup-java@v5
1717
with:
18-
java-version: "17"
18+
java-version: "25"
1919
distribution: "temurin"
2020
cache: maven
2121
cache-dependency-path: |

.github/workflows/maven_push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
- uses: actions/checkout@v6
1515
with:
1616
fetch-depth: 0
17-
- name: Set up JDK 17
17+
- name: Set up JDK 25
1818
uses: actions/setup-java@v5
1919
with:
20-
java-version: "17"
20+
java-version: "25"
2121
distribution: "temurin"
2222
cache: maven
2323
cache-dependency-path: |

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ This project adheres to a [Code of Conduct](CODE_OF_CONDUCT.md). By participatin
3232

3333
### Prerequisites
3434

35-
xAPI Java requires **Java 17 or newer**.
35+
xAPI Java requires **Java 25 or newer**.
3636

37-
#### Installing Java 17
37+
#### Installing Java 25
3838

3939
We recommend using [SDKMAN!](https://sdkman.io/) to install and manage Java versions:
4040

4141
```bash
4242
# Install SDKMAN (if not already installed)
4343
curl -s "https://get.sdkman.io" | bash
4444

45-
# Install Java 17 (Temurin distribution recommended)
46-
sdk install java 17.0.13-tem
45+
# Install Java 25 (Temurin distribution recommended)
46+
sdk install java 25.0.1-tem
4747

4848
# Verify installation
4949
java -version
5050
```
5151

52-
**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.
52+
**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.
5353

5454
### Setting Up Your Development Environment
5555

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ Both the xAPI Client and xAPI Model use a [fluent interface](https://en.wikipedi
88

99
## Requirements
1010

11-
xAPI Java requires **Java 17 or newer**. See [CONTRIBUTING.md](CONTRIBUTING.md#prerequisites) for detailed installation instructions.
11+
xAPI Java requires **Java 25 or newer**. See [CONTRIBUTING.md](CONTRIBUTING.md#prerequisites) for detailed installation instructions.
12+
13+
### Version Compatibility
14+
15+
- **Version 2.x** - Requires Java 25 or newer
16+
- **Version 1.x** - Requires Java 17 or newer
17+
18+
If you need to use Java 17, please use version 1.x of xAPI Java.
1219

1320
## xAPI Java Client
1421

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
</parent>
1010
<groupId>dev.learning.xapi</groupId>
1111
<artifactId>xapi-build</artifactId>
12-
<version>1.1.23-SNAPSHOT</version>
12+
<version>2.0.0-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414
<name>xAPI Build</name>
1515
<description>learning.dev xAPI Build</description>
1616
<url>https://github.com/BerryCloud/xapi-java</url>
1717
<properties>
18-
<java.version>17</java.version>
18+
<java.version>25</java.version>
1919
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
2020
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
2121
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
@@ -296,17 +296,17 @@
296296
<dependency>
297297
<groupId>dev.learning.xapi</groupId>
298298
<artifactId>xapi-model</artifactId>
299-
<version>1.1.23-SNAPSHOT</version>
299+
<version>2.0.0-SNAPSHOT</version>
300300
</dependency>
301301
<dependency>
302302
<groupId>dev.learning.xapi</groupId>
303303
<artifactId>xapi-model-spring-boot-starter</artifactId>
304-
<version>1.1.23-SNAPSHOT</version>
304+
<version>2.0.0-SNAPSHOT</version>
305305
</dependency>
306306
<dependency>
307307
<groupId>dev.learning.xapi</groupId>
308308
<artifactId>xapi-client</artifactId>
309-
<version>1.1.23-SNAPSHOT</version>
309+
<version>2.0.0-SNAPSHOT</version>
310310
</dependency>
311311
<dependency>
312312
<groupId>io.jsonwebtoken</groupId>

samples/core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>dev.learning.xapi.samples</groupId>
66
<artifactId>xapi-samples-build</artifactId>
7-
<version>1.1.23-SNAPSHOT</version>
7+
<version>2.0.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>core</artifactId>
1010
<name>xAPI Samples Core</name>

samples/delete-activity-profile/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>dev.learning.xapi.samples</groupId>
66
<artifactId>xapi-samples-build</artifactId>
7-
<version>1.1.23-SNAPSHOT</version>
7+
<version>2.0.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>delete-activity-profile</artifactId>
1010
<name>Delete xAPI Activity Profile Sample</name>

0 commit comments

Comments
 (0)