Revert debug changes.

spring-cloud · Nov 14, 2024 · e6c6225 · e6c6225
1 parent 2644cfb
commit e6c6225
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 103 deletions.
diff --git a/docker/pom.xml b/docker/pom.xml
@@ -28,26 +28,26 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 		</profile>
-		<profile>
-			<id>integration</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<modules>
-				<module>spring-cloud-contract-docker</module>
-				<module>spring-cloud-contract-stub-runner-docker</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>deploy</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<modules>
-				<module>spring-cloud-contract-docker</module>
-				<module>spring-cloud-contract-stub-runner-docker</module>
-			</modules>
-		</profile>
+<!--		<profile>-->
+<!--			<id>integration</id>-->
+<!--			<activation>-->
+<!--				<activeByDefault>false</activeByDefault>-->
+<!--			</activation>-->
+<!--			<modules>-->
+<!--				<module>spring-cloud-contract-docker</module>-->
+<!--				<module>spring-cloud-contract-stub-runner-docker</module>-->
+<!--			</modules>-->
+<!--		</profile>-->
+<!--		<profile>-->
+<!--			<id>deploy</id>-->
+<!--			<activation>-->
+<!--				<activeByDefault>false</activeByDefault>-->
+<!--			</activation>-->
+<!--			<modules>-->
+<!--				<module>spring-cloud-contract-docker</module>-->
+<!--				<module>spring-cloud-contract-stub-runner-docker</module>-->
+<!--			</modules>-->
+<!--		</profile>-->
 	</profiles>
 
 	<build>

diff --git a/docker/spring-cloud-contract-stub-runner-docker/Dockerfile b/docker/spring-cloud-contract-stub-runner-docker/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 
 ARG SDKMAN_JAVA_INSTALLATION=17.0.1-tem
-ARG THIN_REPO=https://repo.spring.io/milestone
+ARG THIN_REPO=https://repo.spring.io/snapshot
 
 LABEL Author="Marcin Grzejszczak <mgrzejszczak@pivotal.io>"
 LABEL Author="Bastian Doetsch <bdoetsch@vmware.com>"
@@ -30,8 +30,6 @@ ENV PATH "${PATH}:${JAVA_HOME}/bin"
 # Spring Cloud Contract
 ENV SERVER_PORT 8750
 VOLUME /tmp
-RUN echo "$( pwd )"
-RUN echo "$( ls -a )"
 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..."

diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
@@ -18,7 +18,7 @@
 	<description>Spring Cloud Contract Stub Runner Docker</description>
 
 	<properties>
-		<thin.repo>https://repo.spring.io/milestone</thin.repo>
+		<thin.repo>https://repo.spring.io/snapshot</thin.repo>
 	</properties>
 
 	<dependencies>
@@ -271,7 +271,7 @@
 					<username>${env.DOCKER_HUB_USERNAME}</username>
 					<password>${env.DOCKER_HUB_PASSWORD}</password>
 					<buildArgs>
-						<THIN_REPO>https://repo.spring.io/milestone</THIN_REPO>
+						<THIN_REPO>${thin.repo}</THIN_REPO>
 					</buildArgs>
 				</configuration>
 				<dependencies>
@@ -298,40 +298,4 @@
 			</properties>
 		</profile>
 	</profiles>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -643,9 +643,6 @@
 	<profiles>
 		<profile>
 			<id>spring</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<repositories>
 				<repository>
 					<id>spring-snapshots</id>

diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
@@ -116,9 +116,6 @@
 	<profiles>
 		<profile>
 			<id>spring</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<repositories>
 				<repository>
 					<id>spring-snapshots</id>

diff --git a/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner-boot/pom.xml
@@ -58,40 +58,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
 </project>