Upgrade Spring Boot version to 3.3.1

- Upgrade Spring Framework version to `6.1.10` - Upgrade Spring Security version to `6.3.1` - Upgrade bcprov version to `1.78.1` - Upgrade Jackson-datatype version to `2.17.1` - Upgrade Jakarta persistence-api version to `3.1.0` - Upgrade jgit version to `6.10.0.202406032230-r` - Upgrade asciidoctor.diagram version to `2.3.1` - Upgrade maven-dependency-plugin version to `3.7.1` - Upgrade exec-maven-plugin version to `3.3.0` - Upgrade maven-checkstyle-plugin version to `3.4.0` - Upgrade maven-compiler-plugin version to `3.13.0` - Upgrade maven-deploy-plugin version to `3.1.2` - Upgrade maven-enforcer-plugin version to `3.5.0` - Upgrade maven-install-plugin version to `3.1.2` - Upgrade maven-javadoc-plugin version to `3.7.0` - Upgrade maven-release-plugin version to `3.1.0` - Upgrade maven-source-plugin version to `3.3.1` - Upgrade maven-surefire-plugin version to `3.3.0` - Upgrade nexus-staging-maven-plugin version to `1.7.0` - Upgrade asciidoctorj-pdf version `2.3.17` - Upgrade Checkstyle version to `10.17.0` - Upgrade Spring javaformat-checkstyle version to `0.0.42`
coherence-community · Jul 3, 2024 · 736b96b · 736b96b
1 parent 418854e
commit 736b96b
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 43 deletions.
diff --git a/...main/java/com/oracle/coherence/spring/data/repository/query/CoherenceRepositoryQuery.java b/...main/java/com/oracle/coherence/spring/data/repository/query/CoherenceRepositoryQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -39,9 +39,10 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.query.DefaultParameters;
 import org.springframework.data.repository.query.ParameterAccessor;
+import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
+import org.springframework.data.repository.query.ParametersSource;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
@@ -112,7 +113,20 @@ public CoherenceRepositoryQuery(NamedMap namedMap, Method method, RepositoryMeta
 	public Object execute(Object[] parameters) {
 
 		PartTree partTree = new PartTree(this.method.getName(), this.metadata.getDomainType());
-		ParameterAccessor accessor = new ParametersParameterAccessor(new DefaultParameters(this.method), parameters);
+
+		Parameters<?, ?> springDataParameters = new MyDefaultParameters(this.method);
+
+		/*
+		 * Deprecated in Spring Data 2023.1.4 and removed in 2024.0.1
+		 */
+		// Parameters<?, ?> springDataParameters = new DefaultParameters(this.method);
+
+		/*
+		 * Recommended replacement. But this does not work.
+		 */
+		// Parameters<?, ?> springDataParameters = new DefaultParameters(ParametersSource.of(this.method));
+
+		ParameterAccessor accessor = new ParametersParameterAccessor(springDataParameters, parameters);
 		CoherenceQueryCreator creator = new CoherenceQueryCreator(partTree, accessor);
 		QueryResult queryResult = creator.createQuery();
 
@@ -279,4 +293,24 @@ public QueryMethod getQueryMethod() {
 
 		return this.queryMethod;
 	}
+
+	/**
+	 * Custom {@link Parameters} implementation, so we can call the super constructor. We should not really have to do
+	 * this. This is a workaround for the fact that the constructor is protected.
+	 */
+	class MyDefaultParameters extends Parameters {
+
+		private MyDefaultParameters(List<org.springframework.data.repository.query.Parameter> parameters) {
+			super(parameters);
+		}
+
+		MyDefaultParameters(Method method) {
+			super(ParametersSource.of(method), null);
+		}
+
+		@Override
+		protected Parameters createFrom(List parameters) {
+			return new MyDefaultParameters(parameters);
+		}
+	}
 }
diff --git a/coherence-spring-site/pom.xml b/coherence-spring-site/pom.xml
@@ -25,12 +25,12 @@
 	<properties>
 		<coherence.spring.root>${basedir}/..</coherence.spring.root>
 		<helidon.sitegen.version>3.0.5</helidon.sitegen.version>
-		<asciidoctor.diagram.version>2.3.0</asciidoctor.diagram.version>
+		<asciidoctor.diagram.version>2.3.1</asciidoctor.diagram.version>
 		<doxia.version>1.11.1</doxia.version>
 
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-		<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
+		<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
 	</properties>
 
 	<dependencies>

diff --git a/pom.xml b/pom.xml
@@ -114,40 +114,40 @@
 		<asciidoctor-maven-plugin.version>3.0.0</asciidoctor-maven-plugin.version>
 		<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
 		<doxia-module-markdown.version>1.0</doxia-module-markdown.version>
-		<exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
+		<exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>
 		<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
 		<github.site-maven-plugin.version>0.12</github.site-maven-plugin.version>
 		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
 		<dependency-check-maven.version>9.2.0</dependency-check-maven.version>
 		<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-		<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
-		<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
-		<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
-		<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+		<maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
+		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+		<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
+		<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
 		<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
-		<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
+		<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
 		<maven-jacoco-plugin.version>0.8.12</maven-jacoco-plugin.version>
 		<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
-		<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-		<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+		<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
+		<maven-release-plugin.version>3.1.0</maven-release-plugin.version>
 		<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
 		<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
-		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-		<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
+		<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+		<maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
+		<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
 		<spring-boot-maven-plugin.version>${spring-boot.version}</spring-boot-maven-plugin.version>
 
 		<!-- Other plugin dependency versions -->
-		<asciidoctorj-pdf.version>2.3.15</asciidoctorj-pdf.version>
-		<checkstyle.version>10.13.0</checkstyle.version>
-		<spring-javaformat-checkstyle.version>0.0.41</spring-javaformat-checkstyle.version>
+		<asciidoctorj-pdf.version>2.3.17</asciidoctorj-pdf.version>
+		<checkstyle.version>10.17.0</checkstyle.version>
+		<spring-javaformat-checkstyle.version>0.0.42</spring-javaformat-checkstyle.version>
 		<spring-asciidoctor-extensions.version>0.6.3</spring-asciidoctor-extensions.version>
 		<spring-doc-resources.version>0.2.5</spring-doc-resources.version>
 
 		<!-- dependency versions (alphabetically) -->
 		<assertj.version>3.25.3</assertj.version>
 		<awaitility.version>4.2.1</awaitility.version>
-		<bcprov.version>1.78</bcprov.version>
+		<bcprov.version>1.78.1</bcprov.version>
 		<bedrock.version>7.0.2</bedrock.version>
 		<coherence.groupId>com.oracle.coherence.ce</coherence.groupId>
 		<coherence.version>24.03</coherence.version>
@@ -159,23 +159,23 @@
 		<jackson-datatype.version>2.17.1</jackson-datatype.version>
 		<jakartaee-api.version>10.0.0</jakartaee-api.version>
 		<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
-		<jakarta.persistence-api.version>3.0.0</jakarta.persistence-api.version>
+		<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
 		<jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
 		<jakarta.inject.version>2.0.1</jakarta.inject.version>
 		<javassist.version>3.30.2-GA</javassist.version>
 		<junit.version>5.10.2</junit.version>
 		<log4j.version>2.23.1</log4j.version>
 		<mockito.version>5.11.0</mockito.version>
 		<modelmapper.version>3.2.0</modelmapper.version>
-		<org.springframework.version>6.1.6</org.springframework.version>
+		<org.springframework.version>6.1.10</org.springframework.version>
 		<reactor.version>3.6.7</reactor.version>
 		<resilience4j.version>2.2.0</resilience4j.version>
 		<slf4j-api.version>2.0.13</slf4j-api.version>
-		<spring-boot.version>3.2.5</spring-boot.version>
+		<spring-boot.version>3.3.1</spring-boot.version>
 		<spring-cloud.version>2023.0.1</spring-cloud.version>
-		<spring-data-bom.version>2023.1.4</spring-data-bom.version>
+		<spring-data-bom.version>2023.1.4</spring-data-bom.version> <!-- 2024.0.1 -->
 		<spring-session.version>3.2.2</spring-session.version>
-		<spring-security.version>6.2.4</spring-security.version>
+		<spring-security.version>6.3.1</spring-security.version>
 		<tomcat.version>10.1.25</tomcat.version>
 	</properties>
 

diff --git a/samples/circuit-breaker-cache-demo/circuit-breaker-cache-demo-app/pom.xml b/samples/circuit-breaker-cache-demo/circuit-breaker-cache-demo-app/pom.xml
@@ -23,7 +23,6 @@
 
 	<properties>
 		<coherence.spring.root>${basedir}/../../..</coherence.spring.root>
-		<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
 	</properties>
 
 	<dependencies>

diff --git a/samples/coherence-spring-cloud-config-demo/pom.xml b/samples/coherence-spring-cloud-config-demo/pom.xml
@@ -28,7 +28,7 @@
 	</modules>
 
 	<properties>
-		<org.eclipse.jgit.version>6.9.0.202403050737-r</org.eclipse.jgit.version>
+		<org.eclipse.jgit.version>6.10.0.202406032230-r</org.eclipse.jgit.version>
 	</properties>
 
 	<dependencyManagement>

diff --git a/src/main/config/dependency-check-suppression.xml b/src/main/config/dependency-check-suppression.xml
@@ -13,20 +13,4 @@
         ]]></notes>
         <vulnerabilityName>CVE-2023-5763</vulnerabilityName>
     </suppress>
-
-    <suppress>
-        <notes><![CDATA[
-        In Coherence Spring Cloud Config Demo
-        file name: sshd-osgi-2.10.0.jar
-        ]]></notes>
-        <cve>CVE-2023-48795</cve>
-    </suppress>
-
-    <suppress>
-        <notes><![CDATA[
-        (Medium) Via Coherence 24.03
-        file name: netty-codec-http-4.1.107.Final.jar
-        ]]></notes>
-        <cve>CVE-2024-29025</cve>
-    </suppress>
 </suppressions>