Skip to content

Commit df58f05

Browse files
committed
Merge remote-tracking branch 'origin/main' into spring-boot-4
2 parents a942f5b + 09fc394 commit df58f05

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8+
<<<<<<< HEAD
89
<version>4.0.2</version>
10+
=======
11+
<version>3.5.10</version>
12+
>>>>>>> origin/main
913
<relativePath/>
1014
<!-- lookup parent from repository -->
1115
</parent>
@@ -32,7 +36,7 @@
3236
<cloud.sdk.version>5.26.0</cloud.sdk.version>
3337
<xsuaa.version>3.6.5</xsuaa.version>
3438
<cf-java-logging-support.version>3.8.6</cf-java-logging-support.version>
35-
<cds-feature-attachments.version>1.2.4</cds-feature-attachments.version>
39+
<cds-feature-attachments.version>1.3.0</cds-feature-attachments.version>
3640
</properties>
3741

3842
<dependencyManagement>
@@ -172,7 +176,7 @@
172176
<plugin>
173177
<groupId>com.diffplug.spotless</groupId>
174178
<artifactId>spotless-maven-plugin</artifactId>
175-
<version>3.1.0</version>
179+
<version>3.2.0</version>
176180
<configuration>
177181
<java>
178182
<googleJavaFormat>

0 commit comments

Comments
 (0)