Upgrade spring-boot to 3.3.6; upgrade tomcat and spring-session to ma…

…tch the versions in spring-boot-dependencies 3.3.6 (#485)
jboss-fuse · Nov 22, 2024 · ba41b13 · ba41b13
1 parent 063fb0a
commit ba41b13
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/components-starter/camel-platform-http-starter/src/main/docs/platform-http.json b/components-starter/camel-platform-http-starter/src/main/docs/platform-http.json
@@ -17,13 +17,15 @@
       "name": "camel.component.platform-http.autowired-enabled",
       "type": "java.lang.Boolean",
       "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
-      "sourceType": "org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConfiguration"
+      "sourceType": "org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConfiguration",
+      "defaultValue": true
     },
     {
       "name": "camel.component.platform-http.bridge-error-handler",
       "type": "java.lang.Boolean",
       "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. Important: This is only possible if the 3rd party component allows Camel to be alerted if an exception was thrown. Some components handle this internally only, and therefore bridgeErrorHandler is not possible. In other situations we may improve the Camel component to hook into the 3rd party component and make this possible for future releases. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
-      "sourceType": "org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConfiguration"
+      "sourceType": "org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConfiguration",
+      "defaultValue": false
     },
     {
       "name": "camel.component.platform-http.customizer.enabled",
@@ -46,7 +48,8 @@
       "name": "camel.component.platform-http.handle-write-response-error",
       "type": "java.lang.Boolean",
       "description": "When Camel is complete processing the message, and the HTTP server is writing response. This option controls whether Camel should catch any failure during writing response and store this on the Exchange, which allows onCompletion\/UnitOfWork to regard the Exchange as failed and have access to the caused exception from the HTTP server.",
-      "sourceType": "org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConfiguration"
+      "sourceType": "org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConfiguration",
+      "defaultValue": false
     },
     {
       "name": "camel.component.platform-http.header-filter-strategy",

diff --git a/pom.xml b/pom.xml
@@ -110,7 +110,7 @@
         <compiler.fork>false</compiler.fork>
 
         <!-- Spring-Boot target version -->
-        <spring-boot-version>3.3.5</spring-boot-version>
+        <spring-boot-version>3.3.6</spring-boot-version>
 
         <!-- Camel target version -->
         <camel-version>4.8.0.redhat-00010</camel-version>
@@ -156,14 +156,14 @@
         <swagger-parser-v3-version>2.1.20</swagger-parser-v3-version>
         <cyclonedx-maven-plugin-version>2.8.1</cyclonedx-maven-plugin-version>
 
-        <tomcat-version>10.1.30</tomcat-version>
+        <tomcat-version>10.1.33</tomcat-version>
         <snappy-java-version>1.1.10.5</snappy-java-version>
         <woodstox-stax2-api-version>4.2.1</woodstox-stax2-api-version>
         <jolokia-version>2.1.1</jolokia-version>
         <!-- Added for productized build - plexus versions used by patch maven plugin -->
         <openshift-maven-plugin-version>1.17.0.redhat-00003</openshift-maven-plugin-version>
         <wiremock-spring-boot-version>3.0.2</wiremock-spring-boot-version>
-        <spring-session-hazelcast-version>3.3.2</spring-session-hazelcast-version>
+        <spring-session-hazelcast-version>3.3.3</spring-session-hazelcast-version>
     </properties>
 
     <dependencyManagement>

diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4432,7 +4432,7 @@
       <dependency>
         <groupId>org.apache.tomcat</groupId>
         <artifactId>tomcat-catalina</artifactId>
-        <version>10.1.30</version>
+        <version>10.1.33</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>

diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -149,37 +149,37 @@
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat-annotations-api</artifactId>
-                <version>10.1.30</version>
+                <version>10.1.33</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat-jdbc</artifactId>
-                <version>10.1.30</version>
+                <version>10.1.33</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat-jsp-api</artifactId>
-                <version>10.1.30</version>
+                <version>10.1.33</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-core</artifactId>
-                <version>10.1.30</version>
+                <version>10.1.33</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-el</artifactId>
-                <version>10.1.30</version>
+                <version>10.1.33</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-jasper</artifactId>
-                <version>10.1.30</version>
+                <version>10.1.33</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-websocket</artifactId>
-                <version>10.1.30</version>
+                <version>10.1.33</version>
             </dependency>
             <!-- Overrides mvel dependency -->
             <dependency>
@@ -578,7 +578,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.3.5</version>
+                <version>3.3.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>