Skip to content

Commit 1285c50

Browse files
committed
Resolve stream dependencies for thin jar from pom on default profile.
Signed-off-by: Olga Maciaszek-Sharma <[email protected]>
1 parent f95f2e1 commit 1285c50

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

docker/spring-cloud-contract-stub-runner-docker/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,5 @@ COPY --chown=scc:scc target/maven_dependencies /home/scc/.m2/repository/
3434
COPY --chown=scc:scc target/libs/stub-runner-boot.jar stub-runner-boot.jar
3535
RUN echo "Fetching dependencies, please wait..."
3636
RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.repo=${THIN_REPO}
37-
RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.profile=rabbit --thin.repo=${THIN_REPO}
38-
RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.profile=kafka --thin.repo=${THIN_REPO}
3937
COPY --chown=scc:scc run.sh run.sh
4038
ENTRYPOINT ["./run.sh"]

docker/spring-cloud-contract-stub-runner-docker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
<profile>
289289
<id>milestone</id>
290290
<properties>
291-
<thin.repo>https://repo.spring.io/milestone</thin.repo>
291+
<thin.repo>https://repo.maven.apache.org/maven2</thin.repo>
292292
</properties>
293293
</profile>
294294
<profile>

spring-cloud-contract-stub-runner-boot/pom.xml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,14 @@
2222
<groupId>org.springframework.cloud</groupId>
2323
<artifactId>spring-cloud-contract-spec-kotlin</artifactId>
2424
</dependency>
25-
<!-- <dependency>-->
26-
<!-- <groupId>org.springframework.cloud</groupId>-->
27-
<!-- <artifactId>spring-cloud-stream-binder-rabbit</artifactId>-->
28-
<!-- &lt;!&ndash;Because of the docker creation process explicit version is needed&ndash;&gt;-->
29-
<!-- <version>5.0.0-SNAPSHOT</version>-->
30-
<!-- </dependency>-->
31-
<!-- <dependency>-->
32-
<!-- <groupId>org.springframework.cloud</groupId>-->
33-
<!-- <artifactId>spring-cloud-stream-binder-kafka</artifactId>-->
34-
<!-- &lt;!&ndash;Because of the docker creation process explicit version is needed&ndash;&gt;-->
35-
<!-- <version>5.0.0-SNAPSHOT</version>-->
36-
<!-- </dependency>-->
25+
<dependency>
26+
<groupId>org.springframework.cloud</groupId>
27+
<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.springframework.cloud</groupId>
31+
<artifactId>spring-cloud-stream-binder-kafka</artifactId>
32+
</dependency>
3733
<dependency>
3834
<groupId>org.springframework.boot</groupId>
3935
<artifactId>spring-boot-starter-web</artifactId>
@@ -70,4 +66,15 @@
7066
</plugin>
7167
</plugins>
7268
</build>
69+
<dependencyManagement>
70+
<dependencies>
71+
<dependency>
72+
<groupId>org.springframework.cloud</groupId>
73+
<artifactId>spring-cloud-stream-dependencies</artifactId>
74+
<version>${spring-cloud-stream.version}</version>
75+
<type>pom</type>
76+
<scope>import</scope>
77+
</dependency>
78+
</dependencies>
79+
</dependencyManagement>
7380
</project>

spring-cloud-contract-stub-runner-boot/src/main/resources/META-INF/thin-kafka.properties

Lines changed: 0 additions & 2 deletions
This file was deleted.

spring-cloud-contract-stub-runner-boot/src/main/resources/META-INF/thin-rabbit.properties

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)