Skip to content

Commit dce06a8

Browse files
artur-ciocanuartur-ciocanu
authored
Use dependencies BOM and remove duplicates. (#1588)
Signed-off-by: Artur Ciocanu <[email protected]>
1 parent 56b9ef7 commit dce06a8

File tree

6 files changed

+29
-57
lines changed

6 files changed

+29
-57
lines changed

‎pom.xml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<snakeyaml.version>2.0</snakeyaml.version>
4949
<testcontainers.version>1.21.3</testcontainers.version>
5050
<!-- Do NOT UPGRADE spring.version without checking springboot.version alignment -->
51-
<springboot.version>3.4.6</springboot.version>
51+
<springboot.version>3.4.9</springboot.version>
5252
<springframework.version>6.2.7</springframework.version>
5353
<!-- Do NOT UPGRADE springframework.version without checking springboot.version alignment -->
5454
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
@@ -203,6 +203,34 @@
203203
<type>pom</type>
204204
<scope>import</scope>
205205
</dependency>
206+
<dependency>
207+
<groupId>io.opentelemetry</groupId>
208+
<artifactId>opentelemetry-bom</artifactId>
209+
<version>${opentelemetry.version}</version>
210+
<type>pom</type>
211+
<scope>import</scope>
212+
</dependency>
213+
<dependency>
214+
<groupId>com.fasterxml.jackson</groupId>
215+
<artifactId>jackson-bom</artifactId>
216+
<version>${jackson.version}</version>
217+
<type>pom</type>
218+
<scope>import</scope>
219+
</dependency>
220+
<dependency>
221+
<groupId>org.testcontainers</groupId>
222+
<artifactId>testcontainers-bom</artifactId>
223+
<version>${testcontainers.version}</version>
224+
<type>pom</type>
225+
<scope>import</scope>
226+
</dependency>
227+
<dependency>
228+
<groupId>com.google.protobuf</groupId>
229+
<artifactId>protobuf-bom</artifactId>
230+
<version>${protobuf.version}</version>
231+
<type>pom</type>
232+
<scope>import</scope>
233+
</dependency>
206234
<dependency>
207235
<groupId>org.testcontainers</groupId>
208236
<artifactId>postgresql</artifactId>

‎sdk-springboot/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@
1515
<name>dapr-sdk-springboot</name>
1616
<description>SDK extension for Springboot</description>
1717

18-
<dependencyManagement>
19-
<dependencies>
20-
<dependency>
21-
<groupId>org.springframework.boot</groupId>
22-
<artifactId>spring-boot-dependencies</artifactId>
23-
<version>${springboot.version}</version>
24-
<type>pom</type>
25-
<scope>import</scope>
26-
</dependency>
27-
</dependencies>
28-
</dependencyManagement>
29-
3018
<dependencies>
3119
<!-- Dapr dependencies -->
3220
<dependency>

‎sdk-tests/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,7 @@
2929
</properties>
3030

3131
<dependencyManagement>
32-
<!-- Reproduce a product fixing its own spring boot version -->
3332
<dependencies>
34-
<dependency>
35-
<groupId>org.springframework.boot</groupId>
36-
<artifactId>spring-boot-dependencies</artifactId>
37-
<version>${springboot.version}</version>
38-
<type>pom</type>
39-
<scope>import</scope>
40-
</dependency>
4133
<dependency>
4234
<groupId>org.junit.platform</groupId>
4335
<artifactId>junit-platform-commons</artifactId>

‎spring-boot-examples/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@
2222
<module>workflows</module>
2323
</modules>
2424

25-
<dependencyManagement>
26-
<dependencies>
27-
<dependency>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-dependencies</artifactId>
30-
<version>${springboot.version}</version>
31-
<type>pom</type>
32-
<scope>import</scope>
33-
</dependency>
34-
</dependencies>
35-
</dependencyManagement>
36-
3725
<build>
3826
<plugins>
3927
<plugin>

‎spring-boot-examples/workflows/multi-app/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@
2222
<module>worker-two</module>
2323
</modules>
2424

25-
<dependencyManagement>
26-
<dependencies>
27-
<dependency>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-dependencies</artifactId>
30-
<version>${springboot.version}</version>
31-
<type>pom</type>
32-
<scope>import</scope>
33-
</dependency>
34-
</dependencies>
35-
</dependencyManagement>
36-
3725
<build>
3826
<plugins>
3927
<plugin>

‎spring-boot-examples/workflows/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@
2121
<module>multi-app</module>
2222
</modules>
2323

24-
<dependencyManagement>
25-
<dependencies>
26-
<dependency>
27-
<groupId>org.springframework.boot</groupId>
28-
<artifactId>spring-boot-dependencies</artifactId>
29-
<version>${springboot.version}</version>
30-
<type>pom</type>
31-
<scope>import</scope>
32-
</dependency>
33-
</dependencies>
34-
</dependencyManagement>
35-
3624
<build>
3725
<plugins>
3826
<plugin>

0 commit comments

Comments
 (0)