Changing group id

to org.springframework.cloud from org.springframework.cloud.contract

also stopped running an http server if the contract doesn't support it
added back stub runner modules

docs/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>

docs/src/main/asciidoc/contract.adoc

@@ -5,8 +5,8 @@
 == Contract DSL
 
 IMPORTANT: Remember that inside the contract file you have to provide the fully qualified name to
-the `Contract` class and the `make` static import i.e. `org.springframework.cloud.contract.spec.Contract.make { ... }`.
-You can also provide an import to the `Contract` class `import org.springframework.cloud.contract.spec.Contract` and then call
+the `Contract` class and the `make` static import i.e. `org.springframework.cloud.spec.Contract.make { ... }`.
+You can also provide an import to the `Contract` class `import org.springframework.cloud.spec.Contract` and then call
   `Contract.make { ... }`
 
 Contract DSL is written in Groovy, but don't be alarmed if you didn't use Groovy before. Knowledge of the language is not really needed as our DSL uses only
@@ -24,7 +24,7 @@ include::{verifier_core_path}/src/test/groovy/org/springframework/cloud/contract
 
 Not all features of the DSL are used in example above. If you didn't find what you are looking for, please check next paragraphs on this page.
 
-> You can easily compile Contracts to WireMock stubs mapping using standalone maven command: `mvn org.springframework.cloud.contract:spring-cloud-contract-verifier-maven-plugin:convert`.
+> You can easily compile Contracts to WireMock stubs mapping using standalone maven command: `mvn org.springframework.cloud:spring-cloud-contract-verifier-maven-plugin:convert`.
 
 === Limitations
 

docs/src/main/asciidoc/messaging.adoc

@@ -22,11 +22,11 @@ You have to provide as a dependency one of the Spring Cloud Contract Verifier Me
 [source,groovy,indent=0]
 ----
 // for Apache Camel
-testCompile "org.springframework.cloud.contract:spring-cloud-contract-verifier-camel:${verifierVersion}"
+testCompile "org.springframework.cloud:spring-cloud-contract-verifier-camel:${verifierVersion}"
 // for Spring Integration
-testCompile "org.springframework.cloud.contract:spring-cloud-contract-verifier-integration:${verifierVersion}"
+testCompile "org.springframework.cloud:spring-cloud-contract-verifier-integration:${verifierVersion}"
 // for Spring Cloud Stream
-testCompile "org.springframework.cloud.contract:spring-cloud-contract-verifier-stream:${verifierVersion}"
+testCompile "org.springframework.cloud:spring-cloud-contract-verifier-stream:${verifierVersion}"
 ----
 
 === Manual Integration
@@ -45,7 +45,7 @@ You have to provide as a dependency the `spring-cloud-contract-verifier-messagin
 
 [source,groovy,indent=0]
 ----
-testCompile "org.springframework.cloud.contract:spring-cloud-contract-verifier-messaging-core:${verifierVersion}"
+testCompile "org.springframework.cloud:spring-cloud-contract-verifier-messaging-core:${verifierVersion}"
 ----
 
 === Publisher side test generation

docs/src/main/asciidoc/rest.adoc

@@ -19,7 +19,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'org.springframework.cloud.contract:spring-cloud-contract-verifier-gradle-plugin:${verifier_version}'
+		classpath 'org.springframework.cloud:spring-cloud-contract-verifier-gradle-plugin:${verifier_version}'
 	}
 }
 
@@ -51,7 +51,7 @@ repositories {
 [source,xml,indent=0]
 ----
 <plugin>
-    <groupId>org.springframework.cloud.contract</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
     <executions>
         <execution>
@@ -102,7 +102,7 @@ contractVerifier {
     testMode = 'MockMvc'
     generatedTestSourcesDir = project.file("${project.buildDir}/generated-test-sources/contracts")
     contractsDslDir = "${project.rootDir}/src/test/resources/contracts"
-    basePackageForTests = 'org.springframework.cloud.contract.verifier.tests'
+    basePackageForTests = 'org.springframework.cloud.verifier.tests'
     stubsOutputDir = project.file("${project.buildDir}/stubs")
 }
 
@@ -151,7 +151,7 @@ contractVerifier {
  - **testMode** - defines mode for acceptance tests. By default MockMvc which is based on Spring's MockMvc. It can also be changed to **JaxRsClient** or to **Explicit** for real HTTP calls.
  - **imports** - array with imports that should be included in generated tests (for example ['org.myorg.Matchers']). By default empty array []
  - **staticImports** - array with static imports that should be included in generated tests(for example ['org.myorg.Matchers.*']). By default empty array []
- - **basePackageForTests** - specifies base package for all generated tests. By default set to org.springframework.cloud.contract.verifier.tests
+ - **basePackageForTests** - specifies base package for all generated tests. By default set to org.springframework.cloud.verifier.tests
  - **baseClassForTests** - base class for generated tests. By default `spock.lang.Specification` if using Spock tests.
  - **ruleClassForTests** - specifies Rule which should be added to generated test classes.
  - **ignoredFiles** - Ant matcher allowing defining stub files for which processing should be skipped. By default empty array []
@@ -229,7 +229,7 @@ Underneath LoanApplication makes a call to FraudDetection service. This request
 [source,xml,indent=0]
 ----
 <plugin>
-    <groupId>org.springframework.cloud.contract.verifier</groupId>
+    <groupId>org.springframework.cloud.verifier</groupId>
     <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
     <executions>
         <execution>
@@ -273,7 +273,7 @@ To change default configuration just add `configuration` section to plugin defin
 [source,xml,indent=0]
 ----
 <plugin>
-    <groupId>org.springframework.cloud.contract.verifier</groupId>
+    <groupId>org.springframework.cloud.verifier</groupId>
     <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
     <executions>
         <execution>
@@ -285,8 +285,8 @@ To change default configuration just add `configuration` section to plugin defin
         </execution>
     </executions>
     <configuration>
-        <basePackageForTests>org.springframework.cloud.contract.verifier.twitter.place</basePackageForTests>
-        <baseClassForTests>org.springframework.cloud.contract.verifier.twitter.place.BaseMockMvcSpec</baseClassForTests>
+        <basePackageForTests>org.springframework.cloud.verifier.twitter.place</basePackageForTests>
+        <baseClassForTests>org.springframework.cloud.verifier.twitter.place.BaseMockMvcSpec</baseClassForTests>
     </configuration>
 </plugin>
 ----
@@ -294,7 +294,7 @@ To change default configuration just add `configuration` section to plugin defin
 ===== Important configuration options
 
  - **testMode** - defines mode for acceptance tests. By default `MockMvc` which is based on Spring's MockMvc. It can also be changed to `JaxRsClient` or to `Explicit` for real HTTP calls.
- - **basePackageForTests** - specifies base package for all generated tests. By default set to `org.springframework.cloud.contract.verifier.tests`.
+ - **basePackageForTests** - specifies base package for all generated tests. By default set to `org.springframework.cloud.verifier.tests`.
  - **ruleClassForTests** - specifies Rule which should be added to generated test classes.
  - **baseClassForTests** - base class for generated tests. By default `spock.lang.Specification` if using Spock tests.
  - **contractsDir** - directory containing contracts written using the GroovyDSL. By default `/src/test/resources/contracts`.
@@ -372,7 +372,7 @@ Sample configuration:
 [source,xml,indent=0]
 ----
 <plugin>
-    <groupId>org.springframework.cloud.contract.verifier</groupId>
+    <groupId>org.springframework.cloud.verifier</groupId>
     <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
     <version>${verifier-plugin.version}</version>
     <executions>

pom.xml

@@ -11,7 +11,6 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.springframework.cloud.contract</groupId>
 	<artifactId>spring-cloud-contract-parent</artifactId>
 	<packaging>pom</packaging>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
@@ -58,7 +57,7 @@
 				<version>3.3</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-dependencies</artifactId>
 				<version>${project.version}</version>
 				<type>pom</type>

samples/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>

samples/samples-messaging-camel/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Sample Camel</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-core</artifactId>
 		</dependency>
 		<dependency>
@@ -41,7 +41,7 @@
 			<version>${camel.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-camel</artifactId>
 			<scope>test</scope>
 		</dependency>

samples/samples-messaging-integration/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Sample Spring Integration</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-core</artifactId>
 		</dependency>
 		<dependency>
@@ -28,7 +28,7 @@
 			<version>${spring-boot.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-integration</artifactId>
 			<scope>test</scope>
 		</dependency>

samples/samples-messaging-spring/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Sample Spring</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-core</artifactId>
 		</dependency>
 		<dependency>
@@ -33,7 +33,7 @@
 			<version>5.12.1</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-messaging-core</artifactId>
 			<scope>test</scope>
 		</dependency>

samples/samples-messaging-stream/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Sample Spring Cloud Stream</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-core</artifactId>
 		</dependency>
 		<dependency>
@@ -23,7 +23,7 @@
 			<version>${spring-cloud-stream.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-stream</artifactId>
 			<scope>test</scope>
 		</dependency>

samples/samples-standalone/contract-verifier-sample-stream-sink/build.gradle

@@ -14,7 +14,7 @@ buildscript {
 	}
 }
 
-group = 'org.springframework.cloud.contract.testprojects'
+group = 'org.springframework.cloud.testprojects'
 version = '0.0.1-SNAPSHOT'
 
 repositories {
@@ -32,6 +32,7 @@ apply plugin: 'maven-publish'
 dependencyManagement {
 	imports {
 		mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION"
+		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
 
@@ -45,7 +46,7 @@ dependencies {
 	testCompile "org.spockframework:spock-core"
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 	testCompile "junit:junit"
-	testCompile "org.springframework.cloud.contract:spring-cloud-contract-stub-runner-stream:${findProperty('verifierVersion') ?: verifierVersion}"
+	testCompile "org.springframework.cloud:spring-cloud-contract-stub-runner-stream:${project.findProperty('verifierVersion') ?: verifierVersion}"
 }
 
 test {

samples/samples-standalone/contract-verifier-sample-stream-sink/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.cloud.contract.testprojects</groupId>
+	<groupId>org.springframework.cloud.testprojects</groupId>
 	<artifactId>contract-verifier-sample-stream-sink</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
@@ -36,7 +36,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>
 			<scope>test</scope>
 		</dependency>
@@ -45,7 +45,7 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-dependencies</artifactId>
 				<version>${spring-cloud-contract.version}</version>
 				<type>pom</type>

samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/resources/application.yml

@@ -1,3 +1,3 @@
 stubrunner:
   work-offline: true
-  stubs.ids: 'org.springframework.cloud.contract.testprojects:contract-verifier-sample-stream-source'
+  stubs.ids: 'org.springframework.cloud.testprojects:contract-verifier-sample-stream-source'

samples/samples-standalone/contract-verifier-sample-stream-source/build.gradle

@@ -9,11 +9,11 @@ buildscript {
 	}
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT"
-		classpath "org.springframework.cloud.contract:spring-cloud-contract-verifier-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
+		classpath "org.springframework.cloud:spring-cloud-contract-verifier-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
 
-group = 'org.springframework.cloud.contract.testprojects'
+group = 'org.springframework.cloud.testprojects'
 version = '0.0.1-SNAPSHOT'
 
 repositories {
@@ -33,6 +33,7 @@ apply plugin: 'maven-publish'
 dependencyManagement {
 	imports {
 		mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION"
+		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
 
@@ -49,7 +50,7 @@ dependencies {
 	compile("org.springframework.boot:spring-boot-starter-web")
 	compile("org.springframework.boot:spring-boot-starter-actuator")
 	compile("org.springframework.cloud:spring-cloud-starter-stream-rabbit")
-	compile("org.springframework.cloud.contract:spring-cloud-contract-verifier-stream:${findProperty('verifierVersion') ?: verifierVersion}")
+	compile("org.springframework.cloud:spring-cloud-contract-verifier-stream:${findProperty('verifierVersion') ?: verifierVersion}")
 
 	testRuntime "org.spockframework:spock-spring"
 	testCompile "org.spockframework:spock-core"

samples/samples-standalone/contract-verifier-sample-stream-source/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.cloud.contract.testprojects</groupId>
+	<groupId>org.springframework.cloud.testprojects</groupId>
 	<artifactId>contract-verifier-sample-stream-source</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
@@ -37,13 +37,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-stream</artifactId>
 			<scope>test</scope>
 		</dependency>
@@ -58,7 +58,7 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-dependencies</artifactId>
 				<version>${spring-cloud-contract.version}</version>
 				<type>pom</type>
@@ -81,7 +81,7 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
 				<version>${spring-cloud-contract.version}</version>
 				<extensions>true</extensions>
@@ -91,7 +91,7 @@
 				<!-- this was added for testing purposes only-->
 				<dependencies>
 					<dependency>
-						<groupId>org.springframework.cloud.contract</groupId>
+						<groupId>org.springframework.cloud</groupId>
 						<artifactId>spring-cloud-contract-verifier-core</artifactId>
 						<version>${spring-cloud-contract.version}</version>
 					</dependency>
@@ -116,7 +116,7 @@
 							<pluginExecutions>
 								<pluginExecution>
 									<pluginExecutionFilter>
-										<groupId>org.springframework.cloud.contract</groupId>
+										<groupId>org.springframework.cloud</groupId>
 										<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
 										<versionRange>[1.0.0.BUILD-SNAPSHOT,)</versionRange>
 										<goals>

samples/samples-standalone/http-client/build.gradle

@@ -29,6 +29,13 @@ apply plugin: 'groovy'
 apply plugin: 'spring-boot'
 apply plugin: 'maven-publish'
 
+dependencyManagement {
+	imports {
+		mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION"
+		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.findProperty('verifierVersion') ?: verifierVersion}"
+	}
+}
+
 dependencies {
 	compile("org.springframework.boot:spring-boot-starter-web")
 	compile("org.springframework.boot:spring-boot-starter-actuator")
@@ -38,7 +45,8 @@ dependencies {
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 	testCompile "org.spockframework:spock-core"
 	testCompile "junit:junit"
-	testCompile "org.springframework.cloud.contract:spring-cloud-contract-stub-runner-spring:${findProperty('verifierVersion') ?: verifierVersion}"
+	testCompile 'org.springframework.cloud:spring-cloud-contract-wiremock'
+	testCompile "org.springframework.cloud:spring-cloud-contract-stub-runner-spring:${findProperty('verifierVersion') ?: verifierVersion}"
 }
 
 test {

samples/samples-standalone/http-client/gradle.properties

@@ -1 +1,2 @@
-verifierVersion=1.0.0.BUILD-SNAPSHOT
+verifierVersion=1.0.0.BUILD-SNAPSHOT
+BOM_VERSION=Brixton.SR3

samples/samples-standalone/http-client/pom.xml

@@ -34,7 +34,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-wiremock</artifactId>
 			<scope>test</scope>
 		</dependency>
@@ -45,7 +45,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner-spring</artifactId>
 			<scope>test</scope>
 		</dependency>
@@ -59,7 +59,7 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-dependencies</artifactId>
 				<version>${spring-cloud-contract.version}</version>
 				<type>pom</type>

samples/samples-standalone/http-client/src/test/resources/application.yaml

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

samples/samples-standalone/http-server/build.gradle

@@ -11,7 +11,7 @@ buildscript {
 	}
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT"
-		classpath "org.springframework.cloud.contract:spring-cloud-contract-verifier-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
+		classpath "org.springframework.cloud:spring-cloud-contract-verifier-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
 
@@ -32,6 +32,12 @@ apply plugin: 'spring-boot'
 apply plugin: 'contract-verifier'
 apply plugin: 'maven-publish'
 
+dependencyManagement {
+	imports {
+		mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION"
+		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.findProperty('verifierVersion') ?: verifierVersion}"
+	}
+}
 
 contractVerifier {
 	baseClassForTests = 'com.example.fraud.MvcTest'

samples/samples-standalone/http-server/gradle.properties

@@ -1 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
+BOM_VERSION=Brixton.SR3

samples/samples-standalone/http-server/pom.xml

@@ -60,7 +60,7 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-dependencies</artifactId>
 				<version>${spring-cloud-contract.version}</version>
 				<type>pom</type>
@@ -76,7 +76,7 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
 				<version>${spring-cloud-contract.version}</version>
 				<extensions>true</extensions>
@@ -86,7 +86,7 @@
 				<!-- this was added for testing purposes only -->
 				<dependencies>
 					<dependency>
-						<groupId>org.springframework.cloud.contract</groupId>
+						<groupId>org.springframework.cloud</groupId>
 						<artifactId>spring-cloud-contract-verifier-core</artifactId>
 						<version>${spring-cloud-contract.version}</version>
 					</dependency>
@@ -111,7 +111,7 @@
 							<pluginExecutions>
 								<pluginExecution>
 									<pluginExecutionFilter>
-										<groupId>org.springframework.cloud.contract</groupId>
+										<groupId>org.springframework.cloud</groupId>
 										<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
 										<versionRange>[1.0.0.BUILD-SNAPSHOT,)</versionRange>
 										<goals>

spring-cloud-contract-dependencies/pom.xml

@@ -8,7 +8,6 @@
 		<version>1.1.2.BUILD-SNAPSHOT</version>
         <relativePath/>
 	</parent>
-	<groupId>org.springframework.cloud.contract</groupId>
 	<artifactId>spring-cloud-contract-dependencies</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
@@ -18,6 +17,7 @@
 		<wiremock.version>2.1.7</wiremock.version>
 		<jsonassert.version>0.4.7</jsonassert.version>
 		<camel.version>2.17.0</camel.version>
+		<activemq.version>5.12.1</activemq.version>
 		<aether.version>1.1.0</aether.version>
 		<spring-cloud-stream.version>1.0.2.RELEASE</spring-cloud-stream.version>
 		<spring-cloud-zookeeper.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
@@ -27,67 +27,77 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-wiremock</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-spec</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-testing-utils</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-stub-runner</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-stub-runner-jetty</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-stub-runner-spring</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-contract-stub-runner-camel</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-messaging-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-camel</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-integration</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-stream</artifactId>
 				<version>${project.version}</version>
 			</dependency>
@@ -150,6 +160,31 @@
 				<artifactId>camel-spring</artifactId>
 				<version>${camel.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-spring-boot-starter</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-jackson</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-jms</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-camel</artifactId>
+				<version>${activemq.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-pool</artifactId>
+				<version>${activemq.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>args4j</groupId>
 				<artifactId>args4j</artifactId>

spring-cloud-contract-spec/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -27,6 +27,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-cloud-contract-stub-runner/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/README.adoc

@@ -12,7 +12,7 @@ Just add the
 
 [source,groovy,indent=0]
 ----
-compile "org.springframework.cloud.contract:stub-runner-boot:${verifierVersion}"
+compile "org.springframework.cloud:stub-runner-boot:${verifierVersion}"
 ----
 
 and a messaging implementation:
@@ -20,11 +20,11 @@ and a messaging implementation:
 [source,groovy,indent=0]
 ----
 // for Apache Camel
-compile "org.springframework.cloud.contract:spring-cloud-contract-stub-runner-camel:${verifierVersion}"
+compile "org.springframework.cloud:spring-cloud-contract-stub-runner-camel:${verifierVersion}"
 // for Spring Integration
-compile "org.springframework.cloud.contract:spring-cloud-contract-stub-runner-integration:${verifierVersion}"
+compile "org.springframework.cloud:spring-cloud-contract-stub-runner-integration:${verifierVersion}"
 // for Spring Cloud Stream
-compile "org.springframework.cloud.contract:spring-cloud-contract-stub-runner-stream:${verifierVersion}"
+compile "org.springframework.cloud:spring-cloud-contract-stub-runner-stream:${verifierVersion}"
 ----
 
 Build a fat-jar and you're ready to go!

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-stub-runner-build</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -23,7 +23,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner-spring</artifactId>
 		</dependency>
 		<dependency>
@@ -45,6 +45,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/src/test/groovy/org/springframework/cloud/contract/stubrunner/boot/StubRunnerBootSpec.groovy

@@ -50,7 +50,7 @@ class StubRunnerBootSpec extends Specification {
 			String response = RestAssuredMockMvc.get('/stubs').body.asString()
 		then:
 			def root = new JsonSlurper().parseText(response)
-			root.'org.springframework.cloud.contract.verifier.stubs:streamService:0.0.1-SNAPSHOT:stubs' instanceof Integer
+			root.'org.springframework.cloud.contract.verifier.stubs:bootService:0.0.1-SNAPSHOT:stubs' instanceof Integer
 	}
 
 	def 'should return a port on which a [#stubId] stub is running'() {
@@ -60,11 +60,11 @@ class StubRunnerBootSpec extends Specification {
 			response.statusCode == 200
 			response.body.as(Integer) > 0
 		where:
-			stubId << ['org.springframework.cloud.contract.verifier.stubs:streamService:+:stubs',
-					   'org.springframework.cloud.contract.verifier.stubs:streamService:0.0.1-SNAPSHOT:stubs',
-					   'org.springframework.cloud.contract.verifier.stubs:streamService:+',
-					   'org.springframework.cloud.contract.verifier.stubs:streamService',
-					   'streamService']
+			stubId << ['org.springframework.cloud.contract.verifier.stubs:bootService:+:stubs',
+					   'org.springframework.cloud.contract.verifier.stubs:bootService:0.0.1-SNAPSHOT:stubs',
+					   'org.springframework.cloud.contract.verifier.stubs:bootService:+',
+					   'org.springframework.cloud.contract.verifier.stubs:bootService',
+					   'bootService']
 	}
 
 	def 'should return 404 when missing stub was called'() {
@@ -79,7 +79,7 @@ class StubRunnerBootSpec extends Specification {
 			String response = RestAssuredMockMvc.get('/triggers').body.asString()
 		then:
 			def root = new JsonSlurper().parseText(response)
-			root.'org.springframework.cloud.contract.verifier.stubs:streamService:0.0.1-SNAPSHOT:stubs'?.containsAll(["delete_book","return_book_1","return_book_2"])
+			root.'org.springframework.cloud.contract.verifier.stubs:bootService:0.0.1-SNAPSHOT:stubs'?.containsAll(["delete_book","return_book_1","return_book_2"])
 	}
 
 	def 'should trigger a messaging label'() {
@@ -105,7 +105,7 @@ class StubRunnerBootSpec extends Specification {
 		and:
 			1 * stubRunning.trigger(stubId, 'delete_book')
 		where:
-			stubId << ['org.springframework.cloud.contract.verifier.stubs:streamService:stubs', 'org.springframework.cloud.contract.verifier.stubs:streamService', 'streamService']
+			stubId << ['org.springframework.cloud.contract.verifier.stubs:bootService:stubs', 'org.springframework.cloud.contract.verifier.stubs:bootService', 'bootService']
 	}
 
 	def 'should return when trigger is missing'() {
@@ -114,7 +114,7 @@ class StubRunnerBootSpec extends Specification {
 		then:
 			response.statusCode == 404
 			def root = new JsonSlurper().parseText(response.body.asString())
-			root.'org.springframework.cloud.contract.verifier.stubs:streamService:0.0.1-SNAPSHOT:stubs'?.containsAll(["delete_book","return_book_1","return_book_2"])
+			root.'org.springframework.cloud.contract.verifier.stubs:bootService:0.0.1-SNAPSHOT:stubs'?.containsAll(["delete_book","return_book_1","return_book_2"])
 	}
 
 }

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/src/test/resources/application.yml

@@ -1,2 +1,2 @@
 stubrunner.stubs.repository.root: classpath:m2repo/repository/
-stubrunner.stubs.ids: org.springframework.cloud.contract.verifier.stubs:streamService
+stubrunner.stubs.ids: org.springframework.cloud.contract.verifier.stubs:bootService

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom

@@ -19,7 +19,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>
-  <artifactId>streamService</artifactId>
+  <artifactId>bootService</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 </project>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/maven-metadata.xml

@@ -17,7 +17,7 @@
 
 <metadata>
   <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>
-  <artifactId>streamService</artifactId>
+  <artifactId>bootService</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <versioning>
     <versions>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-jetty/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-stub-runner-build</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Stub Runner</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner</artifactId>
 		</dependency>
 		<dependency>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-junit/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-stub-runner-build</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Stub Runner JUnit</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner-jetty</artifactId>
 		</dependency>
 		<dependency>
@@ -35,6 +35,16 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/pom.xml

@@ -3,13 +3,19 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-stub-runner-build</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<artifactId>spring-cloud-contract-stub-runner-messaging</artifactId>
-	<packaging>jar</packaging>
+	<artifactId>spring-cloud-contract-stub-runner-messaging-build</artifactId>
+	<packaging>pom</packaging>
 	<name>Spring Cloud Contract Stub Runner Messaging</name>
 	<description>Spring Cloud Contract Stub Runner Messaging</description>
+
+	<modules>
+		<module>spring-cloud-contract-stub-runner-camel</module>
+		<module>spring-cloud-contract-stub-runner-integration</module>
+		<module>spring-cloud-contract-stub-runner-stream</module>
+	</modules>
 </project>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-camel/README.adoc

@@ -13,7 +13,7 @@ To use it you have to add the following dependency to your project (example for
 
 [source,groovy,indent=0]
 ----
-testCompile "org.springframework.cloud.contract:stub-runner-camel:${verifierVersion}"
+testCompile "org.springframework.cloud:stub-runner-camel:${verifierVersion}"
 ----
 
 ==== Examples

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-camel/pom.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-contract-stub-runner-messaging-build</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-contract-stub-runner-camel</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Cloud Contract Stub Runner Camel</name>
+	<description>Spring Cloud Contract Stub Runner Camel</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner-jetty</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner-spring</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-verifier-camel</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-jackson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-spring</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-camel</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-pool</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.gmavenplus</groupId>
+				<artifactId>gmavenplus-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy

@@ -19,12 +19,14 @@ package org.springframework.cloud.contract.stubrunner.messaging.camel
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import org.apache.activemq.camel.component.ActiveMQComponent
+import org.apache.activemq.spring.ActiveMQConnectionFactory
 import org.apache.camel.CamelContext
 import org.apache.camel.Exchange
+import org.apache.camel.component.jms.JmsConfiguration
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.stubrunner.StubFinder
 import org.springframework.context.annotation.Bean
@@ -32,13 +34,11 @@ import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ContextConfiguration
 import spock.lang.Specification
+
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
-@ComponentScan
-@EnableAutoConfiguration
-@ContextConfiguration(classes = CamelStubRunnerSpec, loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = Config, loader = SpringBootContextLoader)
 class CamelStubRunnerSpec extends Specification {
 
 	@Autowired StubFinder stubFinder
@@ -161,11 +161,28 @@ class CamelStubRunnerSpec extends Specification {
 		return json.bookName == 'foo'
 	}
 
-	@Bean
-	ActiveMQComponent activeMQComponent(@Value('${activemq.url:vm://localhost?broker.persistent=false}') String url) {
-		return new ActiveMQComponent(brokerURL: url)
+	@Configuration
+	@ComponentScan
+	@EnableAutoConfiguration
+	static class Config {
+
+		@Bean
+		ActiveMQConnectionFactory activeMQConnectionFactory(@Value('${activemq.url:vm://localhost?broker.persistent=false}') String url) {
+			return new ActiveMQConnectionFactory(brokerURL: url, trustAllPackages: true)
+		}
+
+		@Bean
+		JmsConfiguration jmsConfiguration(ActiveMQConnectionFactory activeMQConnectionFactory) {
+			return new JmsConfiguration(connectionFactory: activeMQConnectionFactory)
+		}
+
+		@Bean
+		ActiveMQComponent activeMQComponent(JmsConfiguration jmsConfiguration) {
+			return new ActiveMQComponent(configuration: jmsConfiguration)
+		}
 	}
 
+
 	Contract dsl =
 	// tag::sample_dsl[]
 	Contract.make {

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/README.adoc

@@ -13,7 +13,7 @@ To use it you have to add the following dependency to your project (example for
 
 [source,groovy,indent=0]
 ----
-testCompile "org.springframework.cloud.contract:stub-runner-integration:${verifierVersion}"
+testCompile "org.springframework.cloud:stub-runner-integration:${verifierVersion}"
 ----
 
 ==== Examples

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/pom.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-contract-stub-runner-messaging-build</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Cloud Contract Stub Runner Integration</name>
+	<description>Spring Cloud Contract Stub Runner Integration</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner-jetty</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner-spring</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-verifier-integration</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-java-dsl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-spring</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.gmavenplus</groupId>
+				<artifactId>gmavenplus-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy

@@ -18,12 +18,12 @@ package org.springframework.cloud.contract.stubrunner.messaging.integration
 
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
-import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.stubrunner.StubFinder
+import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
@@ -32,13 +32,14 @@ import org.springframework.test.context.ContextConfiguration
 import spock.lang.Specification
 
 import java.util.concurrent.TimeUnit
+
 /**
  * @author Marcin Grzejszczak
  */
 @Configuration
 @ComponentScan
 @EnableAutoConfiguration
-@ContextConfiguration(classes = IntegrationStubRunnerSpec, loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = IntegrationStubRunnerSpec, loader = SpringBootContextLoader)
 @ImportResource("classpath*:integration-context.xml")
 class IntegrationStubRunnerSpec extends Specification {
 

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-stream/README.adoc

@@ -14,7 +14,7 @@ To use it you have to add the following dependency to your project (example for
 
 [source,groovy,indent=0]
 ----
-testCompile "org.springframework.cloud.contract:stub-runner-stream:${verifierVersion}"
+testCompile "org.springframework.cloud:stub-runner-stream:${verifierVersion}"
 ----
 
 ==== Examples

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-stream/pom.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-contract-stub-runner-messaging-build</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Cloud Contract Stub Runner Stream</name>
+	<description>Spring Cloud Contract Stub Runner Stream</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner-spring</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-verifier-stream</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-java-dsl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-spring</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.gmavenplus</groupId>
+				<artifactId>gmavenplus-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy

@@ -18,12 +18,12 @@ package org.springframework.cloud.contract.stubrunner.messaging.stream
 
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
-import org.springframework.cloud.contract.spec.Contract
-import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
-import org.springframework.cloud.contract.stubrunner.StubFinder
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
+import org.springframework.cloud.contract.spec.Contract
+import org.springframework.cloud.contract.stubrunner.StubFinder
+import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
 import org.springframework.cloud.stream.annotation.EnableBinding
 import org.springframework.cloud.stream.messaging.Sink
@@ -34,13 +34,14 @@ import org.springframework.test.context.ContextConfiguration
 import spock.lang.Specification
 
 import java.util.concurrent.TimeUnit
+
 /**
  * @author Marcin Grzejszczak
  */
 @Configuration
 @ComponentScan
 @EnableAutoConfiguration
-@ContextConfiguration(classes = StreamStubRunnerSpec, loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = StreamStubRunnerSpec, loader = SpringBootContextLoader)
 @EnableBinding([Sink, Source])
 class StreamStubRunnerSpec extends Specification {
 

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/README.adoc

@@ -4,7 +4,7 @@ Registers the stubs in the provided Service Discovery. It's enough to add the ja
 
 [source,groovy,indent=0]
 ----
-org.springframework.cloud.contract:stub-runner-spring-cloud
+org.springframework.cloud:stub-runner-spring-cloud
 ----
 
 and the Stub Runner autoconfiguration should be picked up.

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-stub-runner-build</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,11 +14,11 @@
 	<description>Spring Cloud Contract Stub Runner Spring Cloud</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-wiremock</artifactId>
 		</dependency>
 		<dependency>
@@ -55,6 +55,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-stub-runner-build</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,11 +14,11 @@
 	<description>Spring Cloud Contract Stub Runner Spring</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-wiremock</artifactId>
 		</dependency>
 		<dependency>
@@ -40,6 +40,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring/src/main/groovy/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java

@@ -28,7 +28,6 @@ import org.springframework.cloud.contract.stubrunner.StubDownloader;
 import org.springframework.cloud.contract.stubrunner.StubRunner;
 import org.springframework.cloud.contract.stubrunner.StubRunnerOptions;
 import org.springframework.cloud.contract.stubrunner.StubRunnerOptionsBuilder;
-import org.springframework.cloud.contract.stubrunner.StubRunning;
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging;
 import org.springframework.context.annotation.Bean;
@@ -58,7 +57,7 @@ public class StubRunnerConfiguration {
 	 * @param stubs              comma separated list of stubs presented in Ivy notation
 	 */
 	@Bean
-	public StubRunning batchStubRunner(
+	public BatchStubRunner batchStubRunner(
 			@Value("${stubrunner.port.range.min:10000}") Integer minPortValue,
 			@Value("${stubrunner.port.range.max:15000}") Integer maxPortValue,
 			@Value("${stubrunner.stubs.repository.root:}") Resource stubRepositoryRoot,

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-stub-runner-build</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,20 +14,20 @@
 	<description>Spring Cloud Contract Stub Runner</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-wiremock</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-messaging-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-spec</artifactId>
 		</dependency>
 		<dependency>
@@ -86,6 +86,11 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/BatchStubRunner.groovy

@@ -35,7 +35,8 @@ class BatchStubRunner implements StubRunning {
 	@Override
 	RunningStubs runStubs() {
 		Map<StubConfiguration, Integer> appsAndPorts = stubRunners.inject([:]) { Map<StubConfiguration, Integer> acc, StubRunner value ->
-			acc.putAll(value.runStubs().namesAndPorts)
+			RunningStubs runningStubs = value.runStubs()
+			acc.putAll(runningStubs.validNamesAndPorts())
 			return acc
 		} as Map<StubConfiguration, Integer>
 		return new RunningStubs(appsAndPorts)

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/RunningStubs.groovy

@@ -75,6 +75,10 @@ class RunningStubs {
 		return namesAndPorts.collectEntries { [(it.key.toColonSeparatedDependencyNotation()) : it.value]  } as Map<String, Integer>
 	}
 
+	Map<StubConfiguration, Integer> validNamesAndPorts() {
+		return namesAndPorts.findAll { StubConfiguration key, Integer value -> value != -1 }
+	}
+
 	@Override
 	String toString() {
 		return namesAndPorts.collect {

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy

@@ -144,12 +144,21 @@ class StubRunnerExecutor implements StubFinder {
 		Collection<Contract> contracts = repository.contracts
 		Integer port = stubRunnerOptions.port(stubConfiguration)
 		if (port) {
-			stubServer = new StubServer(port, stubConfiguration, mappings, contracts).start()
+			stubServer = new StubServer(port, stubConfiguration, mappings, contracts)
 		} else {
 			stubServer =  portScanner.tryToExecuteWithFreePort { int availablePort ->
-				return new StubServer(availablePort, stubConfiguration, mappings, contracts).start()
+				return new StubServer(availablePort, stubConfiguration, mappings, contracts)
 			}
 		}
+		if (!contracts.empty && !contracts.any { it.request }) {
+			log.debug("There are no HTTP related contracts. Won't start any servers")
+			return
+		}
+		if (contracts.empty) {
+			log.warn("There are no contracts in the published JAR. This is an unusual situation " +
+					"that's why will start the server - maybe you know what you're doing...")
+		}
+		stubServer = stubServer.start()
 	}
 
 }

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubServer.groovy

@@ -64,7 +64,12 @@ class StubServer {
 	}
 
 	int getPort() {
-		return wireMockServer.port()
+		if (wireMockServer.isRunning()) {
+			return wireMockServer.port()
+		}
+		log.debug("The HTTP Server stub is not running... That means that the " +
+				"artifact is running a messaging module. Returning back -1 value of the port.")
+		return -1
 	}
 
 	URL getStubUrl() {

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/resources/repository/contracts/contract1.groovy

@@ -1,27 +1,27 @@
-org.springframework.cloud.contract.spec.Contract.make  {
-	// Human readable description
-	description 'Sends an order message'
-	// Label by means of which the output message can be triggered
-	label 'send_order'
-	// input to the contract
-	input {
-		// the contract will be triggered by a method
-		triggeredBy('orderTrigger()')
-	}
-	// output message of the contract
-	outputMessage {
-		// destination to which the output message will be sent
-		sentTo('orders')
-		// any headers for the output message
-		headers {
-			header('contentType': 'application/json')
-		}
-		// the body of the output message
-		body(
-				orderId: value(
-						consumer('40058c70-891c-4176-a033-f70bad0c5f77'),
-						producer(regex('([0-9|a-f]*-*)*'))),
-				description: "This is the order description"
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		method """PUT"""
+		url """/fraudcheck"""
+		body("""
+					{
+					"clientPesel":"${value(client(regex('[0-9]{10}')), server('1234567890'))}",
+					"loanAmount":99999}
+				"""
 		)
+		headers {
+			header("""Content-Type""", """application/vnd.fraud.v1+json""")
+		}
+
 	}
+	response {
+		status 200
+		body( """{
+	"fraudCheckStatus": "${value(client('FRAUD'), server(regex('[A-Z]{5}')))}",
+	"rejectionReason": "Amount too high"
+}""")
+		headers {
+			header('Content-Type': value(server(regex('application/vnd.fraud.v1.json.*')), client('application/vnd.fraud.v1+json')))
+		}
+	}
+
 }

spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/resources/repository/contracts/contract2.groovy

@@ -0,0 +1,27 @@
+org.springframework.cloud.contract.spec.Contract.make  {
+	// Human readable description
+	description 'Sends an order message'
+	// Label by means of which the output message can be triggered
+	label 'send_order'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('orderTrigger()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo('orders')
+		// any headers for the output message
+		headers {
+			header('contentType': 'application/json')
+		}
+		// the body of the output message
+		body(
+				orderId: value(
+						consumer('40058c70-891c-4176-a033-f70bad0c5f77'),
+						producer(regex('([0-9|a-f]*-*)*'))),
+				description: "This is the order description"
+		)
+	}
+}

spring-cloud-contract-verifier-gradle-plugin/build.gradle

@@ -28,7 +28,7 @@ project.version = findProperty('contractVerifierVersion') ?: '1.0.0.BUILD-SNAPSH
 apply from: "$rootDir/gradle/release.gradle"
 apply plugin: 'groovy'
 
-group = 'org.springframework.cloud.contract'
+group = 'org.springframework.cloud'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -58,13 +58,13 @@ configurations {
 dependencies {
 	compile gradleApi()
 	compile localGroovy()
-	compile("org.springframework.cloud.contract:spring-cloud-contract-verifier-core:${project.version}") {
+	compile("org.springframework.cloud:spring-cloud-contract-verifier-core:${project.version}") {
 		exclude(group: 'org.codehaus.groovy')
 	}
-	compile("org.springframework.cloud.contract:spring-cloud-contract-verifier-converters:${project.version}") {
+	compile("org.springframework.cloud:spring-cloud-contract-verifier-converters:${project.version}") {
 		exclude(group: 'org.codehaus.groovy')
 	}
-	compile("org.springframework.cloud.contract:spring-cloud-contract-stub-runner:${project.version}") {
+	compile("org.springframework.cloud:spring-cloud-contract-stub-runner:${project.version}") {
 		exclude(group: 'org.codehaus.groovy')
 	}
 	testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
@@ -73,7 +73,7 @@ dependencies {
 	testCompile 'info.solidsoft.spock:spock-global-unroll:0.5.0'
 	testCompile gradleTestKit()
 
-	messagingLibs("org.springframework.cloud.contract:spring-cloud-contract-verifier-integration:${project.version}") {
+	messagingLibs("org.springframework.cloud:spring-cloud-contract-verifier-integration:${project.version}") {
 		exclude(group: 'org.codehaus.groovy')
 	}
 }

spring-cloud-contract-verifier-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -257,17 +257,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-core</artifactId>
 			<version>${spring.cloud.contract.verifier.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-converters</artifactId>
 			<version>${spring.cloud.contract.verifier.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner</artifactId>
 			<version>${spring.cloud.contract.verifier.version}</version>
 		</dependency>

spring-cloud-contract-verifier-maven-plugin/src/main/resources/META-INF/plexus/components.xml

@@ -30,13 +30,13 @@
 				</phases>
 				<default-phases>
 					<process-test-resources>
-						org.springframework.cloud.contract:spring-cloud-contract-verifier-maven-plugin:${project.version}:convert
+						org.springframework.cloud:spring-cloud-contract-verifier-maven-plugin:${project.version}:convert
 					</process-test-resources>
 					<generate-test-sources>
-						org.springframework.cloud.contract:spring-cloud-contract-verifier-maven-plugin:${project.version}:generateTests
+						org.springframework.cloud:spring-cloud-contract-verifier-maven-plugin:${project.version}:generateTests
 					</generate-test-sources>
 					<package>
-						org.springframework.cloud.contract:spring-cloud-contract-verifier-maven-plugin:${project.version}:generateStubs
+						org.springframework.cloud:spring-cloud-contract-verifier-maven-plugin:${project.version}:generateStubs
 					</package>
 				</default-phases>
 			</configuration>

spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/usage.adoc

@@ -2,7 +2,7 @@
 
 == Converting Spring Cloud Contract DSL into WireMock stub mappings
 
-   mvn org.springframework.cloud.contract:spring-cloud-contract-verifier-maven-plugin:convert
+   mvn org.springramework.cloud:spring-cloud-contract-verifier-maven-plugin:convert
 
 or shortly footnoteref:[prefix,Additional configuration inside `~/.m2/settings.xml` is required: `<pluginGroups><pluginGroup>io.codearte.Spring Cloud Contract</pluginGroup></pluginGroups>`.]
 
@@ -14,7 +14,7 @@ For more information please go to the Spring Cloud Contract Wiki or Plugin Docum
 
 Run stubs mappings from current directory:
 
-    mvn org.springframework.cloud.contract:spring-cloud-contract-verifier-maven-plugin:run
+    mvn org.springramework.cloud:spring-cloud-contract-verifier-maven-plugin:run
 
 or shortly footnoteref:[prefix]
 

spring-cloud-contract-verifier-maven-plugin/src/test/java/org/springframework/cloud/contract/verifier/maven/PluginIT.java

@@ -104,7 +104,7 @@ public class PluginIT {
 		properties.getPluginVersion();
 		maven.forProject(basedir)
 				.withCliOption("-X")
-				.execute(String.format("org.springframework.cloud.contract:spring-cloud-contract-verifier-maven-plugin:%s:convert",
+				.execute(String.format("org.springframework.cloud:spring-cloud-contract-verifier-maven-plugin:%s:convert",
 						properties.getPluginVersion()))
 				.assertLogText("Converting from Spring Cloud Contract Verifier contracts to WireMock stubs mappings")
 				.assertLogText("Creating new json")

spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/pom.xml

@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.cloud.contract.verifier.sample</groupId>
+	<groupId>org.springframework.cloud.verifier.sample</groupId>
 	<artifactId>sample-project</artifactId>
 	<version>0.1</version>
 
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
 			</plugin>
 		</plugins>

spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/pom.xml

@@ -88,7 +88,7 @@
             </plugin>
             <!-- tag::plugin[] -->
             <plugin>
-                <groupId>org.springframework.cloud.contract</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
                 <version>${accurest-plugin.version}</version>
                 <executions>

spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/pom.xml

@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.cloud.contract.verifier.sample</groupId>
+	<groupId>org.springframework.cloud.verifier.sample</groupId>
 	<artifactId>sample-project</artifactId>
 	<version>0.1</version>
 
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
 			</plugin>
 		</plugins>

spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/pom.xml

@@ -88,7 +88,7 @@
             </plugin>
             <!-- tag::plugin[] -->
             <plugin>
-                <groupId>org.springframework.cloud.contract</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
                 <version>${accurest-plugin.version}</version>
                 <extensions>true</extensions>

spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml

@@ -83,7 +83,7 @@
             </plugin>
             <!-- tag::plugin[] -->
             <plugin>
-                <groupId>org.springframework.cloud.contract</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
                 <version>${accurest-plugin.version}</version>
                 <executions>

spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/pom.xml

@@ -88,7 +88,7 @@
             </plugin>
             <!-- tag::plugin[] -->
             <plugin>
-                <groupId>org.springframework.cloud.contract</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
                 <version>${accurest-plugin.version}</version>
                 <executions>

spring-cloud-contract-verifier-maven-plugin/src/test/projects/withStubs/pom.xml

@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.cloud.contract.verifier.sample</groupId>
+	<groupId>org.springframework.cloud.verifier.sample</groupId>
 	<artifactId>sample-project</artifactId>
 	<version>0.1</version>
 
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.springframework.cloud.contract</groupId>
+				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
 			</plugin>
 		</plugins>

spring-cloud-contract-verifier/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>

spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-verifier</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -15,7 +15,7 @@
 	<properties><java.version>1.8</java.version></properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-core</artifactId>
 		</dependency>
 		<dependency>
@@ -45,6 +45,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-verifier</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,11 +14,11 @@
 	<description>Spring Cloud Contract Verifier Core</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-spec</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-testing-utils</artifactId>
 		</dependency>
 		<dependency>

spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-verifier</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>

spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-verifier-messaging</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Verifier Camel</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-messaging-core</artifactId>
 		</dependency>
 		<dependency>

spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-verifier-messaging</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Verifier Integration</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-messaging-core</artifactId>
 		</dependency>
 		<dependency>

spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-verifier-messaging</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>

spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-verifier-messaging</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -14,7 +14,7 @@
 	<description>Spring Cloud Contract Verifier Messaging Stream</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud.contract</groupId>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-messaging-core</artifactId>
 		</dependency>
 		<dependency>

spring-cloud-contract-verifier/spring-cloud-contract-verifier-testing-utils/pom.xml

@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-verifier</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>

spring-cloud-contract-wiremock/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.cloud.contract</groupId>
+		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>