feat: use Java 25

Author: Angular2Guy

.github/workflows/codeql.yml

@@ -63,7 +63,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 24
+        java-version: 25
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)

backend/build.gradle

@@ -21,7 +21,7 @@ version = '0.0.1-SNAPSHOT'
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(24)
+		languageVersion = JavaLanguageVersion.of(25)
 	}
 }
 
@@ -49,7 +49,7 @@ dependencies {
 	implementation 'org.springframework.ai:spring-ai-starter-model-ollama'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
-	testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.0'
+	testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.1'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
@@ -60,3 +60,17 @@ bootJar {
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+// Ensure backend tasks wait for frontend
+
+tasks.named('processResources') {
+    dependsOn(':frontend:buildAngular')
+}
+
+tasks.named('classes') {
+    dependsOn(':frontend:buildAngular')
+}
+
+tasks.named('bootJar') {
+    dependsOn(':frontend:buildAngular')
+}

frontend/build.gradle

@@ -11,58 +11,89 @@
    limitations under the License.
  */
  plugins {
-	id 'java'	
+	id 'java'
 }
 
 group = 'ch.xxx'
 version = '0.0.1-SNAPSHOT'
 
 task cleanAngular {
-	if(project.hasProperty('withAngular')) {	
-		println('Task cleanAngular')	
-		delete('src/angular/node_modules')
-	}
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    doLast {
+        println('Task cleanAngular')
+        delete('src/angular/node_modules')
+    }
+}
+
+task cleanDist {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    doLast {
+        delete('src/angular/dist')
+    }
+}
+
+task createDist {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    doLast {
+        mkdir('src/angular/dist')
+    }
+}
+
+task npmInstall(type: Exec) {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    workingDir = file('src/angular')
+    if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
+        commandLine 'npm.cmd', 'install'
+    } else {
+        commandLine 'npm', 'install'
+    }
+    dependsOn cleanAngular
+}
+
+task npmBuild(type: Exec) {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    workingDir = file('src/angular')
+    if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
+        commandLine 'npm.cmd', 'run', 'build'
+    } else {
+        commandLine 'npm', 'run', 'build'
+    }
+    dependsOn npmInstall, cleanDist, createDist
+}
+
+task testAngular(type: Exec) {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    workingDir = file('src/angular')
+    if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
+        commandLine 'npm.cmd', 'run', 'test'
+    } else {
+        if(project.hasProperty("useChromium")) {
+            commandLine 'npm', 'run', 'test-chromium'
+        } else {
+            commandLine 'npm', 'run', 'test'
+        }
+    }
+    dependsOn npmInstall
+    doFirst {
+        println("Running ${commandLine.join(' ')}")
+    }
 }
 
 task buildAngular {
-	if(project.hasProperty('withAngular')) {		
-		exec {
-			println('Task buildAngular - npm install')		
-			workingDir 'src/angular'
-			if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
-				commandLine('npm.cmd', 'install')
-			} else {
-				commandLine('npm', 'install')
-			}
-		}
-		exec {
-			println('Task buildAngular - npm run build')
-			workingDir 'src/angular'
-			if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
-				commandLine('npm.cmd', 'run', 'build')
-			} else {
-				commandLine('npm', 'run', 'build')
-			}		
-		}
-	}
+    dependsOn npmBuild, testAngular
 }
 
-task testAngular {
-	if(project.hasProperty('withAngular')) {		
-		exec {
-			workingDir 'src/angular'
-			if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
-				println('Task buildAngular - npm run test')		
-				commandLine('npm.cmd', 'run', 'test')
-			} else {
-				if(project.hasProperty("useChromium")) {
-					println('Task buildAngular - npm run test-chromium') 
-					commandLine('npm', 'run', 'test-chromium')
-				} else {
-					logger.info('Task buildAngular - npm run test')
-					commandLine('npm', 'run', 'test')
-				}
-			}
-		}
-	}
-}
+// Make sure the main build task depends on buildAngular
+build.dependsOn buildAngular

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

mcp-server/build.gradle

@@ -21,7 +21,7 @@ version = '0.0.1-SNAPSHOT'
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(24)
+		languageVersion = JavaLanguageVersion.of(25)
 	}
 }