Skip to content

Commit e4b7e4e

Browse files
siri-varmaartur-ciocanu
siri-varma
and
artur-ciocanu
committed
Cleaup Test Dependencies (dapr#1332)
* Update CONTRIBUTING.md Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> * Fix things Signed-off-by: sirivarma <siri.varma@outlook.com> * Fix things? Signed-off-by: sirivarma <siri.varma@outlook.com> * Fix logback version Signed-off-by: siri-varma <siri.varma@outlook.com> * Fix logback version Signed-off-by: siri-varma <siri.varma@outlook.com> * Add pom Signed-off-by: siri-varma <siri.varma@outlook.com> * Add pom Signed-off-by: siri-varma <siri.varma@outlook.com> * Add properties Signed-off-by: siri-varma <siri.varma@outlook.com> * Added test scope Signed-off-by: siri-varma <siri.varma@outlook.com> * MArk as test Signed-off-by: siri-varma <siri.varma@outlook.com> * Update pom.xml Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> * Update pom.xml Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> --------- Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: sirivarma <siri.varma@outlook.com> Signed-off-by: siri-varma <siri.varma@outlook.com> Co-authored-by: artur-ciocanu <artur.ciocanu@gmail.com> Signed-off-by: sirivarma <siri.varma@outlook.com>
1 parent 4bb15dc commit e4b7e4e

File tree

4 files changed

+157
-37
lines changed

4 files changed

+157
-37
lines changed

‎dapr-spring/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<maven.compiler.release>11</maven.compiler.release>
3535
<testcontainers.version>1.19.8</testcontainers.version>
3636
<junit.version>5.10.2</junit.version>
37+
<logback-core.version>1.4.14</logback-core.version>
3738
</properties>
3839

3940
<dependencyManagement>
@@ -70,6 +71,11 @@
7071
<artifactId>junit-jupiter</artifactId>
7172
<version>${testcontainers.version}</version>
7273
</dependency>
74+
<dependency>
75+
<groupId>ch.qos.logback</groupId>
76+
<artifactId>logback-core</artifactId>
77+
<version>${logback-core.version}</version>
78+
</dependency>
7379
</dependencies>
7480
</dependencyManagement>
7581

‎examples/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<maven.compiler.target>${java.version}</maven.compiler.target>
2424
<spotbugs.fail>false</spotbugs.fail>
2525
<opentelemetry.version>0.14.0</opentelemetry.version>
26+
<opentelemetry-sdk-metrics.version>1.41.0</opentelemetry-sdk-metrics.version>
27+
<zipkin.version>2.16.3</zipkin.version>
2628
</properties>
2729

2830
<dependencies>
@@ -82,6 +84,16 @@
8284
<artifactId>opentelemetry-exporter-zipkin</artifactId>
8385
<version>${opentelemetry.version}</version>
8486
</dependency>
87+
<dependency>
88+
<groupId>io.opentelemetry</groupId>
89+
<artifactId>opentelemetry-sdk-metrics</artifactId>
90+
<version>${opentelemetry-sdk-metrics.version}</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>io.zipkin.reporter2</groupId>
94+
<artifactId>zipkin-reporter</artifactId>
95+
<version>${zipkin.version}</version>
96+
</dependency>
8597
<dependency>
8698
<groupId>org.junit.jupiter</groupId>
8799
<artifactId>junit-jupiter</artifactId>

‎pom.xml‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@
5151
<springboot.version>3.4.3</springboot.version>
5252
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
5353
<assertj.version>3.27.3</assertj.version>
54+
<grpc.version>1.69.0</grpc.version>
55+
<protobuf.version>3.25.5</protobuf.version>
56+
<opentelemetry.version>1.41.0</opentelemetry.version>
57+
<logback-core.version>1.5.16</logback-core.version>
58+
<wiremock.version>3.9.1</wiremock.version>
59+
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
60+
<javax.annotation.version>1.3.2</javax.annotation.version>
61+
<commons-lang.version>3.9</commons-lang.version>
62+
<commons-cli.version>1.9.0</commons-cli.version>
63+
<commons-io.version>2.14.0</commons-io.version>
64+
<zipkin.version>3.4.0</zipkin.version>
5465
</properties>
5566

5667
<distributionManagement>
@@ -230,6 +241,134 @@
230241
<artifactId>spring-boot-testcontainers</artifactId>
231242
<version>${springboot.version}</version>
232243
</dependency>
244+
<dependency>
245+
<groupId>org.testcontainers</groupId>
246+
<artifactId>toxiproxy</artifactId>
247+
<version>${testcontainers.version}</version>
248+
<scope>test</scope>
249+
</dependency>
250+
<dependency>
251+
<groupId>org.testcontainers</groupId>
252+
<artifactId>mysql</artifactId>
253+
<version>${testcontainers.version}</version>
254+
<scope>test</scope>
255+
</dependency>
256+
<dependency>
257+
<groupId>jakarta.annotation</groupId>
258+
<artifactId>jakarta.annotation-api</artifactId>
259+
<version>${jakarta.annotation.version}</version>
260+
</dependency>
261+
<dependency>
262+
<groupId>javax.annotation</groupId>
263+
<artifactId>javax.annotation-api</artifactId>
264+
<version>${javax.annotation.version}</version>
265+
</dependency>
266+
<dependency>
267+
<groupId>org.apache.commons</groupId>
268+
<artifactId>commons-lang3</artifactId>
269+
<version>${commons-lang.version}</version>
270+
</dependency>
271+
<dependency>
272+
<groupId>ch.qos.logback</groupId>
273+
<artifactId>logback-core</artifactId>
274+
<version>${logback-core.version}</version>
275+
</dependency>
276+
<dependency>
277+
<groupId>commons-cli</groupId>
278+
<artifactId>commons-cli</artifactId>
279+
<version>${commons-cli.version}</version>
280+
</dependency>
281+
<dependency>
282+
<groupId>io.grpc</groupId>
283+
<artifactId>grpc-protobuf</artifactId>
284+
<version>${grpc.version}</version>
285+
</dependency>
286+
<dependency>
287+
<groupId>io.grpc</groupId>
288+
<artifactId>grpc-stub</artifactId>
289+
<version>${grpc.version}</version>
290+
</dependency>
291+
<dependency>
292+
<groupId>commons-io</groupId>
293+
<artifactId>commons-io</artifactId>
294+
<version>${commons-io.version}</version>
295+
</dependency>
296+
<dependency>
297+
<groupId>io.opentelemetry</groupId>
298+
<artifactId>opentelemetry-sdk</artifactId>
299+
<version>${opentelemetry.version}</version>
300+
</dependency>
301+
<dependency>
302+
<groupId>io.opentelemetry</groupId>
303+
<artifactId>opentelemetry-api</artifactId>
304+
<version>${opentelemetry.version}</version>
305+
</dependency>
306+
<dependency>
307+
<groupId>io.opentelemetry</groupId>
308+
<artifactId>opentelemetry-context</artifactId>
309+
<version>${opentelemetry.version}</version>
310+
</dependency>
311+
<dependency>
312+
<groupId>io.opentelemetry</groupId>
313+
<artifactId>opentelemetry-sdk-common</artifactId>
314+
<version>${opentelemetry.version}</version>
315+
</dependency>
316+
<dependency>
317+
<groupId>io.opentelemetry</groupId>
318+
<artifactId>opentelemetry-sdk-trace</artifactId>
319+
<version>${opentelemetry.version}</version>
320+
</dependency>
321+
<dependency>
322+
<groupId>io.opentelemetry</groupId>
323+
<artifactId>opentelemetry-sdk-metrics</artifactId>
324+
<version>${opentelemetry.version}</version>
325+
</dependency>
326+
<dependency>
327+
<groupId>io.opentelemetry</groupId>
328+
<artifactId>opentelemetry-exporter-common</artifactId>
329+
<version>${opentelemetry.version}</version>
330+
</dependency>
331+
<dependency>
332+
<groupId>io.opentelemetry</groupId>
333+
<artifactId>opentelemetry-exporter-logging</artifactId>
334+
<version>${opentelemetry.version}</version>
335+
</dependency>
336+
<dependency>
337+
<groupId>io.opentelemetry</groupId>
338+
<artifactId>opentelemetry-exporter-zipkin</artifactId>
339+
<version>${opentelemetry.version}</version>
340+
</dependency>
341+
<!-- https://mvnrepository.com/artifact/io.zipkin.reporter2/zipkin-reporter -->
342+
<dependency>
343+
<groupId>io.zipkin.reporter2</groupId>
344+
<artifactId>zipkin-reporter</artifactId>
345+
<version>${zipkin.version}</version>
346+
</dependency>
347+
<dependency>
348+
<groupId>io.zipkin.reporter2</groupId>
349+
<artifactId>zipkin-sender-urlconnection</artifactId>
350+
<version>${zipkin.version}</version>
351+
</dependency>
352+
<dependency>
353+
<groupId>io.dapr</groupId>
354+
<artifactId>dapr-sdk-actors</artifactId>
355+
<version>${dapr.sdk.version}</version>
356+
</dependency>
357+
<dependency>
358+
<groupId>io.dapr</groupId>
359+
<artifactId>dapr-sdk-springboot</artifactId>
360+
<version>${dapr.sdk.version}</version>
361+
</dependency>
362+
<dependency>
363+
<groupId>io.dapr</groupId>
364+
<artifactId>dapr-sdk-workflows</artifactId>
365+
<version>${dapr.sdk.alpha.version}</version>
366+
</dependency>
367+
<dependency>
368+
<groupId>org.wiremock</groupId>
369+
<artifactId>wiremock-standalone</artifactId>
370+
<version>${wiremock.version}</version>
371+
</dependency>
233372
</dependencies>
234373
</dependencyManagement>
235374

‎sdk-tests/pom.xml‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@
2626
<dapr.sdk.alpha.version>0.16.0-SNAPSHOT</dapr.sdk.alpha.version>
2727
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
2828
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
29-
<grpc.version>1.69.0</grpc.version>
30-
<protobuf.version>3.25.5</protobuf.version>
31-
<opentelemetry.version>1.41.0</opentelemetry.version>
32-
<springboot.version>3.4.3</springboot.version>
33-
<logback-core.version>1.5.16</logback-core.version>
34-
<wiremock.version>3.9.1</wiremock.version>
35-
<testcontainers-test.version>1.20.0</testcontainers-test.version>
3629

3730
<!-- The JaCoCo plugin was expecting coverage for this module, but since it's a test module
3831
and code coverage typically doesn't apply to tests, the coverage is set to 0. -->
@@ -67,117 +60,95 @@
6760
<dependency>
6861
<groupId>commons-cli</groupId>
6962
<artifactId>commons-cli</artifactId>
70-
<version>1.9.0</version>
7163
</dependency>
7264
<dependency>
7365
<groupId>io.grpc</groupId>
7466
<artifactId>grpc-protobuf</artifactId>
75-
<version>${grpc.version}</version>
7667
</dependency>
7768
<dependency>
7869
<groupId>io.grpc</groupId>
7970
<artifactId>grpc-stub</artifactId>
80-
<version>${grpc.version}</version>
8171
</dependency>
8272
<dependency>
8373
<groupId>io.grpc</groupId>
8474
<artifactId>grpc-api</artifactId>
85-
<version>${grpc.version}</version>
8675
</dependency>
8776
<dependency>
8877
<groupId>commons-io</groupId>
8978
<artifactId>commons-io</artifactId>
90-
<version>2.14.0</version>
9179
</dependency>
9280
<dependency>
9381
<groupId>io.opentelemetry</groupId>
9482
<artifactId>opentelemetry-sdk</artifactId>
95-
<version>${opentelemetry.version}</version>
9683
</dependency>
9784
<dependency>
9885
<groupId>io.opentelemetry</groupId>
9986
<artifactId>opentelemetry-api</artifactId>
100-
<version>${opentelemetry.version}</version>
10187
</dependency>
10288
<dependency>
10389
<groupId>io.opentelemetry</groupId>
10490
<artifactId>opentelemetry-context</artifactId>
105-
<version>${opentelemetry.version}</version>
10691
</dependency>
10792
<dependency>
10893
<groupId>io.opentelemetry</groupId>
10994
<artifactId>opentelemetry-sdk-common</artifactId>
110-
<version>${opentelemetry.version}</version>
11195
</dependency>
11296
<dependency>
11397
<groupId>io.opentelemetry</groupId>
11498
<artifactId>opentelemetry-sdk-trace</artifactId>
115-
<version>${opentelemetry.version}</version>
11699
</dependency>
117100
<dependency>
118101
<groupId>io.opentelemetry</groupId>
119102
<artifactId>opentelemetry-sdk-metrics</artifactId>
120-
<version>${opentelemetry.version}</version>
121103
</dependency>
122104
<dependency>
123105
<groupId>io.opentelemetry</groupId>
124106
<artifactId>opentelemetry-exporter-common</artifactId>
125-
<version>${opentelemetry.version}</version>
126107
</dependency>
127108
<dependency>
128109
<groupId>io.opentelemetry</groupId>
129110
<artifactId>opentelemetry-exporter-logging</artifactId>
130-
<version>${opentelemetry.version}</version>
131111
</dependency>
132112
<dependency>
133113
<groupId>io.opentelemetry</groupId>
134114
<artifactId>opentelemetry-exporter-zipkin</artifactId>
135-
<version>${opentelemetry.version}</version>
136115
</dependency>
137116
<!-- https://mvnrepository.com/artifact/io.zipkin.reporter2/zipkin-reporter -->
138117
<dependency>
139118
<groupId>io.zipkin.reporter2</groupId>
140119
<artifactId>zipkin-reporter</artifactId>
141-
<version>3.4.0</version>
142120
</dependency>
143121
<dependency>
144122
<groupId>io.zipkin.reporter2</groupId>
145123
<artifactId>zipkin-sender-urlconnection</artifactId>
146-
<version>3.4.0</version>
147124
</dependency>
148125
<dependency>
149126
<groupId>io.dapr</groupId>
150127
<artifactId>dapr-sdk</artifactId>
151-
<version>${dapr.sdk.version}</version>
152128
<scope>test</scope>
153129
</dependency>
154130
<dependency>
155131
<groupId>io.dapr</groupId>
156132
<artifactId>dapr-sdk-actors</artifactId>
157-
<version>${dapr.sdk.version}</version>
158133
<scope>test</scope>
159134
</dependency>
160135
<dependency>
161136
<groupId>io.dapr</groupId>
162137
<artifactId>dapr-sdk-springboot</artifactId>
163-
<version>${dapr.sdk.version}</version>
164138
<scope>test</scope>
165139
</dependency>
166140
<dependency>
167141
<groupId>io.dapr</groupId>
168142
<artifactId>dapr-sdk-workflows</artifactId>
169-
<version>${dapr.sdk.alpha.version}</version>
170143
<scope>test</scope>
171144
</dependency>
172145
<dependency>
173146
<groupId>io.dapr.spring</groupId>
174147
<artifactId>dapr-spring-boot-starter</artifactId>
175-
<version>${dapr.sdk.alpha.version}</version>
176148
</dependency>
177149
<dependency>
178150
<groupId>io.dapr.spring</groupId>
179151
<artifactId>dapr-spring-boot-starter-test</artifactId>
180-
<version>${dapr.sdk.alpha.version}</version>
181152
<scope>test</scope>
182153
</dependency>
183154
<dependency>
@@ -191,7 +162,6 @@
191162
<dependency>
192163
<groupId>org.wiremock</groupId>
193164
<artifactId>wiremock-standalone</artifactId>
194-
<version>${wiremock.version}</version>
195165
<scope>test</scope>
196166
</dependency>
197167
<dependency>
@@ -207,37 +177,31 @@
207177
<dependency>
208178
<groupId>org.apache.commons</groupId>
209179
<artifactId>commons-lang3</artifactId>
210-
<version>3.9</version>
211180
<scope>test</scope>
212181
</dependency>
213182
<dependency>
214183
<groupId>ch.qos.logback</groupId>
215184
<artifactId>logback-core</artifactId>
216-
<version>${logback-core.version}</version>
217185
<scope>test</scope>
218186
</dependency>
219187
<dependency>
220188
<groupId>org.testcontainers</groupId>
221189
<artifactId>postgresql</artifactId>
222-
<version>${testcontainers-test.version}</version>
223190
<scope>test</scope>
224191
</dependency>
225192
<dependency>
226193
<groupId>org.testcontainers</groupId>
227194
<artifactId>mysql</artifactId>
228-
<version>${testcontainers-test.version}</version>
229195
<scope>test</scope>
230196
</dependency>
231197
<dependency>
232198
<groupId>jakarta.annotation</groupId>
233199
<artifactId>jakarta.annotation-api</artifactId>
234-
<version>2.1.1</version>
235200
<scope>compile</scope>
236201
</dependency>
237202
<dependency>
238203
<groupId>javax.annotation</groupId>
239204
<artifactId>javax.annotation-api</artifactId>
240-
<version>1.3.2</version>
241205
<scope>compile</scope>
242206
</dependency>
243207
<dependency>
@@ -258,7 +222,6 @@
258222
<dependency>
259223
<groupId>org.testcontainers</groupId>
260224
<artifactId>toxiproxy</artifactId>
261-
<version>${testcontainers-test.version}</version>
262225
<scope>test</scope>
263226
</dependency>
264227
</dependencies>

0 commit comments

Comments
 (0)