Upgrade to Spring Boot 3.4.0

flowable · Dec 13, 2024 · 1a16c1d · 1a16c1d
1 parent e611059
commit 1a16c1d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/...es/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationTest.java b/...es/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationTest.java
@@ -57,6 +57,7 @@ public void contextShouldLoadPropertiesInACorrectOrder() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
+                "applicationInfo",
                 "Management Server"
             );
 

diff --git a/...t/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsKafkaAndRabbitTest.java b/...t/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsKafkaAndRabbitTest.java
@@ -62,6 +62,7 @@ public void contextShouldLoad() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
+                "applicationInfo",
                 "Management Server"
             );
 

diff --git a/...p-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsTest.java b/...p-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsTest.java
@@ -58,6 +58,7 @@ public void contextShouldLoad() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
+                "applicationInfo",
                 "Management Server"
             );
 

diff --git a/...rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledKafkaTest.java b/...rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledKafkaTest.java
@@ -58,6 +58,7 @@ public void contextShouldLoad() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
+                "applicationInfo",
                 "Management Server"
             );
 

diff --git a/...est/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledRabbitTest.java b/...est/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledRabbitTest.java
@@ -58,6 +58,7 @@ public void contextShouldLoad() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
+                "applicationInfo",
                 "Management Server"
             );
 

diff --git a/...owable/spring/boot/environment/FlowableDefaultPropertiesEnvironmentPostProcessorTest.java b/...owable/spring/boot/environment/FlowableDefaultPropertiesEnvironmentPostProcessorTest.java
@@ -57,7 +57,8 @@ public void flowableDefaultPropertiesAreBeLoaded() {
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "Config resource 'class path resource [application.yml]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
-                "flowableDefaultConfig: [classpath:/flowable-default.yml]"
+                "flowableDefaultConfig: [classpath:/flowable-default.yml]",
+                "applicationInfo"
             );
 
         assertThat(environment.getProperty("foo")).isEqualTo("from-flowable-default-properties");
@@ -87,6 +88,7 @@ public void flowableDefaultPropertiesAreBeforeApplicationDefaultProperties() {
                 "Config resource 'class path resource [application.yml]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
                 "flowableDefaultConfig: [classpath:/flowable-default.yml]",
+                "applicationInfo",
                 "defaultProperties"
             );
 

diff --git a/...igure/src/test/java/org/flowable/test/spring/boot/idm/IdmEngineAutoConfigurationTest.java b/...igure/src/test/java/org/flowable/test/spring/boot/idm/IdmEngineAutoConfigurationTest.java
@@ -141,7 +141,8 @@ public void standaloneIdmEngineWithDelegatingPasswordEncoder() {
                 assertThatThrownBy(() -> flowablePasswordEncoder.isMatches("test", "test", null))
                     .as("encoder matches password")
                     .isInstanceOf(IllegalArgumentException.class)
-                    .hasMessage("You have entered a password with no PasswordEncoder. If that is your intent, it should be prefixed with `{noop}`.");
+                    .hasMessage("Given that there is no default password encoder configured, each password must have a password encoding prefix."
+                            + " Please either prefix this password with '{noop}' or set a default password encoder in `DelegatingPasswordEncoder`.");
             });
     }
 

diff --git a/pom.xml b/pom.xml
@@ -14,14 +14,14 @@
 		<distributionManagementSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</distributionManagementSnapshotsUrl>
 		<jdk.version>17</jdk.version>
 		<!-- When updating one spring version, make sure that all of them are updated to their latest compatible versions -->
-		<spring.boot.version>3.3.4</spring.boot.version>
-		<spring.framework.version>6.1.13</spring.framework.version>
-		<spring.security.version>6.3.3</spring.security.version>
-		<spring.amqp.version>3.1.7</spring.amqp.version>
-		<spring.kafka.version>3.2.5</spring.kafka.version>
+		<spring.boot.version>3.4.0</spring.boot.version>
+		<spring.framework.version>6.2.0</spring.framework.version>
+		<spring.security.version>6.4.1</spring.security.version>
+		<spring.amqp.version>3.2.0</spring.amqp.version>
+		<spring.kafka.version>3.3.0</spring.kafka.version>
 		<spring.ldap.version>3.2.8</spring.ldap.version>
-		<reactor-netty.version>1.1.22</reactor-netty.version>
-		<jackson.version>2.17.2</jackson.version>
+		<reactor-netty.version>1.2.0</reactor-netty.version>
+		<jackson.version>2.18.1</jackson.version>
 		<jakarta-jms.version>3.1.0</jakarta-jms.version>
         <camel.version>4.8.0</camel.version>
 		<cxf.version>4.0.5</cxf.version>
@@ -153,7 +153,7 @@
 			<dependency>
 				<groupId>org.apache.httpcomponents.client5</groupId>
 				<artifactId>httpclient5</artifactId>
-				<version>5.3.1</version>
+				<version>5.4.1</version>
 			</dependency>
 			<dependency>
 				<groupId>com.oracle.database.jdbc</groupId>