SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant shell scripts from sample builds

Browse Source
This commit is contained in:
Dave Syer
2016-08-14 09:19:37 -07:00
parent 89a2b36556
commit 3c104276fc
7 changed files with 21 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
samples/standalone/dsl/pom.xml
View File

@@ -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>

36
samples/standalone/dsl/runTests.sh
View File

@@ -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

92
samples/standalone/messaging/pom.xml
View File

@@ -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>

36
samples/standalone/messaging/runTests.sh
View File

@@ -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

6
samples/standalone/restdocs/http-client/pom.xml
View File

@@ -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[] -->

92
samples/standalone/restdocs/pom.xml
View File

@@ -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>

36
samples/standalone/restdocs/runTests.sh
View File

@@ -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