Merge branch '1.2.x'

This commit is contained in:
Marcin Grzejszczak
2018-03-15 14:56:04 +01:00
3 changed files with 62 additions and 12 deletions

View File

@@ -20,10 +20,24 @@
<docker.registry.organization>springcloud</docker.registry.organization>
</properties>
<modules>
<module>spring-cloud-contract-docker</module>
<module>spring-cloud-contract-stub-runner-docker</module>
</modules>
<profiles>
<profile>
<id>skip</id>
<activation>
<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>
</profiles>
<build>
<plugins>