File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed
Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change 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 >
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 >
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 >
You can’t perform that action at this time.
0 commit comments