diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..90533b5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+# Normalize text files to LF in the repository
+* text=auto
+
+# Scripts that must keep platform-specific line endings
+gradlew text eol=lf
+*.bat text eol=crlf
+
+# Test fixtures (encodings, binary samples) must stay byte-for-byte intact
+JavaReleases/src/test/resources/** -text
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a4ce7be..0e16783 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -51,6 +51,7 @@ jobs:
           JavaReleases/build/test-results/test/*.xml
           DesignPatterns/build/test-results/test/*.xml
           CleanCode/build/test-results/test/*.xml
+          Common/build/test-results/test/*.xml
 
     - name: Set badge color
       shell: bash
diff --git a/.gitignore b/.gitignore
index 33f9c31..d283981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,7 @@ bin/
 
 ### Mac OS ###
 .DS_Store
-/HelloWorld.class
+
+### Leftovers of Java6#testJavaDynamicCompilation when it fails before cleanup ###
+/JavaReleases/HelloWorld.java
+/JavaReleases/HelloWorld.class
diff --git a/build.gradle b/build.gradle
index 7383636..c9499fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,12 +8,13 @@ subprojects {
     version = rootProject.version
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_25
-        targetCompatibility = JavaVersion.VERSION_25
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(25)
+        }
     }
 
     dependencies {
-        testImplementation platform('org.junit:junit-bom:5.11.3')
+        testImplementation platform('org.junit:junit-bom:6.1.3')
         testImplementation 'org.junit.jupiter:junit-jupiter'
         testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     }
diff --git a/settings.gradle b/settings.gradle
index b7da2c3..17c1c89 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,6 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
+
 rootProject.name = 'JavaLab'
 include 'JavaReleases', 'FirstSteps', 'DesignPatterns', 'CleanCode','Common'