Skip to content

Commit 1d38e79

Browse files
committed
Fix some version management issues.
Signed-off-by: Artur Ciocanu <[email protected]>
1 parent 4d2e89b commit 1d38e79

File tree

3 files changed

+33
-9
lines changed

3 files changed

+33
-9
lines changed

dapr-spring/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@
3636

3737
<dependencyManagement>
3838
<dependencies>
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-dependencies</artifactId>
42+
<version>${springboot.version}</version>
43+
<type>pom</type>
44+
<scope>import</scope>
45+
</dependency>
3946
<dependency>
4047
<groupId>io.dapr</groupId>
4148
<artifactId>dapr-sdk</artifactId>
@@ -81,7 +88,6 @@
8188
<artifactId>dapr-spring-boot-tests</artifactId>
8289
<version>${dapr.spring.version}</version>
8390
</dependency>
84-
8591
</dependencies>
8692
</dependencyManagement>
8793

pom.xml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
<slf4j.version>2.0.9</slf4j.version>
7979
<mockito.version>3.11.2</mockito.version>
8080
<opentelemetry-bom.version>2.1.0</opentelemetry-bom.version>
81-
<microcks-testcontainers.version>5.5.1</microcks-testcontainers.version>
8281
<kotlin.version>2.1.0</kotlin.version>
8382
<rest-assured.version>5.5.1</rest-assured.version>
8483
</properties>
@@ -245,6 +244,11 @@
245244
<artifactId>spring-boot-starter-test</artifactId>
246245
<version>${springboot.version}</version>
247246
</dependency>
247+
<dependency>
248+
<groupId>org.springframework.boot</groupId>
249+
<artifactId>spring-boot-autoconfigure</artifactId>
250+
<version>${springboot.version}</version>
251+
</dependency>
248252
<dependency>
249253
<groupId>org.springframework.data</groupId>
250254
<artifactId>spring-data-keyvalue</artifactId>
@@ -312,11 +316,6 @@
312316
<artifactId>grpc-netty</artifactId>
313317
<version>${grpc.version}</version>
314318
</dependency>
315-
<dependency>
316-
<groupId>io.grpc</groupId>
317-
<artifactId>grpc-netty-shaded</artifactId>
318-
<version>${grpc.version}</version>
319-
</dependency>
320319
<dependency>
321320
<groupId>com.google.protobuf</groupId>
322321
<artifactId>protobuf-java</artifactId>
@@ -463,6 +462,16 @@
463462
<artifactId>jackson-datatype-jsr310</artifactId>
464463
<version>${jackson.version}</version>
465464
</dependency>
465+
<dependency>
466+
<groupId>com.fasterxml.jackson.core</groupId>
467+
<artifactId>jackson-core</artifactId>
468+
<version>${jackson.version}</version>
469+
</dependency>
470+
<dependency>
471+
<groupId>com.fasterxml.jackson.core</groupId>
472+
<artifactId>jackson-annotations</artifactId>
473+
<version>${jackson.version}</version>
474+
</dependency>
466475
<dependency>
467476
<groupId>io.projectreactor</groupId>
468477
<artifactId>reactor-core</artifactId>
@@ -478,6 +487,16 @@
478487
<artifactId>testcontainers-redis</artifactId>
479488
<version>${testcontainers-redis.version}</version>
480489
</dependency>
490+
<dependency>
491+
<groupId>io.github.microcks</groupId>
492+
<artifactId>microcks-testcontainers</artifactId>
493+
<version>${microcks.version}</version>
494+
</dependency>
495+
<dependency>
496+
<groupId>org.assertj</groupId>
497+
<artifactId>assertj-core</artifactId>
498+
<version>${assertj.version}</version>
499+
</dependency>
481500
</dependencies>
482501
</dependencyManagement>
483502

sdk-autogen/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
</dependency>
3131
<dependency>
3232
<groupId>io.grpc</groupId>
33-
<artifactId>grpc-netty-shaded</artifactId>
34-
<scope>runtime</scope>
33+
<artifactId>grpc-netty</artifactId>
3534
</dependency>
3635
<dependency>
3736
<groupId>io.grpc</groupId>

0 commit comments

Comments
 (0)