From 4ec60daa8b8fb359e6a2743a2e4d32ab955ef5b0 Mon Sep 17 00:00:00 2001 From: Sumesh Kariyil Date: Thu, 12 Dec 2024 14:41:12 -0800 Subject: [PATCH 1/3] FWF-3701 : version upgrades --- forms-flow-bpm/forms-flow-bpm-camunda/pom.xml | 14 +++++++------- .../connector/support/BPMAccessHandler.java | 4 +++- .../camunda/app/admin/styles/user-styles.css | 3 +++ .../camunda/app/cockpit/styles/user-styles.css | 6 +++++- .../camunda/app/tasklist/styles/user-styles.css | 6 +++++- .../camunda/app/welcome/styles/user-styles.css | 4 ++++ .../src/main/resources/application.yaml | 2 ++ forms-flow-bpm/pom.xml | 14 +++++++------- 8 files changed, 36 insertions(+), 17 deletions(-) diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml index 20301f6573..8bdfa32e6e 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml +++ b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml @@ -28,10 +28,10 @@ 7.21.5 - 7.20.0 + 7.21.0 1.5.4 1.5.0 - 3.1.10 + 3.3.0 2.6.8 2.15.0 @@ -327,14 +327,14 @@ org.springframework spring-websocket - 6.0.11 + 6.1.12 - org.springframework - spring-messaging - 6.0.11 - + org.springframework + spring-messaging + 6.1.12 + org.graalvm.js diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/java/org/camunda/bpm/extension/commons/connector/support/BPMAccessHandler.java b/forms-flow-bpm/forms-flow-bpm-camunda/src/main/java/org/camunda/bpm/extension/commons/connector/support/BPMAccessHandler.java index 1a777d703e..08ac67f87e 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/java/org/camunda/bpm/extension/commons/connector/support/BPMAccessHandler.java +++ b/forms-flow-bpm/forms-flow-bpm-camunda/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/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/admin/styles/user-styles.css b/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/admin/styles/user-styles.css index 107f846a75..a2bcfa2cb4 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/admin/styles/user-styles.css +++ b/forms-flow-bpm/forms-flow-bpm-camunda/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; } \ No newline at end of file diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/cockpit/styles/user-styles.css b/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/cockpit/styles/user-styles.css index 107f846a75..d99cad3169 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/cockpit/styles/user-styles.css +++ b/forms-flow-bpm/forms-flow-bpm-camunda/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; -} \ No newline at end of file +} + +.ce-eol-banner { + display: none !important; +} diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/tasklist/styles/user-styles.css b/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/tasklist/styles/user-styles.css index 107f846a75..d99cad3169 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/tasklist/styles/user-styles.css +++ b/forms-flow-bpm/forms-flow-bpm-camunda/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; -} \ No newline at end of file +} + +.ce-eol-banner { + display: none !important; +} diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/welcome/styles/user-styles.css b/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/welcome/styles/user-styles.css index 107f846a75..fd8f605814 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/META-INF/resources/webjars/camunda/app/welcome/styles/user-styles.css +++ b/forms-flow-bpm/forms-flow-bpm-camunda/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; } \ No newline at end of file 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 index 5219362d19..8e99eaf2fd 100644 --- 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 index 3eb21ff142..04a01e4800 100644 --- a/forms-flow-bpm/pom.xml +++ b/forms-flow-bpm/pom.xml @@ -23,10 +23,10 @@ 7.21.5 - 7.20.0 + 7.21.0 1.5.4 1.5.0 - 3.1.10 + 3.3.0 2.6.8 2.15.0 @@ -296,15 +296,15 @@ - org.springframework - spring-websocket - 6.0.11 - + org.springframework + spring-websocket + 6.1.12 + org.springframework spring-messaging - 6.0.11 + 6.1.12 From 5324f323efe4f3314b16c74a1a66c8c76b972ebb Mon Sep 17 00:00:00 2001 From: Sumesh Kariyil Date: Thu, 12 Dec 2024 15:20:56 -0800 Subject: [PATCH 2/3] Upgrading spring boot to 3.3.5 --- forms-flow-bpm/forms-flow-bpm-camunda/pom.xml | 2 +- forms-flow-bpm/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml index 8bdfa32e6e..82ee5c80e1 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml +++ b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml @@ -31,7 +31,7 @@ 7.21.0 1.5.4 1.5.0 - 3.3.0 + 3.3.5 2.6.8 2.15.0 diff --git a/forms-flow-bpm/pom.xml b/forms-flow-bpm/pom.xml index 04a01e4800..68d7f87922 100644 --- a/forms-flow-bpm/pom.xml +++ b/forms-flow-bpm/pom.xml @@ -26,7 +26,7 @@ 7.21.0 1.5.4 1.5.0 - 3.3.0 + 3.3.5 2.6.8 2.15.0 From 2aa2a883bde30198d022248c6f11d956eab2c2c8 Mon Sep 17 00:00:00 2001 From: Sumesh Kariyil Date: Mon, 16 Dec 2024 10:51:57 -0800 Subject: [PATCH 3/3] Incorporating code review comments --- forms-flow-bpm/forms-flow-bpm-camunda/pom.xml | 7 +++---- forms-flow-bpm/pom.xml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml index 82ee5c80e1..d7f2862cfb 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml +++ b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml @@ -28,12 +28,11 @@ 7.21.5 - 7.21.0 + 7.21.0 1.5.4 1.5.0 - 3.3.5 - 2.6.8 + 3.3.5 + 2.6.8 2.15.0 1.5 2.2 diff --git a/forms-flow-bpm/pom.xml b/forms-flow-bpm/pom.xml index 68d7f87922..4ea6a79e2d 100644 --- a/forms-flow-bpm/pom.xml +++ b/forms-flow-bpm/pom.xml @@ -23,15 +23,15 @@ 7.21.5 - 7.21.0 - 1.5.4 - 1.5.0 - 3.3.5 - 2.6.8 - 2.15.0 - 1.5 - 2.2 + 7.21.0 + 1.5.4 + 1.5.0 + 3.3.5 + 2.6.8 + 2.15.0 + 1.5 + 2.2 + 2022.0.5