From 3c104276fc47748f5065dba7609c466ebf13acc9 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Sun, 14 Aug 2016 09:19:37 -0700
Subject: [PATCH] Remove redundant shell scripts from sample builds

---
 samples/standalone/dsl/pom.xml                | 92 +------------------
 samples/standalone/dsl/runTests.sh            | 36 --------
 samples/standalone/messaging/pom.xml          | 92 +------------------
 samples/standalone/messaging/runTests.sh      | 36 --------
 .../standalone/restdocs/http-client/pom.xml   |  6 ++
 samples/standalone/restdocs/pom.xml           | 92 +------------------
 samples/standalone/restdocs/runTests.sh       | 36 --------
 7 files changed, 21 insertions(+), 369 deletions(-)
 delete mode 100755 samples/standalone/dsl/runTests.sh
 delete mode 100755 samples/standalone/messaging/runTests.sh
 delete mode 100755 samples/standalone/restdocs/runTests.sh

diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml
index 44323034cf..12cff9f583 100644
--- a/samples/standalone/dsl/pom.xml
+++ b/samples/standalone/dsl/pom.xml
@@ -20,6 +20,11 @@
 		<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
+	<modules>
+		<module>http-server</module>
+		<module>http-client</module>
+	</modules>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -31,91 +36,4 @@
 		</plugins>
 	</build>
 
-	<profiles>
-		<profile>
-			<id>spring</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/snapshot</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/milestone</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>http://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-			</repositories>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/snapshot</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/milestone</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>http://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-			</pluginRepositories>
-		</profile>
-		<profile>
-			<id>integration</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>runTests</id>
-								<phase>test</phase>
-								<configuration>
-									<executable>./runTests.sh</executable>
-									<arguments>
-										<argument>${spring-cloud-contract.version}</argument>
-									</arguments>
-								</configuration>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>
diff --git a/samples/standalone/dsl/runTests.sh b/samples/standalone/dsl/runTests.sh
deleted file mode 100755
index 638292068d..0000000000
--- a/samples/standalone/dsl/runTests.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-VERIFIER_VERSION=$1
-ROOT=`pwd`
-
-cat <<EOF
-Running tests with the following parameters
-VERIFIER_VERSION=${VERIFIER_VERSION}
-EOF
-
-rm -rf ~/.m2/repository/com/example/
-
-echo -e "\n\nRunning the tests via bash script only because we need to force order of execution."
-echo -e "First server and client with Maven. Then server and client with Gradle."
-
-echo -e "\n\nRunning tests for Maven (Messaging communication)\n\n"
-echo -e "Building server"
-cd ${ROOT}/http-server
-./mvnw clean install -Dspring-contract.version=${VERIFIER_VERSION}
-
-echo -e "Building client"
-cd ${ROOT}/http-client
-./mvnw clean install -Dspring-contract.version=${VERIFIER_VERSION}
-
-rm -rf ~/.m2/repository/com/example/
-
-echo -e "\n\nRunning tests for Gradle (Messaging communication)\n\n"
-echo -e "Building server"
-cd ${ROOT}/http-server
-./mvnw clean install -DskipTests -Dspring-contract.version=${VERIFIER_VERSION} -P integration
-
-echo -e "Building client"
-cd ${ROOT}/http-client
-./mvnw clean install -DskipTests -Dspring-contract.version=${VERIFIER_VERSION} -P integration
\ No newline at end of file
diff --git a/samples/standalone/messaging/pom.xml b/samples/standalone/messaging/pom.xml
index af7015a820..a2b3a77998 100644
--- a/samples/standalone/messaging/pom.xml
+++ b/samples/standalone/messaging/pom.xml
@@ -20,6 +20,11 @@
 		<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
+	<modules>
+		<module>stream-source</module>
+		<module>stream-sink</module>
+	</modules>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -31,91 +36,4 @@
 		</plugins>
 	</build>
 
-	<profiles>
-		<profile>
-			<id>spring</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/snapshot</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/milestone</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>http://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-			</repositories>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/snapshot</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/milestone</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>http://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-			</pluginRepositories>
-		</profile>
-		<profile>
-			<id>integration</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>runTests</id>
-								<phase>test</phase>
-								<configuration>
-									<executable>./runTests.sh</executable>
-									<arguments>
-										<argument>${spring-cloud-contract.version}</argument>
-									</arguments>
-								</configuration>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>
diff --git a/samples/standalone/messaging/runTests.sh b/samples/standalone/messaging/runTests.sh
deleted file mode 100755
index 5750b55560..0000000000
--- a/samples/standalone/messaging/runTests.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-VERIFIER_VERSION=$1
-ROOT=`pwd`
-
-cat <<EOF
-Running tests with the following parameters
-VERIFIER_VERSION=${VERIFIER_VERSION}
-EOF
-
-rm -rf ~/.m2/repository/com/example/
-
-echo -e "\n\nRunning the tests via bash script only because we need to force order of execution."
-echo -e "First server and client with Maven. Then server and client with Gradle."
-
-echo -e "\n\nRunning tests for Maven (Messaging communication)\n\n"
-echo -e "Building server"
-cd ${ROOT}/stream-source
-./mvnw clean install -Dspring-contract.version=${VERIFIER_VERSION}
-
-echo -e "Building client"
-cd ${ROOT}/stream-sink
-./mvnw clean install -Dspring-contract.version=${VERIFIER_VERSION}
-
-rm -rf ~/.m2/repository/com/example/
-
-echo -e "\n\nRunning tests for Gradle (Messaging communication)\n\n"
-echo -e "Building server"
-cd ${ROOT}/stream-source
-./mvnw clean install -DskipTests -Dspring-contract.version=${VERIFIER_VERSION} -P integration
-
-echo -e "Building client"
-cd ${ROOT}/stream-sink
-./mvnw clean install -DskipTests -Dspring-contract.version=${VERIFIER_VERSION} -P integration
\ No newline at end of file
diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml
index 6a92d81ab4..ce95100629 100644
--- a/samples/standalone/restdocs/http-client/pom.xml
+++ b/samples/standalone/restdocs/http-client/pom.xml
@@ -50,6 +50,12 @@
 			<classifier>stubs</classifier>
 			<version>0.0.1-SNAPSHOT</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- end::stub_runner[] -->
 
diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml
index 77bee619cf..d6c89288e8 100644
--- a/samples/standalone/restdocs/pom.xml
+++ b/samples/standalone/restdocs/pom.xml
@@ -20,6 +20,11 @@
 		<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
+	<modules>
+		<module>http-server</module>
+		<module>http-client</module>
+	</modules>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -31,91 +36,4 @@
 		</plugins>
 	</build>
 
-	<profiles>
-		<profile>
-			<id>spring</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/snapshot</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/milestone</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>http://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-			</repositories>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/snapshot</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/milestone</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>http://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-			</pluginRepositories>
-		</profile>
-		<profile>
-			<id>integration</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>runTests</id>
-								<phase>test</phase>
-								<configuration>
-									<executable>./runTests.sh</executable>
-									<arguments>
-										<argument>${spring-cloud-contract.version}</argument>
-									</arguments>
-								</configuration>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>
diff --git a/samples/standalone/restdocs/runTests.sh b/samples/standalone/restdocs/runTests.sh
deleted file mode 100755
index 638292068d..0000000000
--- a/samples/standalone/restdocs/runTests.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-VERIFIER_VERSION=$1
-ROOT=`pwd`
-
-cat <<EOF
-Running tests with the following parameters
-VERIFIER_VERSION=${VERIFIER_VERSION}
-EOF
-
-rm -rf ~/.m2/repository/com/example/
-
-echo -e "\n\nRunning the tests via bash script only because we need to force order of execution."
-echo -e "First server and client with Maven. Then server and client with Gradle."
-
-echo -e "\n\nRunning tests for Maven (Messaging communication)\n\n"
-echo -e "Building server"
-cd ${ROOT}/http-server
-./mvnw clean install -Dspring-contract.version=${VERIFIER_VERSION}
-
-echo -e "Building client"
-cd ${ROOT}/http-client
-./mvnw clean install -Dspring-contract.version=${VERIFIER_VERSION}
-
-rm -rf ~/.m2/repository/com/example/
-
-echo -e "\n\nRunning tests for Gradle (Messaging communication)\n\n"
-echo -e "Building server"
-cd ${ROOT}/http-server
-./mvnw clean install -DskipTests -Dspring-contract.version=${VERIFIER_VERSION} -P integration
-
-echo -e "Building client"
-cd ${ROOT}/http-client
-./mvnw clean install -DskipTests -Dspring-contract.version=${VERIFIER_VERSION} -P integration
\ No newline at end of file