Skip to content

Commit e6c6225

Browse files
committed
Revert debug changes.
1 parent 2644cfb commit e6c6225

File tree

6 files changed

+23
-103
lines changed

6 files changed

+23
-103
lines changed

docker/pom.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@
2828
<activeByDefault>true</activeByDefault>
2929
</activation>
3030
</profile>
31-
<profile>
32-
<id>integration</id>
33-
<activation>
34-
<activeByDefault>false</activeByDefault>
35-
</activation>
36-
<modules>
37-
<module>spring-cloud-contract-docker</module>
38-
<module>spring-cloud-contract-stub-runner-docker</module>
39-
</modules>
40-
</profile>
41-
<profile>
42-
<id>deploy</id>
43-
<activation>
44-
<activeByDefault>false</activeByDefault>
45-
</activation>
46-
<modules>
47-
<module>spring-cloud-contract-docker</module>
48-
<module>spring-cloud-contract-stub-runner-docker</module>
49-
</modules>
50-
</profile>
31+
<!-- <profile>-->
32+
<!-- <id>integration</id>-->
33+
<!-- <activation>-->
34+
<!-- <activeByDefault>false</activeByDefault>-->
35+
<!-- </activation>-->
36+
<!-- <modules>-->
37+
<!-- <module>spring-cloud-contract-docker</module>-->
38+
<!-- <module>spring-cloud-contract-stub-runner-docker</module>-->
39+
<!-- </modules>-->
40+
<!-- </profile>-->
41+
<!-- <profile>-->
42+
<!-- <id>deploy</id>-->
43+
<!-- <activation>-->
44+
<!-- <activeByDefault>false</activeByDefault>-->
45+
<!-- </activation>-->
46+
<!-- <modules>-->
47+
<!-- <module>spring-cloud-contract-docker</module>-->
48+
<!-- <module>spring-cloud-contract-stub-runner-docker</module>-->
49+
<!-- </modules>-->
50+
<!-- </profile>-->
5151
</profiles>
5252

5353
<build>

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

Lines changed: 1 addition & 3 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://repo.spring.io/milestone
4+
ARG THIN_REPO=https://repo.spring.io/snapshot
55

66
LABEL Author="Marcin Grzejszczak <[email protected]>"
77
LABEL Author="Bastian Doetsch <[email protected]>"
@@ -30,8 +30,6 @@ ENV PATH "${PATH}:${JAVA_HOME}/bin"
3030
# Spring Cloud Contract
3131
ENV SERVER_PORT 8750
3232
VOLUME /tmp
33-
RUN echo "$( pwd )"
34-
RUN echo "$( ls -a )"
3533
COPY --chown=scc:scc target/maven_dependencies /home/scc/.m2/repository/
3634
COPY --chown=scc:scc target/libs/stub-runner-boot.jar stub-runner-boot.jar
3735
RUN echo "Fetching dependencies, please wait..."

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

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<description>Spring Cloud Contract Stub Runner Docker</description>
1919

2020
<properties>
21-
<thin.repo>https://repo.spring.io/milestone</thin.repo>
21+
<thin.repo>https://repo.spring.io/snapshot</thin.repo>
2222
</properties>
2323

2424
<dependencies>
@@ -271,7 +271,7 @@
271271
<username>${env.DOCKER_HUB_USERNAME}</username>
272272
<password>${env.DOCKER_HUB_PASSWORD}</password>
273273
<buildArgs>
274-
<THIN_REPO>https://repo.spring.io/milestone</THIN_REPO>
274+
<THIN_REPO>${thin.repo}</THIN_REPO>
275275
</buildArgs>
276276
</configuration>
277277
<dependencies>
@@ -298,40 +298,4 @@
298298
</properties>
299299
</profile>
300300
</profiles>
301-
<repositories>
302-
<repository>
303-
<id>spring-snapshots</id>
304-
<name>Spring Snapshots</name>
305-
<url>https://repo.spring.io/snapshot</url>
306-
<snapshots>
307-
<enabled>true</enabled>
308-
</snapshots>
309-
</repository>
310-
<repository>
311-
<id>spring-milestones</id>
312-
<name>Spring Milestones</name>
313-
<url>https://repo.spring.io/milestone</url>
314-
<snapshots>
315-
<enabled>false</enabled>
316-
</snapshots>
317-
</repository>
318-
</repositories>
319-
<pluginRepositories>
320-
<pluginRepository>
321-
<id>spring-snapshots</id>
322-
<name>Spring Snapshots</name>
323-
<url>https://repo.spring.io/snapshot</url>
324-
<snapshots>
325-
<enabled>true</enabled>
326-
</snapshots>
327-
</pluginRepository>
328-
<pluginRepository>
329-
<id>spring-milestones</id>
330-
<name>Spring Milestones</name>
331-
<url>https://repo.spring.io/milestone</url>
332-
<snapshots>
333-
<enabled>false</enabled>
334-
</snapshots>
335-
</pluginRepository>
336-
</pluginRepositories>
337301
</project>

pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -643,9 +643,6 @@
643643
<profiles>
644644
<profile>
645645
<id>spring</id>
646-
<activation>
647-
<activeByDefault>true</activeByDefault>
648-
</activation>
649646
<repositories>
650647
<repository>
651648
<id>spring-snapshots</id>

spring-cloud-contract-dependencies/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@
116116
<profiles>
117117
<profile>
118118
<id>spring</id>
119-
<activation>
120-
<activeByDefault>true</activeByDefault>
121-
</activation>
122119
<repositories>
123120
<repository>
124121
<id>spring-snapshots</id>

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -58,40 +58,4 @@
5858
</plugin>
5959
</plugins>
6060
</build>
61-
<repositories>
62-
<repository>
63-
<id>spring-snapshots</id>
64-
<name>Spring Snapshots</name>
65-
<url>https://repo.spring.io/snapshot</url>
66-
<snapshots>
67-
<enabled>true</enabled>
68-
</snapshots>
69-
</repository>
70-
<repository>
71-
<id>spring-milestones</id>
72-
<name>Spring Milestones</name>
73-
<url>https://repo.spring.io/milestone</url>
74-
<snapshots>
75-
<enabled>false</enabled>
76-
</snapshots>
77-
</repository>
78-
</repositories>
79-
<pluginRepositories>
80-
<pluginRepository>
81-
<id>spring-snapshots</id>
82-
<name>Spring Snapshots</name>
83-
<url>https://repo.spring.io/snapshot</url>
84-
<snapshots>
85-
<enabled>true</enabled>
86-
</snapshots>
87-
</pluginRepository>
88-
<pluginRepository>
89-
<id>spring-milestones</id>
90-
<name>Spring Milestones</name>
91-
<url>https://repo.spring.io/milestone</url>
92-
<snapshots>
93-
<enabled>false</enabled>
94-
</snapshots>
95-
</pluginRepository>
96-
</pluginRepositories>
9761
</project>

0 commit comments

Comments
 (0)