From 598fe4b2816a129acc3a66103bfa8d612858c27b Mon Sep 17 00:00:00 2001 From: Keymaster65 Date: Fri, 29 Aug 2025 12:43:56 +0200 Subject: [PATCH 1/5] Update to Java 25 --- WHATSNEW.txt | 5 ++++- build.gradle.kts | 8 +++++--- gradle.properties | 2 +- projects/copper-coreengine/build.gradle.kts | 10 +++++----- projects/copper-ext/build.gradle.kts | 4 ++-- projects/copper-regtest/build.gradle.kts | 8 ++++++-- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/WHATSNEW.txt b/WHATSNEW.txt index f19a092e..8a8f7883 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,9 +1,12 @@ +COPPER 25.0.0 +============ +- Breaking: Update to Java 25 + COPPER 21.0.0 ============ - New feature: Optional use of virtual threads in Processor - Breaking: Remove extension of Thread from Processor - Breaking: Update to Java 21 -- Breaking: Update to Java 21 - Breaking: Exclude from publishing: copper-spring, copper-performance-test and copper-cassandra - Breaking: Update jgit 6.9.0.202403050737-r to 7.1.0.202411261347-r - Maintenance: Update gradle 8.8 to 8.11.1 diff --git a/build.gradle.kts b/build.gradle.kts index a603276e..98be38ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,10 +20,12 @@ subprojects { java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 + toolchain { + languageVersion = JavaLanguageVersion.of(25) + } } - tasks.register("createSourcesJar") { dependsOn(tasks.classes) archiveClassifier.set("sources") diff --git a/gradle.properties b/gradle.properties index b9d4961f..ed580f4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=21.0.0-SNAPSHOT +version=25.0.0-SNAPSHOT org.gradle.console=plain org.gradle.vfs.watch=true diff --git a/projects/copper-coreengine/build.gradle.kts b/projects/copper-coreengine/build.gradle.kts index 31949fff..2293662e 100644 --- a/projects/copper-coreengine/build.gradle.kts +++ b/projects/copper-coreengine/build.gradle.kts @@ -5,11 +5,11 @@ dependencies { implementation("org.slf4j:slf4j-api:2.0.13") - implementation("org.ow2.asm:asm:9.7") - implementation("org.ow2.asm:asm-commons:9.7") - implementation("org.ow2.asm:asm-tree:9.7") - implementation("org.ow2.asm:asm-util:9.7") - implementation("org.ow2.asm:asm-analysis:9.7") + implementation("org.ow2.asm:asm:9.8") + implementation("org.ow2.asm:asm-commons:9.8") + implementation("org.ow2.asm:asm-tree:9.8") + implementation("org.ow2.asm:asm-util:9.8") + implementation("org.ow2.asm:asm-analysis:9.8") } tasks.register("scriptsZip") { diff --git a/projects/copper-ext/build.gradle.kts b/projects/copper-ext/build.gradle.kts index 5e7d3937..85151763 100644 --- a/projects/copper-ext/build.gradle.kts +++ b/projects/copper-ext/build.gradle.kts @@ -4,8 +4,8 @@ dependencies { implementation(project(":projects:copper-coreengine")) implementation("org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r") - implementation("org.ow2.asm:asm:9.7") - implementation("org.ow2.asm:asm-tree:9.7") + implementation("org.ow2.asm:asm:9.8") + implementation("org.ow2.asm:asm-tree:9.8") implementation("commons-io:commons-io:2.16.1") implementation("com.google.guava:guava:31.0.1-jre") implementation("org.yaml:snakeyaml:1.33") diff --git a/projects/copper-regtest/build.gradle.kts b/projects/copper-regtest/build.gradle.kts index a9e2bc9c..46962aa8 100644 --- a/projects/copper-regtest/build.gradle.kts +++ b/projects/copper-regtest/build.gradle.kts @@ -11,8 +11,8 @@ dependencies { implementation(project(":projects:copper-coreengine")) implementation(project(":projects:copper-ext")) - implementation("org.ow2.asm:asm:9.7") - implementation("org.ow2.asm:asm-tree:9.7") + implementation("org.ow2.asm:asm:9.8") + implementation("org.ow2.asm:asm-tree:9.8") implementation("org.yaml:snakeyaml:1.33") implementation("org.springframework:spring-jdbc:5.3.36") implementation("org.springframework:spring-context:5.3.36") @@ -26,4 +26,8 @@ dependencies { testImplementation("com.h2database:h2:1.4.193") testImplementation("com.mchange:c3p0:0.10.0") testImplementation("org.slf4j:slf4j-api:2.0.13") +} + +tasks.withType { + jvmArgs = listOf("-Dorg.copperengine.workflow.compiler.options=-target,25,-source,25") } \ No newline at end of file From 7a7fe4a185fee8ebd2062885269069c9c0780303 Mon Sep 17 00:00:00 2001 From: Keymaster65 Date: Fri, 29 Aug 2025 12:57:40 +0200 Subject: [PATCH 2/5] Update to java-version 25 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c9c71b6..b5b61294 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,10 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} restore-keys: | ${{ runner.os }}-gradle- - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v4 with: distribution: zulu - java-version: 21 + java-version: 25 - name: Build with Gradle run: ./gradlew --no-daemon --no-parallel --rerun-tasks --info --full-stacktrace build \ No newline at end of file From 020b25528353d9027dbe756ba5d6e8c4e9fd0595 Mon Sep 17 00:00:00 2001 From: Keymaster65 Date: Fri, 29 Aug 2025 12:59:05 +0200 Subject: [PATCH 3/5] Update to actions/setup-java@v5 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5b61294..6980d770 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Set up JDK 25 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 25 From ee775aa7dbc069c9b7b13b0ea3f78c11a630a8f9 Mon Sep 17 00:00:00 2001 From: Wolf Sluyterman van Langeweyde Date: Fri, 29 Aug 2025 15:24:24 +0200 Subject: [PATCH 4/5] Use -ea release --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6980d770..f6d3c989 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,6 @@ jobs: uses: actions/setup-java@v5 with: distribution: zulu - java-version: 25 + java-version: 25-ea - name: Build with Gradle run: ./gradlew --no-daemon --no-parallel --rerun-tasks --info --full-stacktrace build \ No newline at end of file From 9bc8229eee4ffa263e27666309167d509bfea7b9 Mon Sep 17 00:00:00 2001 From: Keymaster65 Date: Fri, 29 Aug 2025 16:27:59 +0200 Subject: [PATCH 5/5] Update to gradle 9.1.0-rc-1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c82..f5651b71 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-rc-1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME