Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FWF-3701 : BPM upgrade to latest version #2429

Merged
merged 3 commits into from
Dec 17, 2024
Merged

FWF-3701 : BPM upgrade to latest version #2429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ec60da
FWF-3701 : version upgrades
sumesh-aot Dec 12, 2024
5324f32
Upgrading spring boot to 3.3.5
sumesh-aot Dec 12, 2024
2aa2a88
Incorporating code review comments
sumesh-aot Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions forms-flow-bpm/forms-flow-bpm-camunda/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@

<!-- 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.20.0 - 7.21.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.springSecurityOauth2>2.6.8</version.springSecurityOauth2><!--
2.6.7 - 2.6.8 -->
<version.springBoot>3.3.5</version.springBoot><!-- 3.1.10 - 3.3.5 -->
<version.springSecurityOauth2>2.6.8</version.springSecurityOauth2><!--2.6.7 - 2.6.8 -->
<version.jackson>2.15.0</version.jackson>
<version.commonsFileUpload>1.5</version.commonsFileUpload>
<version.snakeyaml>2.2</version.snakeyaml>
Expand Down Expand Up @@ -327,14 +326,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>
Expand Down
4 changes: 3 additions & 1 deletion ...a/src/main/java/org/camunda/bpm/extension/commons/connector/support/BPMAccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down
3 changes: 3 additions & 0 deletions ...da/src/main/resources/META-INF/resources/webjars/camunda/app/admin/styles/user-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,7 @@ aside li.active>a {
font-size: 30px;
padding: 7px;
line-height: 36px;
}
.ce-eol-banner {
display: none !important;
}
6 changes: 5 additions & 1 deletion .../src/main/resources/META-INF/resources/webjars/camunda/app/cockpit/styles/user-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ aside li.active>a {
font-size: 30px;
padding: 7px;
line-height: 36px;
}
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is to hide the red notice from Camunda on end of life of v7 by Oct 2025

.ce-eol-banner {
display: none !important;
}
6 changes: 5 additions & 1 deletion ...src/main/resources/META-INF/resources/webjars/camunda/app/tasklist/styles/user-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ aside li.active>a {
font-size: 30px;
padding: 7px;
line-height: 36px;
}
}

.ce-eol-banner {
display: none !important;
}
4 changes: 4 additions & 0 deletions .../src/main/resources/META-INF/resources/webjars/camunda/app/welcome/styles/user-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ aside li.active>a {
font-size: 30px;
padding: 7px;
line-height: 36px;
}

.ce-eol-banner {
display: none !important;
}
2 changes: 2 additions & 0 deletions forms-flow-bpm/forms-flow-bpm-camunda/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
28 changes: 14 additions & 14 deletions forms-flow-bpm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@

<!-- versions -->
<version.camundaKeycloak>7.21.5</version.camundaKeycloak>
<version.camunda>7.20.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.springSecurityOauth2>2.6.8</version.springSecurityOauth2><!--
2.6.7 - 2.6.8 -->
<version.jackson>2.15.0</version.jackson>
<version.commonsFileUpload>1.5</version.commonsFileUpload>
<version.snakeyaml>2.2</version.snakeyaml>
<version.camunda>7.21.0</version.camunda><!-- 7.20.0 - 7.21.0 -->
<version.camundaConnect>1.5.4</version.camundaConnect><!-- 1.5.4 -->
<version.camundaMail>1.5.0</version.camundaMail><!-- 1.5.0 -->
<version.springBoot>3.3.5</version.springBoot><!-- 3.1.10 - 3.3.5 -->
<version.springSecurityOauth2>2.6.8</version.springSecurityOauth2><!--2.6.7 - 2.6.8 -->
<version.jackson>2.15.0</version.jackson>
<version.commonsFileUpload>1.5</version.commonsFileUpload>
<version.snakeyaml>2.2</version.snakeyaml>
<spring-cloud.version>2022.0.5</spring-cloud.version>
</properties>

<profiles>
Expand Down Expand Up @@ -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>
Expand Down
Loading