FWF-3701 : version upgrades

AOT-Technologies · Dec 12, 2024 · 4ec60da · 4ec60da
1 parent f65fcd2
commit 4ec60da
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 17 deletions.
diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml
@@ -28,10 +28,10 @@
 
         <!-- versions -->
         <version.camundaKeycloak>7.21.5</version.camundaKeycloak>
-        <version.camunda>7.20.0</version.camunda><!-- 7.18.0 - 7.20.0 -->
+        <version.camunda>7.21.0</version.camunda><!-- 7.18.0 - 7.20.0 -->
         <version.camundaConnect>1.5.4</version.camundaConnect><!-- 1.5.4 -->
         <version.camundaMail>1.5.0</version.camundaMail><!-- 1.5.0 -->
-        <version.springBoot>3.1.10</version.springBoot><!-- 3.1.5 - 3.1.10 -->
+        <version.springBoot>3.3.0</version.springBoot><!-- 3.1.5 - 3.1.10 -->
         <version.springSecurityOauth2>2.6.8</version.springSecurityOauth2><!--
 			2.6.7 - 2.6.8 -->
         <version.jackson>2.15.0</version.jackson>
@@ -327,14 +327,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-websocket</artifactId>
-            <version>6.0.11</version>
+            <version>6.1.12</version>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-messaging</artifactId>
-            <version>6.0.11</version>
-        </dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-messaging</artifactId>
+			<version>6.1.12</version>
+		</dependency>
 
         <dependency>
             <groupId>org.graalvm.js</groupId>

diff --git a/...a/src/main/java/org/camunda/bpm/extension/commons/connector/support/BPMAccessHandler.java b/...a/src/main/java/org/camunda/bpm/extension/commons/connector/support/BPMAccessHandler.java
@@ -5,6 +5,7 @@
 import org.camunda.bpm.extension.commons.ro.req.IRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -31,7 +32,8 @@ public class BPMAccessHandler extends AbstractAccessHandler{
     private final Properties properties;
     private final WebClient webClient;
 
-    public BPMAccessHandler(Properties integrationCredentialProperties, WebClient unauthenticatedWebClient){
+    public BPMAccessHandler(@Qualifier("integrationCredentialProperties") Properties integrationCredentialProperties, 
+    		@Qualifier("unauthenticatedWebClient") WebClient unauthenticatedWebClient){
         this.properties = integrationCredentialProperties;
         this.webClient = unauthenticatedWebClient;
     }

diff --git a/...da/src/main/resources/META-INF/resources/webjars/camunda/app/admin/styles/user-styles.css b/...da/src/main/resources/META-INF/resources/webjars/camunda/app/admin/styles/user-styles.css
@@ -74,4 +74,7 @@ aside li.active>a {
   font-size: 30px;
   padding: 7px;
   line-height: 36px;
+}
+.ce-eol-banner {
+	display: none !important;
 }
diff --git a/.../src/main/resources/META-INF/resources/webjars/camunda/app/cockpit/styles/user-styles.css b/.../src/main/resources/META-INF/resources/webjars/camunda/app/cockpit/styles/user-styles.css
@@ -74,4 +74,8 @@ aside li.active>a {
   font-size: 30px;
   padding: 7px;
   line-height: 36px;
-}
+}
+
+.ce-eol-banner {
+	display: none !important;
+}
diff --git a/...src/main/resources/META-INF/resources/webjars/camunda/app/tasklist/styles/user-styles.css b/...src/main/resources/META-INF/resources/webjars/camunda/app/tasklist/styles/user-styles.css
@@ -74,4 +74,8 @@ aside li.active>a {
   font-size: 30px;
   padding: 7px;
   line-height: 36px;
-}
+}
+
+.ce-eol-banner {
+	display: none !important;
+}
diff --git a/.../src/main/resources/META-INF/resources/webjars/camunda/app/welcome/styles/user-styles.css b/.../src/main/resources/META-INF/resources/webjars/camunda/app/welcome/styles/user-styles.css
@@ -74,4 +74,8 @@ aside li.active>a {
   font-size: 30px;
   padding: 7px;
   line-height: 36px;
+}
+
+.ce-eol-banner {
+	display: none !important;
 }
diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/application.yaml b/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/application.yaml
@@ -136,6 +136,8 @@ spring:
       secret: ${VAULT_SECRET} # secret name
       token: ${VAULT_TOKEN}
       uri: ${VAULT_URL}
+    compatibility-verifier:
+      enabled: false
 
 # Keycloak JWT Client configuration
 keycloak.jwt.realm: ${KEYCLOAK_URL_REALM}

diff --git a/forms-flow-bpm/pom.xml b/forms-flow-bpm/pom.xml
@@ -23,10 +23,10 @@
 
 		<!-- versions -->
 		<version.camundaKeycloak>7.21.5</version.camundaKeycloak>
-		<version.camunda>7.20.0</version.camunda><!-- 7.18.0 - 7.20.0 -->
+		<version.camunda>7.21.0</version.camunda><!-- 7.18.0 - 7.20.0 -->
 		<version.camundaConnect>1.5.4</version.camundaConnect><!-- 1.5.4 -->
 		<version.camundaMail>1.5.0</version.camundaMail><!-- 1.5.0 -->
-		<version.springBoot>3.1.10</version.springBoot><!-- 3.1.5 - 3.1.10 -->
+		<version.springBoot>3.3.0</version.springBoot><!-- 3.1.5 - 3.1.10 -->
 		<version.springSecurityOauth2>2.6.8</version.springSecurityOauth2><!--
 			2.6.7 - 2.6.8 -->
 		<version.jackson>2.15.0</version.jackson>
@@ -296,15 +296,15 @@
 				</dependency>
 
 				<dependency>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-websocket</artifactId>
-					<version>6.0.11</version>
-				</dependency>
+		            <groupId>org.springframework</groupId>
+		            <artifactId>spring-websocket</artifactId>
+		            <version>6.1.12</version>
+		        </dependency>
 
 				<dependency>
 					<groupId>org.springframework</groupId>
 					<artifactId>spring-messaging</artifactId>
-					<version>6.0.11</version>
+					<version>6.1.12</version>
 				</dependency>
 
 				<dependency>