Skip to content

Commit 69b2ccd

Browse files
artur-ciocanusalaboy
authored andcommitted
Fix dependencies multi app build and add proper test deps (dapr#1572)
* Force Jackson version to override the SB Jackson version Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com> * Move all the Jackson deps to parent POM. Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com> * Ensure app JAR build order Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com> * Remove explicit Jackson from sdk-tests module. Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com> * Make sure <scope>test</scope> is used for test dependencies. Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com> * Remove extra Jackson modules. Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com> --------- Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com> Signed-off-by: salaboy <Salaboy@gmail.com>
1 parent acba4eb commit 69b2ccd

File tree

8 files changed

+38
-1
lines changed

8 files changed

+38
-1
lines changed

dapr-spring/dapr-spring-boot-autoconfigure/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<dependency>
8686
<groupId>org.springframework.boot</groupId>
8787
<artifactId>spring-boot-starter-test</artifactId>
88+
<scope>test</scope>
8889
</dependency>
8990
</dependencies>
9091
<build>

sdk/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<argLine>
2121
--add-opens java.base/java.util=ALL-UNNAMED
2222
</argLine>
23-
2423
</properties>
2524

2625
<dependencies>
@@ -119,6 +118,7 @@
119118
<dependency>
120119
<groupId>org.assertj</groupId>
121120
<artifactId>assertj-core</artifactId>
121+
<scope>test</scope>
122122
</dependency>
123123
<dependency>
124124
<groupId>io.grpc</groupId>

spring-boot-examples/consumer-app/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<dependency>
6464
<groupId>org.springframework.boot</groupId>
6565
<artifactId>spring-boot-starter-test</artifactId>
66+
<scope>test</scope>
6667
</dependency>
6768
</dependencies>
6869

spring-boot-examples/producer-app/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<dependency>
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-test</artifactId>
28+
<scope>test</scope>
2829
</dependency>
2930
<dependency>
3031
<groupId>io.dapr.spring</groupId>

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<dependency>
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-test</artifactId>
28+
<scope>test</scope>
2829
</dependency>
2930
<dependency>
3031
<groupId>io.dapr.spring</groupId>
@@ -45,6 +46,19 @@
4546
<artifactId>rest-assured</artifactId>
4647
<scope>test</scope>
4748
</dependency>
49+
<!-- Worker dependencies to ensure Maven reactor builds them before integration tests -->
50+
<dependency>
51+
<groupId>io.dapr</groupId>
52+
<artifactId>worker-one</artifactId>
53+
<version>${project.version}</version>
54+
<scope>test</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>io.dapr</groupId>
58+
<artifactId>worker-two</artifactId>
59+
<version>${project.version}</version>
60+
<scope>test</scope>
61+
</dependency>
4862
</dependencies>
4963

5064
<build>
@@ -75,6 +89,23 @@
7589
<skip>true</skip>
7690
</configuration>
7791
</plugin>
92+
<plugin>
93+
<groupId>org.apache.maven.plugins</groupId>
94+
<artifactId>maven-failsafe-plugin</artifactId>
95+
<executions>
96+
<execution>
97+
<goals>
98+
<goal>integration-test</goal>
99+
<goal>verify</goal>
100+
</goals>
101+
</execution>
102+
</executions>
103+
<configuration>
104+
<includes>
105+
<include>**/*IT.java</include>
106+
</includes>
107+
</configuration>
108+
</plugin>
78109
</plugins>
79110
</build>
80111
</project>

spring-boot-examples/workflows/multi-app/worker-one/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<dependency>
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-test</artifactId>
28+
<scope>test</scope>
2829
</dependency>
2930
<dependency>
3031
<groupId>io.dapr.spring</groupId>

spring-boot-examples/workflows/multi-app/worker-two/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<dependency>
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-test</artifactId>
28+
<scope>test</scope>
2829
</dependency>
2930
<dependency>
3031
<groupId>io.dapr.spring</groupId>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<dependency>
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-test</artifactId>
28+
<scope>test</scope>
2829
</dependency>
2930
<dependency>
3031
<groupId>io.dapr.spring</groupId>

0 commit comments

Comments
 (0)