Merge pull request #3446 from tadayosi/HAWNG-497-update-csb-versions

fix: HAWNG-497 Update RHBOAC for Spring Boot version to 4.4.0
hawtio · May 8, 2024 · 4e0063b · 4e0063b
2 parents d13bca1 + 0040c04
commit 4e0063b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/examples/springboot-log4j2/pom.xml b/examples/springboot-log4j2/pom.xml
@@ -16,10 +16,6 @@
   <name>${project.artifactId}</name>
   <description>Hawtio :: Sample Spring Boot 3.x process with Log4J2</description>
 
-  <properties>
-    <camel-version>4.0.0.redhat-00045</camel-version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>

diff --git a/examples/springboot/pom.xml b/examples/springboot/pom.xml
@@ -15,10 +15,6 @@
   <name>${project.artifactId}</name>
   <description>Hawtio :: Sample Spring Boot 3.x process</description>
 
-  <properties>
-    <camel-version>4.0.0.redhat-00045</camel-version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>

diff --git a/pom.xml b/pom.xml
@@ -55,8 +55,12 @@
     <quarkus-version>3.2.11.Final-redhat-00001</quarkus-version>
     <quarkus-extension-version>3.2.11.Final-redhat-00001</quarkus-extension-version>
     <!-- Spring -->
-    <spring-version>6.0.18</spring-version>
-    <spring-boot-version>3.1.10</spring-boot-version>
+    <!-- https://docs.spring.io/spring-boot/docs/3.2.5/reference/html/dependency-versions.html -->
+    <spring-version>6.1.6</spring-version>
+    <spring-boot-version>3.2.5</spring-boot-version>
+    <!-- Camel -->
+    <!-- https://access.redhat.com/articles/7021827#headerCSB -->
+    <camel-version>4.4.0.redhat-00014</camel-version>
     <!-- Jetty -->
     <jetty-version>11.0.20</jetty-version>
     <!-- Keycloak -->

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -15,7 +15,6 @@
   <packaging>pom</packaging>
 
   <properties>
-    <camel-version>4.0.0.redhat-00045</camel-version>
     <http5-version>5.2.3</http5-version>
     <slf4j-version>2.0.9</slf4j-version>
     <selenium-version>4.12.1</selenium-version>

diff --git a/tests/springboot/pom.xml b/tests/springboot/pom.xml
@@ -88,7 +88,7 @@
     <!-- jetty -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jaas</artifactId>
+      <artifactId>jetty-security</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

diff --git a/tests/springboot/src/main/java/io/hawt/tests/spring/boot/PropertyFileLoginModule.java b/tests/springboot/src/main/java/io/hawt/tests/spring/boot/PropertyFileLoginModule.java
@@ -7,10 +7,12 @@
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
 
-import org.eclipse.jetty.jaas.spi.AbstractLoginModule;
+import org.eclipse.jetty.security.jaas.spi.AbstractLoginModule;
 import org.eclipse.jetty.security.PropertyUserStore;
 import org.eclipse.jetty.security.RolePrincipal;
 import org.eclipse.jetty.security.UserPrincipal;
+import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,8 +41,11 @@ private void setupPropertyUserStore(final Map<String, ?> options) {
         parseConfig(options);
 
         if (PROPERTY_USERSTORES.get(filename) == null) {
-            final PropertyUserStore propertyUserStore = new PropertyUserStore();
-            propertyUserStore.setConfig(filename);
+            PropertyUserStore propertyUserStore = new PropertyUserStore();
+            ResourceFactory resourceFactory = ResourceFactory.of(propertyUserStore);
+            Resource config = resourceFactory.newResource(filename);
+
+            propertyUserStore.setConfig(config);
             propertyUserStore.setHotReload(hotReload);
 
             final PropertyUserStore prev = PROPERTY_USERSTORES.putIfAbsent(filename, propertyUserStore);

diff --git a/tests/springboot/src/main/java/io/hawt/tests/spring/boot/SpringBootService.java b/tests/springboot/src/main/java/io/hawt/tests/spring/boot/SpringBootService.java
@@ -68,7 +68,7 @@ public void init() {
 
         setSystemPropertyIfNotSet(HAWTIO_ROLES, "admin");
         setSystemPropertyIfNotSet(HAWTIO_REALM, "hawtio");
-        setSystemPropertyIfNotSet(HAWTIO_ROLE_PRINCIPAL_CLASSES, "org.eclipse.jetty.jaas.JAASRole");
+        setSystemPropertyIfNotSet(HAWTIO_ROLE_PRINCIPAL_CLASSES, "org.eclipse.jetty.security.jaas.JAASRole");
 
         System.setProperty(HAWTIO_AUTHENTICATION_ENABLED, Boolean.getBoolean("debugMode") ? "false" : "true");
     }