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

Fixing the build (#63)

Browse Source 
we are installing artifacts twice. With Maven and Gradle then. We need to change that.

fixes #62
This commit is contained in:
Marcin Grzejszczak
2016-08-22 11:33:17 +02:00
committed by GitHub
parent 317a25b589
commit 012eac8f3c
38 changed files with 95 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -200,12 +200,6 @@
<fileset>
<directory>target</directory>
</fileset>
<fileset>
<directory>${env.HOME}/.m2/repository/com/example/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${env.HOME}/.m2/repository/org/springframework/cloud/contract/verifier/stubs/</directory>
<includes>
@@ -218,7 +212,6 @@
</plugins>
</build>
<profiles>
<profile>
<id>spring</id>

69
samples/pom.xml
View File

@@ -37,36 +37,47 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<!-- Invoke integration tests in the install phase, after the maven-plugin
is available -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<settingsFile>src/it/settings.xml</settingsFile>
<projectsDirectory>standalone</projectsDirectory>
<skipInvocation>${skipTests}</skipInvocation>
<streamLogs>true</streamLogs>
<profiles>
<profile>integration</profile>
</profiles>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
</configuration>
<executions>
<execution>
<id>integration</id>
<phase>install</phase>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>integration</id>
<build>
<plugins>
<plugin>
<!-- Invoke integration tests in the install phase, after the maven-plugin
is available -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<settingsFile>src/it/settings.xml</settingsFile>
<projectsDirectory>standalone</projectsDirectory>
<skipInvocation>${skipTests}</skipInvocation>
<streamLogs>true</streamLogs>
<profiles>
<profile>integration</profile>
</profiles>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<goals>
<goal>clean</goal>
<goal>install</goal>
</goals>
</configuration>
<executions>
<execution>
<id>integration</id>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

1
samples/standalone/dsl/http-client/build.gradle
View File

@@ -42,6 +42,7 @@ dependencies {
}
test {
systemProperty 'spring.profiles.active', 'gradle'
testLogging {
exceptionFormat = 'full'
}

1
samples/standalone/dsl/http-client/gradle.properties
View File

@@ -1,2 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.0.0.BUILD-SNAPSHOT
BOM_VERSION=Brixton.SR4

BIN
samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Jul 21 10:16:50 CEST 2016
#Fri Aug 19 15:39:05 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

2
samples/standalone/dsl/http-client/settings.gradle
View File

@@ -1 +1 @@
rootProject.name = 'http-client-dsl'
rootProject.name = 'http-client-dsl-gradle'

3
samples/standalone/dsl/http-client/src/test/resources/application-gradle.yaml Normal file
View File

@@ -0,0 +1,3 @@
stubrunner:
work-offline: true
stubs.ids: 'com.example:http-server-dsl-gradle:+:stubs:8080'

3
samples/standalone/dsl/http-server/build.gradle
View File

@@ -49,6 +49,7 @@ dependencies {
}
test {
systemProperty 'spring.profiles.active', 'gradle'
testLogging {
exceptionFormat = 'full'
}
@@ -59,7 +60,7 @@ task wrapper(type: Wrapper) {
}
clean.doFirst {
delete "~/.m2/repository/com/example/"
delete "~/.m2/repository/com/example/http-server-dsl-gradle"
}
task resolveDependencies {

1
samples/standalone/dsl/http-server/gradle.properties
View File

@@ -1,2 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.0.0.BUILD-SNAPSHOT
BOM_VERSION=Brixton.SR4

BIN
samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Jul 21 10:16:50 CEST 2016
#Fri Aug 19 15:38:58 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

6
samples/standalone/dsl/http-server/pom.xml
View File

@@ -97,12 +97,6 @@
<fileset>
<directory>target</directory>
</fileset>
<fileset>
<directory>${env.HOME}/.m2/repository/com/example/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>

2
samples/standalone/dsl/http-server/settings.gradle
View File

@@ -1 +1 @@
rootProject.name = 'http-server-dsl'
rootProject.name = 'http-server-dsl-gradle'

1
samples/standalone/messaging/stream-sink/build.gradle
View File

@@ -43,6 +43,7 @@ dependencies {
}
test {
systemProperty 'spring.profiles.active', 'gradle'
testLogging {
exceptionFormat = 'full'
}

1
samples/standalone/messaging/stream-sink/gradle.properties
View File

@@ -1,2 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.0.0.BUILD-SNAPSHOT
BOM_VERSION=Brixton.SR4

BIN
samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Jul 21 10:16:50 CEST 2016
#Fri Aug 19 15:39:28 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

2
samples/standalone/messaging/stream-sink/settings.gradle
View File

@@ -1 +1 @@
rootProject.name = 'stream-sink'
rootProject.name = 'stream-sink-gradle'

3
samples/standalone/messaging/stream-sink/src/test/resources/application-gradle.yml Normal file
View File

@@ -0,0 +1,3 @@
stubrunner:
work-offline: true
stubs.ids: 'com.example:stream-source-gradle'

3
samples/standalone/messaging/stream-source/build.gradle
View File

@@ -73,6 +73,7 @@ publishing {
}
test {
systemProperty 'spring.profiles.active', 'gradle'
testLogging {
exceptionFormat = 'full'
}
@@ -83,7 +84,7 @@ task wrapper(type: Wrapper) {
}
clean.doFirst {
delete "~/.m2/repository/com/example/"
delete "~/.m2/repository/com/example/stream-source-gradle"
}
task resolveDependencies {

1
samples/standalone/messaging/stream-source/gradle.properties
View File

@@ -1,2 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.0.0.BUILD-SNAPSHOT
BOM_VERSION=Brixton.SR4

BIN
samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Jul 21 10:16:50 CEST 2016
#Fri Aug 19 15:39:21 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

6
samples/standalone/messaging/stream-source/pom.xml
View File

@@ -93,12 +93,6 @@
<fileset>
<directory>target</directory>
</fileset>
<fileset>
<directory>${env.HOME}/.m2/repository/com/example/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>

2
samples/standalone/messaging/stream-source/settings.gradle
View File

@@ -1 +1 @@
rootProject.name = 'stream-source'
rootProject.name = 'stream-source-gradle'

1
samples/standalone/restdocs/http-client/build.gradle
View File

@@ -43,6 +43,7 @@ dependencies {
}
test {
systemProperty 'spring.profiles.active', 'gradle'
testLogging {
exceptionFormat = 'full'
}

1
samples/standalone/restdocs/http-client/gradle.properties
View File

@@ -1,2 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.0.0.BUILD-SNAPSHOT
BOM_VERSION=Brixton.SR4

BIN
samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Jul 21 10:16:50 CEST 2016
#Fri Aug 19 15:39:49 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

2
samples/standalone/restdocs/http-client/settings.gradle
View File

@@ -1 +1 @@
rootProject.name = 'http-client-restdocs'
rootProject.name = 'http-client-restdocs-gradle'

3
samples/standalone/restdocs/http-server/build.gradle
View File

@@ -49,6 +49,7 @@ dependencies {
}
test {
systemProperty 'spring.profiles.active', 'gradle'
testLogging {
exceptionFormat = 'full'
}
@@ -87,7 +88,7 @@ task copyClasses(type: Copy) {
clean.doFirst {
delete 'target/snippets/stubs'
delete "~/.m2/repository/com/example/"
delete "~/.m2/repository/com/example/http-server-restdocs-gradle"
}
task resolveDependencies {

1
samples/standalone/restdocs/http-server/gradle.properties
View File

@@ -1,2 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.0.0.BUILD-SNAPSHOT
BOM_VERSION=Brixton.SR4

BIN
samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Jul 21 10:16:50 CEST 2016
#Fri Aug 19 15:39:42 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

15
samples/standalone/restdocs/http-server/pom.xml
View File

@@ -80,6 +80,21 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
<directory>build</directory>
</fileset>
<fileset>
<directory>target</directory>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>

2
samples/standalone/restdocs/http-server/settings.gradle
View File

@@ -1 +1 @@
rootProject.name = 'http-server-restdocs'
rootProject.name = 'http-server-restdocs-gradle'

2
scripts/generateDocs.sh
View File

@@ -4,7 +4,7 @@ source common.sh || source scripts/common.sh || echo "No common.sh script found.
set -e
echo "Generating docs for Spring Cloud Contract version [$VERIFIER_VERSION]"
echo "Generating docs for Spring Cloud Contract"
echo "Building main docs"
./mvnw clean install -P docs -DskipTests=true --pl docs