diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
index 65298b0f..7ebb5773 100644
--- a/.github/workflows/deploy_snapshot.yml
+++ b/.github/workflows/deploy_snapshot.yml
@@ -15,7 +15,8 @@ on:
     types: [ trigger_after_upstream_deploy ]
 
 env:
-  GRADLE_VERSION: 7.4 # Gradle version used
+  GRADLE_VERSION: 8.14.4 # Gradle version used
+  JAVA_VERSION: 21
   GRADLE_CLI_OPTS: "-Pci --build-cache" # CLI options passed to Gradle
   GRADLE_BUILD_ACTION_CACHE_KEY_JOB: "test-cache-${{ github.head_ref }}.${{ github.sha }}"
 
@@ -29,6 +30,11 @@ jobs:
     steps:
       - name: Checkout project sources
         uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{env.JAVA_VERSION}}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
@@ -45,6 +51,11 @@ jobs:
     steps:
       - name: Checkout project sources
         uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{env.JAVA_VERSION}}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
diff --git a/.github/workflows/test_branch.yml b/.github/workflows/test_branch.yml
index 0afb306d..e4e4236b 100644
--- a/.github/workflows/test_branch.yml
+++ b/.github/workflows/test_branch.yml
@@ -12,7 +12,8 @@ on:
     branches-ignore: [ "dev" ] # Do not run this on the default branch
 
 env:
-  GRADLE_VERSION: 7.4 # Gradle version used
+  GRADLE_VERSION: 8.14.4 # Gradle version used
+  JAVA_VERSION: 21 # Java version used
   GRADLE_CLI_OPTS: "-Pci --build-cache" # CLI options passed to Gradle
   GRADLE_BUILD_ACTION_CACHE_KEY_JOB: "test-cache-${{ github.head_ref }}.${{ github.sha }}"
 
@@ -26,6 +27,11 @@ jobs:
     steps:
       - name: Checkout project sources
         uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{env.JAVA_VERSION}}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
diff --git a/build.gradle b/build.gradle
index f9062ec9..3294b6d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(11)
+            languageVersion = JavaLanguageVersion.of(21)
         }
 
         withJavadocJar()
diff --git a/gradle.properties b/gradle.properties
index d7f65498..3d31502b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@ version=7.9.0-SNAPSHOT
 # dependency versions
 mc_version=7.9.0-SNAPSHOT
 emf_version=2.15.0
-shadow_plugin_version=7.1.2
+shadow_plugin_version=8.3.9
 guava_version=31.1-jre
-junit_version=5.10.3
+junit_version=6.0.3
 google_java_format_version=0.9
-spoon_core_version=10.2.0
+spoon_core_version=11.3.0
 commons_lang3_version=3.9
\ No newline at end of file
diff --git a/javaDSL-emf/build.gradle b/javaDSL-emf/build.gradle
index df12a609..51da9a31 100644
--- a/javaDSL-emf/build.gradle
+++ b/javaDSL-emf/build.gradle
@@ -32,5 +32,6 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_version"
 }
\ No newline at end of file
diff --git a/javaDSL/build.gradle b/javaDSL/build.gradle
index 9db43956..abf298bd 100644
--- a/javaDSL/build.gradle
+++ b/javaDSL/build.gradle
@@ -54,7 +54,8 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_version"
 
     corpus(corpusLibs.guava)
     corpus(corpusLibs.monticore.runtime)
diff --git a/ref-code-adaptation/build.gradle b/ref-code-adaptation/build.gradle
index 1e3f5488..41ca3251 100644
--- a/ref-code-adaptation/build.gradle
+++ b/ref-code-adaptation/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
 
     id "de.monticore.generator" version "$mc_version"
-    id "com.github.johnrengelman.shadow" version "$shadow_plugin_version"
+    id "com.gradleup.shadow" version "$shadow_plugin_version"
     id "com.github.sherter.google-java-format" version "$google_java_format_version"  // Task "verifyGoogleJavaFormat" and "googleJavaFormat"
 }
 
@@ -27,8 +27,9 @@ dependencies {
     implementation "de.monticore.lang:cd4analysis:$mc_version:tool"
 
     implementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_version"
 
     grammar("de.monticore.lang:cd4analysis:$mc_version")
     grammar("de.monticore:monticore-grammar:$mc_version")