Skip to content

Commit 4d2e89b

Browse files
artur-ciocanuartur-ciocanu
committed
Simplifying version management even more.
Signed-off-by: Artur Ciocanu <[email protected]>
1 parent 3db2d57 commit 4d2e89b

File tree

14 files changed

+31
-128
lines changed

14 files changed

+31
-128
lines changed

‎dapr-spring/pom.xml‎

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<groupId>io.dapr.spring</groupId>
1414
<artifactId>dapr-spring-parent</artifactId>
1515
<packaging>pom</packaging>
16-
<version>1.17.0-SNAPSHOT</version>
1716
<name>dapr-spring-parent</name>
1817
<description>SDK extension for Spring and Spring Boot</description>
1918

@@ -31,20 +30,12 @@
3130
<maven.compiler.source>11</maven.compiler.source>
3231
<maven.compiler.target>11</maven.compiler.target>
3332
<maven.compiler.release>11</maven.compiler.release>
34-
<testcontainers.version>1.19.8</testcontainers.version>
35-
<junit.version>5.11.2</junit.version>
3633
<!-- WARNING: don't change this property unless you also update .github/scripts/update_sdk_version.sh -->
3734
<dapr.spring.version>1.17.0-SNAPSHOT</dapr.spring.version>
3835
</properties>
3936

4037
<dependencyManagement>
4138
<dependencies>
42-
<dependency>
43-
<groupId>org.springframework.boot</groupId>
44-
<artifactId>spring-boot-dependencies</artifactId>
45-
<version>${springboot.version}</version>
46-
<type>pom</type>
47-
</dependency>
4839
<dependency>
4940
<groupId>io.dapr</groupId>
5041
<artifactId>dapr-sdk</artifactId>
@@ -85,81 +76,12 @@
8576
<artifactId>dapr-sdk-springboot</artifactId>
8677
<version>${dapr.sdk.version}</version>
8778
</dependency>
88-
<dependency>
89-
<groupId>org.springframework</groupId>
90-
<artifactId>spring-context</artifactId>
91-
<version>${springframework.version}</version>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.springframework</groupId>
95-
<artifactId>spring-beans</artifactId>
96-
<version>${springframework.version}</version>
97-
</dependency>
98-
99-
<!-- Spring dependencies -->
100-
<dependency>
101-
<groupId>org.springframework</groupId>
102-
<artifactId>spring-web</artifactId>
103-
<version>${springframework.version}</version>
104-
</dependency>
105-
<dependency>
106-
<groupId>org.springframework.boot</groupId>
107-
<artifactId>spring-boot-configuration-processor</artifactId>
108-
<version>${springboot.version}</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>org.springframework.boot</groupId>
112-
<artifactId>spring-boot-starter</artifactId>
113-
<version>${springboot.version}</version>
114-
</dependency>
115-
<dependency>
116-
<groupId>org.springframework.boot</groupId>
117-
<artifactId>spring-boot-autoconfigure-processor</artifactId>
118-
<version>${springboot.version}</version>
119-
</dependency>
12079
<dependency>
12180
<groupId>io.dapr.spring</groupId>
12281
<artifactId>dapr-spring-boot-tests</artifactId>
12382
<version>${dapr.spring.version}</version>
12483
</dependency>
12584

126-
<!-- Test dependencies -->
127-
<dependency>
128-
<groupId>org.junit.jupiter</groupId>
129-
<artifactId>junit-jupiter-api</artifactId>
130-
<version>${junit.version}</version>
131-
<scope>test</scope>
132-
</dependency>
133-
<dependency>
134-
<groupId>org.springframework.boot</groupId>
135-
<artifactId>spring-boot-starter-test</artifactId>
136-
<version>${springboot.version}</version>
137-
<scope>test</scope>
138-
</dependency>
139-
<dependency>
140-
<groupId>org.junit.jupiter</groupId>
141-
<artifactId>junit-jupiter-params</artifactId>
142-
<version>${junit.version}</version>
143-
<scope>test</scope>
144-
</dependency>
145-
<dependency>
146-
<groupId>org.junit.jupiter</groupId>
147-
<artifactId>junit-jupiter-engine</artifactId>
148-
<version>${junit.version}</version>
149-
<scope>test</scope>
150-
</dependency>
151-
<dependency>
152-
<groupId>org.junit.jupiter</groupId>
153-
<artifactId>junit-jupiter</artifactId>
154-
<version>${junit.version}</version>
155-
<scope>test</scope>
156-
</dependency>
157-
<dependency>
158-
<groupId>org.testcontainers</groupId>
159-
<artifactId>junit-jupiter</artifactId>
160-
<version>${testcontainers.version}</version>
161-
<scope>test</scope>
162-
</dependency>
16385
</dependencies>
16486
</dependencyManagement>
16587

‎examples/pom.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<artifactId>dapr-sdk-examples</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.17.0-SNAPSHOT</version>
1615
<name>dapr-sdk-examples</name>
1716

1817
<properties>
@@ -22,8 +21,6 @@
2221
<maven.compiler.source>${java.version}</maven.compiler.source>
2322
<maven.compiler.target>${java.version}</maven.compiler.target>
2423
<spotbugs.fail>false</spotbugs.fail>
25-
<opentelemetry.version>1.41.0</opentelemetry.version>
26-
<zipkin.version>3.4.0</zipkin.version>
2724
</properties>
2825

2926
<dependencies>
@@ -34,33 +31,27 @@
3431
<dependency>
3532
<groupId>io.grpc</groupId>
3633
<artifactId>grpc-protobuf</artifactId>
37-
<version>${grpc.version}</version>
3834
</dependency>
3935
<dependency>
4036
<groupId>io.grpc</groupId>
4137
<artifactId>grpc-stub</artifactId>
42-
<version>${grpc.version}</version>
4338
</dependency>
4439
<dependency>
4540
<groupId>io.grpc</groupId>
4641
<artifactId>grpc-api</artifactId>
47-
<version>${grpc.version}</version>
4842
</dependency>
4943
<dependency>
5044
<groupId>io.grpc</groupId>
5145
<artifactId>grpc-testing</artifactId>
52-
<version>${grpc.version}</version>
5346
<scope>test</scope>
5447
</dependency>
5548
<dependency>
5649
<groupId>com.google.protobuf</groupId>
5750
<artifactId>protobuf-java-util</artifactId>
58-
<version>${protobuf.version}</version>
5951
</dependency>
6052
<dependency>
6153
<groupId>org.springframework.boot</groupId>
6254
<artifactId>spring-boot-starter-web</artifactId>
63-
<version>${springboot.version}</version>
6455
</dependency>
6556
<dependency>
6657
<groupId>com.jayway.jsonpath</groupId>
@@ -69,32 +60,26 @@
6960
<dependency>
7061
<groupId>io.opentelemetry</groupId>
7162
<artifactId>opentelemetry-sdk</artifactId>
72-
<version>${opentelemetry.version}</version>
7363
</dependency>
7464
<dependency>
7565
<groupId>io.opentelemetry</groupId>
7666
<artifactId>opentelemetry-exporter-logging</artifactId>
77-
<version>${opentelemetry.version}</version>
7867
</dependency>
7968
<dependency>
8069
<groupId>io.opentelemetry</groupId>
8170
<artifactId>opentelemetry-sdk-metrics</artifactId>
82-
<version>${opentelemetry.version}</version>
8371
</dependency>
8472
<dependency>
8573
<groupId>io.opentelemetry</groupId>
8674
<artifactId>opentelemetry-exporter-zipkin</artifactId>
87-
<version>${opentelemetry.version}</version>
8875
</dependency>
8976
<dependency>
9077
<groupId>io.zipkin.reporter2</groupId>
9178
<artifactId>zipkin-reporter</artifactId>
92-
<version>${zipkin.version}</version>
9379
</dependency>
9480
<dependency>
9581
<groupId>io.zipkin.reporter2</groupId>
9682
<artifactId>zipkin-sender-urlconnection</artifactId>
97-
<version>${zipkin.version}</version>
9883
</dependency>
9984
<dependency>
10085
<groupId>org.junit.jupiter</groupId>
@@ -138,12 +123,10 @@
138123
<dependency>
139124
<groupId>javax.annotation</groupId>
140125
<artifactId>javax.annotation-api</artifactId>
141-
<version>${javax.annotation.version}</version>
142126
</dependency>
143127
<dependency>
144128
<groupId>com.google.protobuf</groupId>
145129
<artifactId>protobuf-java</artifactId>
146-
<version>${protobuf.version}</version>
147130
</dependency>
148131
</dependencies>
149132

‎pom.xml‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<testcontainers-redis.version>2.2.2</testcontainers-redis.version>
7878
<slf4j.version>2.0.9</slf4j.version>
7979
<mockito.version>3.11.2</mockito.version>
80-
<reactor-test.version>3.5.12</reactor-test.version>
8180
<opentelemetry-bom.version>2.1.0</opentelemetry-bom.version>
8281
<microcks-testcontainers.version>5.5.1</microcks-testcontainers.version>
8382
<kotlin.version>2.1.0</kotlin.version>
@@ -134,7 +133,7 @@
134133
<dependency>
135134
<groupId>io.projectreactor</groupId>
136135
<artifactId>reactor-test</artifactId>
137-
<version>${reactor-test.version}</version>
136+
<version>${reactor.version}</version>
138137
<scope>test</scope>
139138
</dependency>
140139
<dependency>
@@ -308,6 +307,26 @@
308307
<artifactId>grpc-stub</artifactId>
309308
<version>${grpc.version}</version>
310309
</dependency>
310+
<dependency>
311+
<groupId>io.grpc</groupId>
312+
<artifactId>grpc-netty</artifactId>
313+
<version>${grpc.version}</version>
314+
</dependency>
315+
<dependency>
316+
<groupId>io.grpc</groupId>
317+
<artifactId>grpc-netty-shaded</artifactId>
318+
<version>${grpc.version}</version>
319+
</dependency>
320+
<dependency>
321+
<groupId>com.google.protobuf</groupId>
322+
<artifactId>protobuf-java</artifactId>
323+
<version>${protobuf.version}</version>
324+
</dependency>
325+
<dependency>
326+
<groupId>com.google.protobuf</groupId>
327+
<artifactId>protobuf-java-util</artifactId>
328+
<version>${protobuf.version}</version>
329+
</dependency>
311330
<dependency>
312331
<groupId>commons-io</groupId>
313332
<artifactId>commons-io</artifactId>
@@ -434,6 +453,16 @@
434453
<artifactId>jackson-databind</artifactId>
435454
<version>${jackson.version}</version>
436455
</dependency>
456+
<dependency>
457+
<groupId>com.fasterxml.jackson.dataformat</groupId>
458+
<artifactId>jackson-dataformat-xml</artifactId>
459+
<version>${jackson.version}</version>
460+
</dependency>
461+
<dependency>
462+
<groupId>com.fasterxml.jackson.datatype</groupId>
463+
<artifactId>jackson-datatype-jsr310</artifactId>
464+
<version>${jackson.version}</version>
465+
</dependency>
437466
<dependency>
438467
<groupId>io.projectreactor</groupId>
439468
<artifactId>reactor-core</artifactId>

‎sdk-actors/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<artifactId>dapr-sdk-actors</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.17.0-SNAPSHOT</version>
1615
<name>dapr-sdk-actors</name>
1716
<description>SDK for Actors on Dapr</description>
1817

@@ -44,13 +43,11 @@
4443
<dependency>
4544
<groupId>org.springframework.boot</groupId>
4645
<artifactId>spring-boot-starter-web</artifactId>
47-
<version>${springboot.version}</version>
4846
<scope>test</scope>
4947
</dependency>
5048
<dependency>
5149
<groupId>io.grpc</groupId>
5250
<artifactId>grpc-testing</artifactId>
53-
<version>${grpc.version}</version>
5451
<scope>test</scope>
5552
</dependency>
5653
<dependency>

‎sdk-autogen/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<artifactId>dapr-sdk-autogen</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.17.0-SNAPSHOT</version>
1615
<name>dapr-sdk-autogen</name>
1716
<description>Auto-generated SDK for Dapr</description>
1817

@@ -32,23 +31,19 @@
3231
<dependency>
3332
<groupId>io.grpc</groupId>
3433
<artifactId>grpc-netty-shaded</artifactId>
35-
<version>${grpc.version}</version>
3634
<scope>runtime</scope>
3735
</dependency>
3836
<dependency>
3937
<groupId>io.grpc</groupId>
4038
<artifactId>grpc-protobuf</artifactId>
41-
<version>${grpc.version}</version>
4239
</dependency>
4340
<dependency>
4441
<groupId>io.grpc</groupId>
4542
<artifactId>grpc-stub</artifactId>
46-
<version>${grpc.version}</version>
4743
</dependency>
4844
<dependency>
4945
<groupId>io.grpc</groupId>
5046
<artifactId>grpc-testing</artifactId>
51-
<version>${grpc.version}</version>
5247
<scope>test</scope>
5348
</dependency>
5449
</dependencies>

‎sdk-springboot/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<artifactId>dapr-sdk-springboot</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.17.0-SNAPSHOT</version>
1615
<name>dapr-sdk-springboot</name>
1716
<description>SDK extension for Springboot</description>
1817

‎sdk-tests/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,14 @@
1111
</parent>
1212

1313
<artifactId>dapr-sdk-tests</artifactId>
14-
<version>1.17.0-SNAPSHOT</version>
1514
<name>dapr-sdk-tests</name>
1615
<description>Tests for Dapr's Java SDK - not to be published as a jar.</description>
1716

1817
<properties>
19-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2018
<java.version>17</java.version>
2119
<maven.compiler.source>17</maven.compiler.source>
22-
<maven.compiler.source>17</maven.compiler.source>
2320
<maven.compiler.target>17</maven.compiler.target>
2421
<maven.deploy.skip>true</maven.deploy.skip>
25-
<dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version>
26-
<dapr.sdk.alpha.version>0.17.0-SNAPSHOT</dapr.sdk.alpha.version>
2722
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
2823
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
2924

‎sdk-workflows/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<artifactId>dapr-sdk-workflows</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.17.0-SNAPSHOT</version>
1615
<name>dapr-sdk-workflows</name>
1716
<description>SDK for Workflows on Dapr</description>
1817

@@ -54,22 +53,18 @@
5453
<dependency>
5554
<groupId>com.fasterxml.jackson.core</groupId>
5655
<artifactId>jackson-core</artifactId>
57-
<version>${jackson.version}</version>
5856
</dependency>
5957
<dependency>
6058
<groupId>com.fasterxml.jackson.core</groupId>
6159
<artifactId>jackson-databind</artifactId>
62-
<version>${jackson.version}</version>
6360
</dependency>
6461
<dependency>
6562
<groupId>com.fasterxml.jackson.core</groupId>
6663
<artifactId>jackson-annotations</artifactId>
67-
<version>${jackson.version}</version>
6864
</dependency>
6965
<dependency>
7066
<groupId>com.fasterxml.jackson.datatype</groupId>
7167
<artifactId>jackson-datatype-jsr310</artifactId>
72-
<version>${jackson.version}</version>
7368
</dependency>
7469
</dependencies>
7570

0 commit comments

Comments
 (0)