deps: bump spring-boot to 3.2.0

.github/workflows/maven.yml

@@ -26,5 +26,3 @@ jobs:
       run: |
         export AWS_REGION=us-west-1
         mvn -B install
-      env:
-        SPRING_CONTENT_VERSION: ${{ secrets.SPRING_CONTENT_VERSION }} 

.github/workflows/prs.yml

@@ -27,5 +27,3 @@ jobs:
       run: |
         export AWS_REGION=us-west-1      
         mvn -B install
-      env:
-        SPRING_CONTENT_VERSION: ${{ secrets.SPRING_CONTENT_VERSION }} 

pom.xml

@@ -47,8 +47,8 @@ Integrates with Spring Data, Spring Data REST and Apache Solr</description>
 
 	<properties>
 		<ginkgo-version>1.0.15</ginkgo-version>
-		<spring-content-version>3.1.0-SNAPSHOT</spring-content-version>
-		<springboot-version>3.0.7</springboot-version>
+		<spring-content-version>3.0.8-SNAPSHOT</spring-content-version>
+		<springboot-version>3.2.0</springboot-version>
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
 		<jakarta-persistence-api.version>3.1.0</jakarta-persistence-api.version>
 		<hibernate.version>5.6.15.Final</hibernate.version>

spring-eg-content-azure-storage/pom.xml

@@ -50,7 +50,14 @@
 	  		<artifactId>spring-boot-starter-test</artifactId>
 	  		<scope>test</scope>
 	  	</dependency>
-	  	<dependency>
+		<!-- required with surefire plugin 3+ otherwise tests are not found -->
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<version>5.10.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
 	  		<groupId>commons-io</groupId>
 	  		<artifactId>commons-io</artifactId>
 	  		<version>2.15.0</version>

spring-eg-content-commons/pom.xml

@@ -11,16 +11,6 @@
 	<artifactId>spring-eg-content-commons</artifactId>
 
 	<dependencies>
-		<dependency>
-			<groupId>jakarta.persistence</groupId>
-			<artifactId>jakarta.persistence-api</artifactId>
-			<version>${jakarta-persistence-api.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-commons</artifactId>
@@ -87,7 +77,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mongodb</artifactId>
-            <version>1.16.3</version>
+            <version>1.17.6</version>
             <scope>provided</scope>
         </dependency>
 	</dependencies>

spring-eg-content-commons/src/main/java/examples/AbstractSpringContentMongoConfiguration.java → spring-eg-content-commons/src/main/java/examples/mongo/AbstractSpringContentMongoConfiguration.java

@@ -1,4 +1,4 @@
-package examples;
+package examples.mongo;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -12,7 +12,6 @@
 
 import com.mongodb.client.MongoClient;
 
-@Configuration
 public class AbstractSpringContentMongoConfiguration extends AbstractMongoClientConfiguration {
 
 	private static final Log log = LogFactory.getLog(AbstractSpringContentMongoConfiguration.class);

spring-eg-content-commons/src/main/java/examples/MongoTestContainer.java → spring-eg-content-commons/src/main/java/examples/mongo/MongoTestContainer.java

@@ -1,7 +1,7 @@
-package examples;
+package examples.mongo;
 
+import org.apache.commons.lang.StringUtils;
 import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.shaded.org.apache.commons.lang.StringUtils;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;

spring-eg-content-fs-boot-starter/src/main/java/examples/Application.java

@@ -1,5 +1,6 @@
 package examples;
 
+import internal.org.springframework.content.mongo.boot.autoconfigure.MongoContentAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -17,7 +18,7 @@
  *
  */
 
-@SpringBootApplication(exclude={MongoRepositoriesAutoConfiguration.class})
+@SpringBootApplication(exclude={MongoRepositoriesAutoConfiguration.class, MongoContentAutoConfiguration.class})
 @ComponentScan(excludeFilters={
 		@Filter(type = FilterType.REGEX,
 				pattern = {

spring-eg-content-fs-boot-starter/src/test/java/examples/FsBootExamplesTest.java

@@ -2,8 +2,12 @@
 
 import com.github.paulcwarren.ginkgo4j.Ginkgo4jConfiguration;
 import com.github.paulcwarren.ginkgo4j.Ginkgo4jSpringRunner;
+import internal.org.springframework.content.mongo.boot.autoconfigure.MongoContentAutoConfiguration;
 import org.junit.runner.RunWith;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import tests.smoke.ContentStoreTests;
 
 @RunWith(Ginkgo4jSpringRunner.class)

spring-eg-content-mongo-boot-starter/src/main/java/examples/Application.java

@@ -1,5 +1,6 @@
 package examples;
 
+import examples.mongo.AbstractSpringContentMongoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
@@ -19,6 +20,7 @@ public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
 
+	@Configuration
 	public static class MongoConfig extends AbstractSpringContentMongoConfiguration {
 	}
 

spring-eg-content-mongo/src/test/java/examples/MongoConfig.java

@@ -1,6 +1,7 @@
 package examples;
 
 
+import examples.mongo.AbstractSpringContentMongoConfiguration;
 import org.springframework.content.mongo.config.EnableMongoStores;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;

spring-eg-content-solr-boot-starter/src/main/java/examples/solrboot/Application.java

@@ -16,7 +16,6 @@
  */
 
 @SpringBootApplication
-//@ComponentScan("org.springframework.content.solr")
 @EnableConfigurationProperties
 @EnableAutoConfiguration(exclude={MongoRepositoriesAutoConfiguration.class})
 public class Application {

spring-eg-content-solr-boot-starter/src/test/java/examples/solrboot/SolrTestContainer.java

@@ -14,6 +14,7 @@ public class SolrTestContainer extends SolrContainer {
 
     private SolrTestContainer() {
         super(IMAGE_NAME);
+        setStartupAttempts(10);
         start();
 
         try {

spring-eg-content-solr/src/test/java/examples/solr/SolrTestContainer.java

@@ -14,6 +14,7 @@ public class SolrTestContainer extends SolrContainer {
 
     private SolrTestContainer() {
         super(IMAGE_NAME);
+        this.setStartupAttempts(10);
         start();
 
         try {