Skip to content

Commit bea0209

Browse files
hkhanhkhan
authored
[JAVA-13976] Upgrade Spring Boot to 2.7.2 (eugenp#12603)
* [JAVA-13976] Upgrade Spring Boot to 2.7.2 * [JAVA-13976] Fix failing test due to incorrect Jackson version
1 parent 553415e commit bea0209

43 files changed

Lines changed: 127 additions & 115 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎graphql-modules/graphql-error-handling/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@
3636
<dependency>
3737
<groupId>org.projectlombok</groupId>
3838
<artifactId>lombok</artifactId>
39-
<version>${lombok.version}</version>
4039
</dependency>
4140
<dependency>
4241
<groupId>com.h2database</groupId>
4342
<artifactId>h2</artifactId>
44-
<version>${h2.version}</version>
4543
</dependency>
4644
<dependency>
4745
<groupId>org.springframework.boot</groupId>
@@ -51,21 +49,19 @@
5149
<dependency>
5250
<groupId>com.graphql-java</groupId>
5351
<artifactId>graphql-spring-boot-starter-test</artifactId>
54-
<scope>test</scope>
5552
<version>${graphql-spring-boot-starter.version}</version>
53+
<scope>test</scope>
5654
</dependency>
5755
<dependency>
5856
<groupId>org.skyscreamer</groupId>
5957
<artifactId>jsonassert</artifactId>
60-
<version>${jsonassert.version}</version>
6158
<scope>test</scope>
6259
</dependency>
6360
</dependencies>
6461

6562
<properties>
6663
<graphql-spring-boot-starter.version>5.0.2</graphql-spring-boot-starter.version>
6764
<graphql-java-tools.version>5.2.4</graphql-java-tools.version>
68-
<jsonassert.version>1.5.0</jsonassert.version>
6965
</properties>
7066

7167
</project>

‎graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/GraphQLErrorAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.baeldung.graphql.error.handling.exception;
22

3-
import graphql.ErrorType;
3+
import graphql.ErrorClassification;
44
import graphql.ExceptionWhileDataFetching;
55
import graphql.GraphQLError;
66
import graphql.language.SourceLocation;
@@ -27,7 +27,7 @@ public List<SourceLocation> getLocations() {
2727
}
2828

2929
@Override
30-
public ErrorType getErrorType() {
30+
public ErrorClassification getErrorType() {
3131
return error.getErrorType();
3232
}
3333

‎mustache/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</build>
5656

5757
<properties>
58-
<mustache.compiler.api.version>0.9.2</mustache.compiler.api.version>
58+
<mustache.compiler.api.version>0.9.10</mustache.compiler.api.version>
5959
<datafactory.version>0.8</datafactory.version>
6060
<webjars.bootstrap.version>3.3.7</webjars.bootstrap.version>
6161
</properties>

‎mustache/src/main/java/com/baeldung/springmustache/SpringMustacheApplication.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.baeldung.springmustache;
22

3+
import com.samskivert.mustache.DefaultCollector;
34
import com.samskivert.mustache.Mustache;
45
import org.springframework.boot.SpringApplication;
56
import org.springframework.boot.autoconfigure.SpringBootApplication;
6-
import org.springframework.boot.autoconfigure.mustache.MustacheEnvironmentCollector;
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.context.annotation.ComponentScan;
9-
import org.springframework.core.env.Environment;
109

1110
@SpringBootApplication
1211
@ComponentScan(basePackages = {"com.baeldung"})
@@ -17,16 +16,11 @@ public static void main(String[] args) {
1716
}
1817

1918
@Bean
20-
public Mustache.Compiler mustacheCompiler(Mustache.TemplateLoader templateLoader, Environment environment) {
21-
22-
MustacheEnvironmentCollector collector = new MustacheEnvironmentCollector();
23-
collector.setEnvironment(environment);
24-
19+
public Mustache.Compiler mustacheCompiler(Mustache.TemplateLoader templateLoader) {
2520
return Mustache.compiler()
2621
.defaultValue("Some Default Value")
2722
.withLoader(templateLoader)
28-
.withCollector(collector);
29-
23+
.withCollector(new DefaultCollector());
3024
}
3125
}
3226

‎parent-boot-2/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<rest-assured.version>3.3.0</rest-assured.version>
8989
<!-- plugins -->
9090
<thin.version>1.0.22.RELEASE</thin.version>
91-
<spring-boot.version>2.6.4</spring-boot.version>
91+
<spring-boot.version>2.7.2</spring-boot.version>
9292
<aspectjweaver.version>1.9.1</aspectjweaver.version>
9393
</properties>
9494

95-
</project>
95+
</project>

‎persistence-modules/flyway/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<dependency>
2020
<groupId>org.flywaydb</groupId>
2121
<artifactId>flyway-core</artifactId>
22-
<version>${flyway-core.version}</version>
2322
</dependency>
2423
<dependency>
2524
<groupId>org.springframework.boot</groupId>
@@ -64,8 +63,8 @@
6463
</build>
6564

6665
<properties>
67-
<flyway-core.version>8.0.0</flyway-core.version>
68-
<flyway-maven-plugin.version>8.0.0</flyway-maven-plugin.version>
66+
<flyway-maven-plugin.version>8.5.13</flyway-maven-plugin.version>
67+
<h2.version>2.1.214</h2.version>
6968
</properties>
7069

7170
</project>

‎persistence-modules/spring-boot-persistence-mongodb-2/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,8 @@
2727
<dependency>
2828
<groupId>de.flapdoodle.embed</groupId>
2929
<artifactId>de.flapdoodle.embed.mongo</artifactId>
30-
<version>${embed.mongo.version}</version>
3130
<scope>test</scope>
3231
</dependency>
3332
</dependencies>
3433

35-
<properties>
36-
<embed.mongo.version>3.2.6</embed.mongo.version>
37-
</properties>
38-
3934
</project>

‎persistence-modules/spring-data-jpa-repo-2/src/main/resources/application.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
22
spring.datasource.username=sa
3-
spring.datasource.password=sa
3+
spring.datasource.password=sa
4+
5+
spring.jpa.properties.hibernate.globally_quoted_identifiers=true

‎persistence-modules/spring-data-mongodb-reactive/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<dependency>
5858
<groupId>de.flapdoodle.embed</groupId>
5959
<artifactId>de.flapdoodle.embed.mongo</artifactId>
60-
<version>${embed.mongo.version}</version>
6160
<scope>test</scope>
6261
</dependency>
6362
<dependency>
@@ -127,7 +126,6 @@
127126
<spring-tx.version>5.3.15</spring-tx.version>
128127
<httpclient.version>4.5.2</httpclient.version>
129128
<reactor-core.version>3.3.1.RELEASE</reactor-core.version>
130-
<embed.mongo.version>3.2.6</embed.mongo.version>
131129
</properties>
132130

133131
</project>

‎persistence-modules/spring-data-rest-querydsl/src/main/resources/application.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ spring:
99
jpa:
1010
hibernate:
1111
ddl-auto: create
12+
properties:
13+
globally_quoted_identifiers: true

0 commit comments

Comments
 (0)