diff --git a/docker/spring-cloud-contract-stub-runner-docker/Dockerfile b/docker/spring-cloud-contract-stub-runner-docker/Dockerfile index 626d4fc467..ba1cede674 100644 --- a/docker/spring-cloud-contract-stub-runner-docker/Dockerfile +++ b/docker/spring-cloud-contract-stub-runner-docker/Dockerfile @@ -1,6 +1,7 @@ FROM ubuntu:20.04 ARG SDKMAN_JAVA_INSTALLATION=17.0.1-tem +ARG THIN_REPO=https://repo.spring.io/snapshot LABEL Author="Marcin Grzejszczak " LABEL Author="Bastian Doetsch " @@ -32,8 +33,8 @@ VOLUME /tmp COPY --chown=scc:scc target/maven_dependencies /home/scc/.m2/repository/ COPY --chown=scc:scc target/libs/stub-runner-boot.jar stub-runner-boot.jar RUN echo "Fetching dependencies, please wait..." -RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar -RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.profile=rabbit -RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.profile=kafka +RUN java -Dthin.dryrun=true -Dthin.repo=${THIN_REPO} -jar stub-runner-boot.jar +RUN java -Dthin.dryrun=true -Dthin.repo=${THIN_REPO} -jar stub-runner-boot.jar --thin.profile=rabbit +RUN java -Dthin.dryrun=true -Dthin.repo=${THIN_REPO} -jar stub-runner-boot.jar --thin.profile=kafka COPY --chown=scc:scc run.sh run.sh ENTRYPOINT ["./run.sh"] diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 029e079a76..326f4f823c 100644 --- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml +++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml @@ -17,6 +17,10 @@ Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker + + https://repo.spring.io/snapshot + + @@ -156,6 +160,13 @@ spring-cloud-starter-contract-stub-runner-jetty compile + + org.springframework.boot.experimental + spring-boot-thin-launcher + ${thin-jar.version} + exec + compile + @@ -242,6 +253,9 @@ ${project.version} ${env.DOCKER_HUB_USERNAME} ${env.DOCKER_HUB_PASSWORD} + + ${thin.repo} + @@ -253,4 +267,18 @@ + + + milestone + + https://repo.spring.io/milestone + + + + central + + https://repo.maven.apache.org/maven2 + + + diff --git a/pom.xml b/pom.xml index 10a625bdf5..42cd7eeed8 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ 2.32.0 5.2.1 [2.0.0,) + 1.0.28.RELEASE 5.9.1 5.9.1 diff --git a/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner-boot/pom.xml index b3971b113d..eb02b599c8 100644 --- a/spring-cloud-contract-stub-runner-boot/pom.xml +++ b/spring-cloud-contract-stub-runner-boot/pom.xml @@ -13,9 +13,6 @@ jar Spring Cloud Contract Stub Runner Boot Spring Cloud Contract Stub Runner Boot - - 1.0.28.RELEASE - org.springframework.cloud