Skip to content

Commit 7720863

Browse files
paulcwarrenpaulcwarren
authored
Merge pull request #1505 from paulcwarren/ci/bump-spring-boot-3.2.0
deps: bump spring-boot to 3.2.0
2 parents dc0a1b2 + b30f4a2 commit 7720863

File tree

15 files changed

+25
-42
lines changed

15 files changed

+25
-42
lines changed

‎.github/workflows/maven.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,3 @@ jobs:
2626
run: |
2727
export AWS_REGION=us-west-1
2828
mvn -B install
29-
env:
30-
SPRING_CONTENT_VERSION: ${{ secrets.SPRING_CONTENT_VERSION }}

‎.github/workflows/prs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,3 @@ jobs:
2727
run: |
2828
export AWS_REGION=us-west-1
2929
mvn -B install
30-
env:
31-
SPRING_CONTENT_VERSION: ${{ secrets.SPRING_CONTENT_VERSION }}

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ Integrates with Spring Data, Spring Data REST and Apache Solr</description>
4747

4848
<properties>
4949
<ginkgo-version>1.0.15</ginkgo-version>
50-
<spring-content-version>3.1.0-SNAPSHOT</spring-content-version>
51-
<springboot-version>3.0.7</springboot-version>
50+
<spring-content-version>3.0.8-SNAPSHOT</spring-content-version>
51+
<springboot-version>3.2.0</springboot-version>
5252
<spring-cloud.version>2022.0.4</spring-cloud.version>
5353
<jakarta-persistence-api.version>3.1.0</jakarta-persistence-api.version>
5454
<hibernate.version>5.6.15.Final</hibernate.version>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@
5050
<artifactId>spring-boot-starter-test</artifactId>
5151
<scope>test</scope>
5252
</dependency>
53-
<dependency>
53+
<!-- required with surefire plugin 3+ otherwise tests are not found -->
54+
<dependency>
55+
<groupId>org.junit.vintage</groupId>
56+
<artifactId>junit-vintage-engine</artifactId>
57+
<version>5.10.0</version>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
5461
<groupId>commons-io</groupId>
5562
<artifactId>commons-io</artifactId>
5663
<version>2.15.0</version>

‎spring-eg-content-commons/pom.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@
1111
<artifactId>spring-eg-content-commons</artifactId>
1212

1313
<dependencies>
14-
<dependency>
15-
<groupId>jakarta.persistence</groupId>
16-
<artifactId>jakarta.persistence-api</artifactId>
17-
<version>${jakarta-persistence-api.version}</version>
18-
</dependency>
19-
<dependency>
20-
<groupId>org.hibernate</groupId>
21-
<artifactId>hibernate-core-jakarta</artifactId>
22-
<version>${hibernate.version}</version>
23-
</dependency>
2414
<dependency>
2515
<groupId>com.github.paulcwarren</groupId>
2616
<artifactId>spring-content-commons</artifactId>
@@ -87,7 +77,7 @@
8777
<dependency>
8878
<groupId>org.testcontainers</groupId>
8979
<artifactId>mongodb</artifactId>
90-
<version>1.16.3</version>
80+
<version>1.17.6</version>
9181
<scope>provided</scope>
9282
</dependency>
9383
</dependencies>

‎spring-eg-content-commons/src/main/java/examples/AbstractSpringContentMongoConfiguration.java renamed to ‎spring-eg-content-commons/src/main/java/examples/mongo/AbstractSpringContentMongoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package examples;
1+
package examples.mongo;
22

33
import org.apache.commons.logging.Log;
44
import org.apache.commons.logging.LogFactory;
@@ -12,7 +12,6 @@
1212

1313
import com.mongodb.client.MongoClient;
1414

15-
@Configuration
1615
public class AbstractSpringContentMongoConfiguration extends AbstractMongoClientConfiguration {
1716

1817
private static final Log log = LogFactory.getLog(AbstractSpringContentMongoConfiguration.class);

‎spring-eg-content-commons/src/main/java/examples/MongoTestContainer.java renamed to ‎spring-eg-content-commons/src/main/java/examples/mongo/MongoTestContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package examples;
1+
package examples.mongo;
22

3+
import org.apache.commons.lang.StringUtils;
34
import org.testcontainers.containers.MongoDBContainer;
4-
import org.testcontainers.shaded.org.apache.commons.lang.StringUtils;
55

66
import com.mongodb.client.MongoClient;
77
import com.mongodb.client.MongoClients;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package examples;
22

3+
import internal.org.springframework.content.mongo.boot.autoconfigure.MongoContentAutoConfiguration;
34
import org.springframework.boot.SpringApplication;
45
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
56
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -17,7 +18,7 @@
1718
*
1819
*/
1920

20-
@SpringBootApplication(exclude={MongoRepositoriesAutoConfiguration.class})
21+
@SpringBootApplication(exclude={MongoRepositoriesAutoConfiguration.class, MongoContentAutoConfiguration.class})
2122
@ComponentScan(excludeFilters={
2223
@Filter(type = FilterType.REGEX,
2324
pattern = {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22

33
import com.github.paulcwarren.ginkgo4j.Ginkgo4jConfiguration;
44
import com.github.paulcwarren.ginkgo4j.Ginkgo4jSpringRunner;
5+
import internal.org.springframework.content.mongo.boot.autoconfigure.MongoContentAutoConfiguration;
56
import org.junit.runner.RunWith;
7+
import org.springframework.boot.autoconfigure.AutoConfiguration;
8+
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
69
import org.springframework.boot.test.context.SpringBootTest;
10+
import org.springframework.test.context.ContextConfiguration;
711
import tests.smoke.ContentStoreTests;
812

913
@RunWith(Ginkgo4jSpringRunner.class)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package examples;
22

3+
import examples.mongo.AbstractSpringContentMongoConfiguration;
34
import org.springframework.boot.SpringApplication;
45
import org.springframework.boot.autoconfigure.SpringBootApplication;
56
import org.springframework.context.annotation.ComponentScan;
@@ -19,6 +20,7 @@ public static void main(String[] args) {
1920
SpringApplication.run(Application.class, args);
2021
}
2122

23+
@Configuration
2224
public static class MongoConfig extends AbstractSpringContentMongoConfiguration {
2325
}
2426

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package examples;
22

33

4+
import examples.mongo.AbstractSpringContentMongoConfiguration;
45
import org.springframework.content.mongo.config.EnableMongoStores;
56
import org.springframework.context.annotation.ComponentScan;
67
import org.springframework.context.annotation.ComponentScan.Filter;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
@SpringBootApplication
19-
//@ComponentScan("org.springframework.content.solr")
2019
@EnableConfigurationProperties
2120
@EnableAutoConfiguration(exclude={MongoRepositoriesAutoConfiguration.class})
2221
public class Application {

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class SolrTestContainer extends SolrContainer {
1414

1515
private SolrTestContainer() {
1616
super(IMAGE_NAME);
17+
setStartupAttempts(10);
1718
start();
1819

1920
try {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class SolrTestContainer extends SolrContainer {
1414

1515
private SolrTestContainer() {
1616
super(IMAGE_NAME);
17+
this.setStartupAttempts(10);
1718
start();
1819

1920
try {

0 commit comments

Comments
 (0)