Update to Java 21, Spring Boot 3.4.1, Apache TomEE 10, MP 6.0

mpuening · mpuening · commit 68a3ed729edc · 2024-12-26T21:51:48.000-05:00
diff --git a/learn-webservices-jaxrs-server/pom.xml b/learn-webservices-jaxrs-server/pom.xml
@@ -19,22 +19,22 @@
 
 	<properties>
 		<!-- https://github.com/OpenLiberty/ci.maven -->
-		<liberty-maven-plugin.version>3.10.2</liberty-maven-plugin.version>
-		<liberty-runtime.version>24.0.0.3</liberty-runtime.version>
+		<liberty-maven-plugin.version>3.11.2</liberty-maven-plugin.version>
+		<liberty-runtime.version>24.0.0.12</liberty-runtime.version>
 		<liberty.loose-application>true</liberty.loose-application>
 
 		<!-- https://codehaus-cargo.github.io/cargo/Maven+3+Plugin+Reference+Guide.html -->
 		<!-- https://codehaus-cargo.github.io/cargo/Configuration+properties.html -->
-		<cargo-maven-plugin.version>1.10.12</cargo-maven-plugin.version>
+		<cargo-maven-plugin.version>1.10.16</cargo-maven-plugin.version>
 
-		<cargo-wildfly-runtime>wildfly31x</cargo-wildfly-runtime>
+		<cargo-wildfly-runtime>wildfly34x</cargo-wildfly-runtime>
 		<cargo-wildfly-script.dir>${project.basedir}/src/main/wildfly</cargo-wildfly-script.dir>
 
 		<cargo-glassfish-runtime>glassfish7x</cargo-glassfish-runtime>
 
 		<!-- https://tomee.apache.org/master/docs/tomee-maven-plugin.html -->
-		<tomee-maven-plugin.version>10.0.0-M1</tomee-maven-plugin.version>
-		<tomee-runtime.version>10.0.0-M1</tomee-runtime.version>
+		<tomee-maven-plugin.version>10.0.0</tomee-maven-plugin.version>
+		<tomee-runtime.version>10.0.0</tomee-runtime.version>
 
 		<!-- Library support for Open Liberty -->
 		<repo.dir>${user.home}/.m2/repository</repo.dir>
@@ -48,7 +48,7 @@
 
 		<!-- Odds and Ends -->
 		<mp-ext-openapi-ui.version>2.0.0</mp-ext-openapi-ui.version>
-		<nimbus.version>9.37.3</nimbus.version>
+		<nimbus.version>9.48</nimbus.version>
 	</properties>
 
 	<dependencies>
@@ -130,13 +130,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.flywaydb</groupId>
-			<artifactId>flyway-core</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.dataformat</groupId>
-					<artifactId>jackson-dataformat-toml</artifactId>
-				</exclusion>
-			</exclusions>
+			<artifactId>flyway-database-derby</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
diff --git a/learn-webservices-jaxrs-server/src/main/java/io/github/learnjaxrs/util/security/auth/JWTVerifier.java b/learn-webservices-jaxrs-server/src/main/java/io/github/learnjaxrs/util/security/auth/JWTVerifier.java
@@ -1,6 +1,6 @@
 package io.github.learnjaxrs.util.security.auth;
 
-import java.net.URL;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -23,7 +23,6 @@
 import com.nimbusds.jwt.proc.DefaultJWTProcessor;
 import com.nimbusds.jwt.proc.JWTProcessor;
 
-import io.github.learnjaxrs.config.SecurityConfiguration;
 import io.github.learnjaxrs.util.env.ConfigurableEnvironment;
 import io.github.learnjaxrs.util.env.Environment;
 import io.github.learnjaxrs.util.env.MPExpressionEvaluator;
@@ -124,7 +123,7 @@ protected JWTProcessor<SecurityContext> createJwtProcessor(
 		long ttl = 60 * 60 * 1000; // 1 hour
 		long refreshTimeout = 60 * 1000; // 1 minute
 		JWKSource<SecurityContext> jwkSource = JWKSourceBuilder
-				.create(new URL(jwksUrl))
+				.create(URI.create(jwksUrl).toURL())
 				.cache(ttl, refreshTimeout)
 				.retrying(true)
 				.build();
diff --git a/learn-webservices-jaxrs-server/src/main/resources/application-local.properties b/learn-webservices-jaxrs-server/src/main/resources/application-local.properties
@@ -4,3 +4,6 @@
 flyway.migration.enabled=true
 
 test.users.enabled=true
+
+# Depriortize this file from MP Config
+config_ordinal=-99999
diff --git a/learn-webservices-jaxrs-server/src/main/resources/application.properties b/learn-webservices-jaxrs-server/src/main/resources/application.properties
@@ -25,3 +25,5 @@ oauth2.aud=EVAL(oauth2.aud)
 
 test.users.enabled=EVAL(test.users.enabled)
 
+# Depriortize this file from MP Config
+config_ordinal=-99999
diff --git a/learn-webservices-jaxrs-stubs/pom.xml b/learn-webservices-jaxrs-stubs/pom.xml
@@ -18,13 +18,14 @@
 	</parent>
 
 	<properties>
-		<openapi-generator.version>7.5.0</openapi-generator.version>
+		<openapi-generator.version>7.10.0</openapi-generator.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>javax.annotation-api</artifactId>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
diff --git a/pom.xml b/pom.xml
@@ -15,18 +15,25 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.5</version>
+		<version>3.4.1</version>
 	</parent>
 
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 
 		<jakartaee.version>10.0.0</jakartaee.version>
-		<microprofile.version>5.0</microprofile.version>
+		<microprofile.version>6.0</microprofile.version>
+
+		<!-- Overriding Flyway and Derby Version for Flyway compatibility -->
+		<flyway.version>11.1.0</flyway.version>
+		<derby.version>10.17.1.0</derby.version>
+
+		<!-- Choose this version to match Apache TomEE -->
+		<opentelemetry.version>1.20.1</opentelemetry.version>
 
 		<!-- Testing support -->
-		<arquillian.version>1.8.0.Final</arquillian.version>
-		<resteasy.version>6.2.8.Final</resteasy.version>
+		<arquillian.version>1.9.1.Final</arquillian.version>
+		<resteasy.version>6.2.11.Final</resteasy.version>
 	</properties>
 
 	<modules>

Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,5 @@ oauth2.aud=EVAL(oauth2.aud)`
`25`	`25`
`26`	`26`	`test.users.enabled=EVAL(test.users.enabled)`
`27`	`27`
	`28`	`+# Depriortize this file from MP Config`
	`29`	`+config_ordinal=-99999`