Skip to content

Commit

Permalink
chore(pom): add support for Spring Boot 3.4.0
Browse files Browse the repository at this point in the history
Related to #4657
  • Loading branch information
mboskamp committed Dec 5, 2024
1 parent 4fe9dfc commit 19d14eb
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
10 changes: 5 additions & 5 deletions clients/java/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<tomcat.runtime>${engine.runtime}/server/apache-tomcat-${version.tomcat}</tomcat.runtime>
<http.port>${tomcat.connector.http.port}</http.port>

<tomcat.connector.http.port>50080</tomcat.connector.http.port>
<tomcat.connector.http.redirectPort>50443</tomcat.connector.http.redirectPort>
<tomcat.connector.ajp.port>50009</tomcat.connector.ajp.port>
<tomcat.connector.ajp.redirectPort>50443</tomcat.connector.ajp.redirectPort>
<tomcat.server.port>50005</tomcat.server.port>
<tomcat.connector.http.port>48080</tomcat.connector.http.port>
<tomcat.connector.http.redirectPort>48443</tomcat.connector.http.redirectPort>
<tomcat.connector.ajp.port>48009</tomcat.connector.ajp.port>
<tomcat.connector.ajp.redirectPort>48443</tomcat.connector.ajp.redirectPort>
<tomcat.server.port>48005</tomcat.server.port>

<cargo.timeout>240000</cargo.timeout>
<cargo.deploy.timeout>60000</cargo.deploy.timeout>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#for tests internal usage only
camunda.engine.rest=http://localhost:50080/engine-rest
camunda.engine.rest=http://localhost:48080/engine-rest
camunda.engine.name=/engine/default
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ public Set<Resource> getDeploymentResources() {
protected String getNormalizedDeploymentDir() {
String result = deploymentDir;

// deploymentDir can be null if code is run by not using the start script (e.g. for tests)
if(result == null) {
return null;
}

if(File.separator.equals("\\")) {
result = result.replace("\\", "/");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void shouldNotRedirect() {

// then
exceptionRule.expect(ResourceAccessException.class);
exceptionRule.expectMessage("Connection refused");
exceptionRule.expectMessage("I/O error on GET request for \"http://localhost:8080/engine-rest/task\":");

// then
ResponseEntity<String> response = testRestTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null), String.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ server:
key-store-type: pkcs12
key-alias: camunda
key-password: camunda
port: 8443
port: 8443
spring.http.client.factory: simple
6 changes: 3 additions & 3 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<properties>
<version.quarkus>3.15.0</version.quarkus>
<version.spring.framework>5.3.39</version.spring.framework>
<version.spring.framework6>6.1.15</version.spring.framework6>
<version.spring-boot>3.3.6</version.spring-boot>
<version.spring.framework6>6.2.0</version.spring.framework6>
<version.spring-boot>3.4.0</version.spring-boot>
<version.resteasy>3.15.6.Final</version.resteasy>
<version.jersey2>2.34</version.jersey2>
<!-- use minimum version of resteasy and jersey -->
Expand All @@ -43,7 +43,7 @@
<version.xml.jaxb-impl4>4.0.5</version.xml.jaxb-impl4>
<version.jakarta.xml.bind-api>4.0.2</version.jakarta.xml.bind-api>
<version.httpclient>4.5.14</version.httpclient>
<version.httpclient5>5.3</version.httpclient5>
<version.httpclient5>5.4.1</version.httpclient5>

<version.slf4j>1.7.26</version.slf4j>
<version.logback>1.2.11</version.logback>
Expand Down

0 comments on commit 19d14eb

Please sign in to comment.