Update java

concert-demos-gui/package.json

@@ -30,7 +30,11 @@
     "@angular/language-service": "~21.0.6",
     "@types/jasmine": "~5.1.13",
     "@types/jasminewd2": "~2.0.13",
+<<<<<<< HEAD
+    "@types/node": "~25.0.0",
+=======
     "@types/node": "~25.0.3",
+>>>>>>> 355b31758920f14cd4832a7dca7e7b680d7af804
     "codelyzer": "^6.0.2",
     "jasmine-core": "~5.13.0",
     "jasmine-spec-reporter": "~7.0.0",

pom.xml

@@ -12,7 +12,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>21</java.version>
+        <java.version>25</java.version>
         <maven-compiler-plugin.source>${java.version}</maven-compiler-plugin.source>
         <maven-compiler-plugin.target>${java.version}</maven-compiler-plugin.target>
         <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
@@ -26,7 +26,11 @@
         <kotest-extensions-spring.version>1.3.0</kotest-extensions-spring.version>
         <mockk.version>1.14.7</mockk.version>
 
+<<<<<<< HEAD
+        <netty-all.version>4.2.8.Final</netty-all.version>
+=======
         <netty-all.version>4.2.9.Final</netty-all.version>
+>>>>>>> 355b31758920f14cd4832a7dca7e7b680d7af804
         <postgresql.version>42.7.8</postgresql.version>
 
         <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>