chore(engine): bump spring dependency to version 6

related to #4869

Author: tasso94

engine/pom.xml

@@ -26,7 +26,7 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>${version.spring.framework}</version>
+        <version>${version.spring.framework6}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -333,6 +333,13 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.github.h-thurow</groupId>
+      <artifactId>simple-jndi</artifactId>
+      <version>0.24.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 

engine/src/test/java/org/camunda/bpm/container/impl/jmx/deployment/BpmPlatformXmlLocationTest.java

@@ -35,9 +35,9 @@
 import java.net.URLDecoder;
 
 import org.camunda.bpm.container.impl.tomcat.deployment.TomcatParseBpmPlatformXmlStep;
-import org.junit.Rule;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
-import org.springframework.mock.jndi.SimpleNamingContext;
 
 /**
  * Checks the correct retrieval of bpm-platform.xml file through JNDI,
@@ -63,8 +63,19 @@ public class BpmPlatformXmlLocationTest {
   private static final String BPM_PLATFORM_XML_LOCATION_URL_HTTP_PROTOCOL = "http://localhost:8080/camunda/" + BPM_PLATFORM_XML_FILE;
   private static final String BPM_PLATFORM_XML_LOCATION_URL_HTTPS_PROTOCOL = "https://localhost:8080/camunda/" + BPM_PLATFORM_XML_FILE;
 
-  @Rule
-  public MockInitialContextRule initialContextRule = new MockInitialContextRule(new SimpleNamingContext());
+  protected Context context;
+
+  @Before
+  public void setUp() throws NamingException {
+    context = new InitialContext();
+  }
+
+  @After
+  public void close() throws NamingException {
+    if (context != null) {
+      context.close();
+    }
+  }
 
   @Test
   public void checkValidBpmPlatformXmlResourceLocationForUrl() throws NamingException, MalformedURLException {
@@ -121,7 +132,6 @@ public void checkValidBpmPlatformXmlResourceLocation() throws NamingException, M
 
   @Test
   public void getBpmPlatformXmlLocationFromJndi() throws NamingException, MalformedURLException {
-    Context context = new InitialContext();
     context.bind("java:comp/env/" + BPM_PLATFORM_XML_LOCATION, BPM_PLATFORM_XML_FILE_ABSOLUTE_LOCATION);
 
     URL url = new TomcatParseBpmPlatformXmlStep().lookupBpmPlatformXmlLocationFromJndi();
@@ -184,7 +194,6 @@ public void getBpmPlatformXmlFromCatalinaConfDirectory() throws MalformedURLExce
 
   @Test
   public void lookupBpmPlatformXml() throws NamingException, MalformedURLException {
-    Context context = new InitialContext();
     context.bind("java:comp/env/" + BPM_PLATFORM_XML_LOCATION, BPM_PLATFORM_XML_FILE_ABSOLUTE_LOCATION);
 
     URL url = new TomcatParseBpmPlatformXmlStep().lookupBpmPlatformXml();

engine/src/test/java/org/camunda/bpm/container/impl/jmx/deployment/MockInitialContextFactory.java

@@ -184,7 +184,7 @@ public void testBatchWindowXmlConfigParsingException() throws ParseException {
       .createProcessEngineConfigurationFromResource("org/camunda/bpm/engine/test/history/history-cleanup-batch-window-map-wrong-values.camunda.cfg.xml")
       .buildProcessEngine())
     .isInstanceOf(Exception.class)
-    .hasMessageContaining("startTime");
+    .hasMessageContaining("Error creating bean with name 'processEngineConfiguration'");
   }
 
   @Test

engine/src/test/java/org/camunda/bpm/container/impl/jmx/deployment/MockInitialContextRule.java

@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.osjava.sj.SimpleContextFactory
+org.osjava.sj.jndi.shared=true

engine/src/test/java/org/camunda/bpm/engine/test/api/history/HistoryCleanupOnEngineBootstrapTest.java

@@ -22,10 +22,9 @@
 import org.camunda.bpm.webapp.impl.security.auth.Authentication;
 import org.camunda.bpm.webapp.impl.security.filter.RequestMatcher.Match;
 import org.camunda.bpm.webapp.impl.security.filter.util.FilterRules;
-import org.springframework.util.PathMatcher;
 
 /**
- * <p>A {@link SecurityFilterRule} that deleagates to a set of {@link PathMatcher}s</p>
+ * <p>A {@link SecurityFilterRule} that delegates to a set of path matchers</p>
  *
  * <p>How this thing works:
  * <ul>