Skip to content

Commit f12235b

Browse files
elefeintelefeint
authored
Update Spring Boot dependencies to 2.5.8 (GoogleCloudPlatform#6600)
* update Spring Boot dependencies to latest * checkstyle * remove spanner r2dbcc junit changes
1 parent 571cf0f commit f12235b

File tree

8 files changed

+53
-47
lines changed

8 files changed

+53
-47
lines changed

‎eventarc/generic/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ limitations under the License.
3535
<!-- Import dependency management from Spring Boot -->
3636
<groupId>org.springframework.boot</groupId>
3737
<artifactId>spring-boot-dependencies</artifactId>
38-
<version>2.5.5</version>
38+
<version>2.5.8</version>
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>

‎eventarc/pubsub/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ limitations under the License.
3535
<!-- Import dependency management from Spring Boot -->
3636
<groupId>org.springframework.boot</groupId>
3737
<artifactId>spring-boot-dependencies</artifactId>
38-
<version>2.5.5</version>
38+
<version>2.5.8</version>
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>

‎flexible/helloworld-springboot/pom.xml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
~ Copyright (c) 2013 Google LLC
4-
~
5-
~ Licensed under the Apache License, Version 2.0 (the "License"); you
6-
~ may not use this file except in compliance with the License. You may
7-
~ obtain a copy of the License at
8-
~
9-
~ http://www.apache.org/licenses/LICENSE-2.0
10-
~
11-
~ Unless required by applicable law or agreed to in writing, software
12-
~ distributed under the License is distributed on an "AS IS" BASIS,
13-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
14-
~ implied. See the License for the specific language governing
15-
~ permissions and limitations under the License.
16-
-->
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright (c) 2013 Google LLC
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License"); you
6+
~ may not use this file except in compliance with the License. You may
7+
~ obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
14+
~ implied. See the License for the specific language governing
15+
~ permissions and limitations under the License.
16+
-->
1717
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1818
<modelVersion>4.0.0</modelVersion>
1919
<groupId>com.example.java</groupId>
2020
<artifactId>helloworld-springboot</artifactId>
2121
<version>0.0.1-SNAPSHOT</version>
22-
<name>helloworld-springboot</name>
23-
24-
<!--
25-
The parent pom defines common style checks and testing strategies for our samples.
26-
Removing or replacing it should not affect the execution of the samples in anyway.
27-
-->
28-
<parent>
29-
<groupId>com.google.cloud.samples</groupId>
30-
<artifactId>shared-configuration</artifactId>
31-
<version>1.2.0</version>
32-
</parent>
22+
<name>helloworld-springboot</name>
23+
24+
<!--
25+
The parent pom defines common style checks and testing strategies for our samples.
26+
Removing or replacing it should not affect the execution of the samples in anyway.
27+
-->
28+
<parent>
29+
<groupId>com.google.cloud.samples</groupId>
30+
<artifactId>shared-configuration</artifactId>
31+
<version>1.2.0</version>
32+
</parent>
3333

3434
<properties>
3535
<maven.compiler.source>1.8</maven.compiler.source>
3636
<maven.compiler.target>1.8</maven.compiler.target>
37-
</properties>
37+
</properties>
3838

3939
<dependencies>
4040
<dependency>
4141
<groupId>org.springframework.boot</groupId>
42-
<artifactId>spring-boot-starter-web</artifactId>
43-
<version>2.5.5</version>
42+
<artifactId>spring-boot-starter-web</artifactId>
43+
<version>2.5.8</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.springframework.boot</groupId>
47-
<artifactId>spring-boot-starter-actuator</artifactId>
48-
<version>2.5.5</version>
47+
<artifactId>spring-boot-starter-actuator</artifactId>
48+
<version>2.5.8</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.springframework.boot</groupId>
52-
<artifactId>spring-boot-starter-test</artifactId>
53-
<version>2.5.4</version>
52+
<artifactId>spring-boot-starter-test</artifactId>
53+
<version>2.5.8</version>
5454
<scope>test</scope>
5555
<exclusions>
5656
<exclusion>
@@ -59,14 +59,14 @@
5959
</exclusion>
6060
</exclusions>
6161
</dependency>
62-
</dependencies>
62+
</dependencies>
6363

6464
<build>
6565
<plugins>
6666
<plugin>
6767
<groupId>org.springframework.boot</groupId>
68-
<artifactId>spring-boot-maven-plugin</artifactId>
69-
<version>2.5.5</version>
68+
<artifactId>spring-boot-maven-plugin</artifactId>
69+
<version>2.5.8</version>
7070
<executions>
7171
<execution>
7272
<goals>

‎pubsub/spring/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>org.springframework.boot</groupId>
4949
<artifactId>spring-boot-dependencies</artifactId>
50-
<version>2.5.7</version>
50+
<version>2.5.8</version>
5151
<type>pom</type>
5252
<scope>import</scope>
5353
</dependency>

‎run/helloworld/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ limitations under the License.
3232
<!-- Import dependency management from Spring Boot -->
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-dependencies</artifactId>
35-
<version>2.5.5</version>
35+
<version>2.5.8</version>
3636
<type>pom</type>
3737
<scope>import</scope>
3838
</dependency>

‎run/image-processing/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ limitations under the License.
3535
<!-- Import dependency management from Spring Boot -->
3636
<groupId>org.springframework.boot</groupId>
3737
<artifactId>spring-boot-dependencies</artifactId>
38-
<version>2.5.5</version>
38+
<version>2.5.8</version>
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>

‎run/markdown-preview/editor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<!-- Import dependency management from Spring Boot -->
3737
<groupId>org.springframework.boot</groupId>
3838
<artifactId>spring-boot-dependencies</artifactId>
39-
<version>2.5.5</version>
39+
<version>2.5.8</version>
4040
<type>pom</type>
4141
<scope>import</scope>
4242
</dependency>

‎spanner/r2dbc/pom.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>org.example</groupId>
8-
<artifactId>cloud-spanner-r2dbc</artifactId>
8+
<artifactId>cloud-spanner-r2dbc-sample</artifactId>
99
<version>1.0-SNAPSHOT</version>
1010

1111
<properties>
1212
<maven.compiler.target>1.8</maven.compiler.target>
1313
<maven.compiler.source>1.8</maven.compiler.source>
14-
<spring-boot.version>2.5.5</spring-boot.version>
14+
<spring-boot.version>2.5.8</spring-boot.version>
1515
</properties>
1616

1717
<!--
@@ -33,6 +33,14 @@
3333
<type>pom</type>
3434
<scope>import</scope>
3535
</dependency>
36+
37+
<dependency>
38+
<groupId>org.springframework.boot</groupId>
39+
<artifactId>spring-boot-dependencies</artifactId>
40+
<version>${spring-boot.version}</version>
41+
<type>pom</type>
42+
<scope>import</scope>
43+
</dependency>
3644
</dependencies>
3745
</dependencyManagement>
3846

@@ -61,7 +69,6 @@
6169
<dependency>
6270
<groupId>org.springframework.boot</groupId>
6371
<artifactId>spring-boot-starter-webflux</artifactId>
64-
<version>${spring-boot.version}</version>
6572
</dependency>
6673

6774
<!-- Test dependencies -->
@@ -75,7 +82,6 @@
7582
<dependency>
7683
<groupId>org.springframework.boot</groupId>
7784
<artifactId>spring-boot-starter-test</artifactId>
78-
<version>${spring-boot.version}</version>
7985
<scope>test</scope>
8086
</dependency>
8187

0 commit comments

Comments
 (0)