Skip to content

Commit 2c40233

Browse files
committed
Initialise thin jar stream dependencies from pom.
Signed-off-by: Olga Maciaszek-Sharma <[email protected]>
1 parent baa1f67 commit 2c40233

File tree

5 files changed

+10
-33
lines changed

5 files changed

+10
-33
lines changed

docker/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,5 @@
6868
</plugin>
6969
</plugins>
7070
</build>
71-
<dependencyManagement>
72-
<dependencies>
73-
<dependency>
74-
<groupId>org.springframework.cloud</groupId>
75-
<artifactId>spring-cloud-stream-dependencies</artifactId>
76-
<version>${spring-cloud-stream.version}</version>
77-
<type>pom</type>
78-
<scope>import</scope>
79-
</dependency>
80-
</dependencies>
81-
</dependencyManagement>
8271

8372
</project>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:20.04
22

33
ARG SDKMAN_JAVA_INSTALLATION=17.0.1-tem
4-
ARG THIN_REPO=https://repo1.maven.org/maven2/
4+
ARG THIN_REPO=https://repo.spring.io/snapshot
55

66
LABEL Author="Marcin Grzejszczak <[email protected]>"
77
LABEL Author="Bastian Doetsch <[email protected]>"
@@ -33,8 +33,6 @@ VOLUME /tmp
3333
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..."
36-
RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.repo=https://repo.maven.apache.org/maven2
37-
RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.profile=rabbit --thin.repo=https://repo.maven.apache.org/maven2
38-
RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.profile=kafka --thin.repo=https://repo.maven.apache.org/maven2
36+
RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.repo=${THIN_REPO}
3937
COPY --chown=scc:scc run.sh run.sh
4038
ENTRYPOINT ["./run.sh"]

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

Lines changed: 8 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-M1</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-M1</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>

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

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

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

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

0 commit comments

Comments
 (0)