Move plugins in to tools folder

Also rename plugins removing 'verifer'.

README.adoc

@@ -245,8 +245,8 @@ Here you can find the Spring Cloud Contract folder structure
 ├── spring-cloud-contract-spec
 ├── spring-cloud-contract-stub-runner
 ├── spring-cloud-contract-verifier
-├── spring-cloud-contract-verifier-gradle-plugin
-├── spring-cloud-contract-verifier-maven-plugin
+├── spring-cloud-contract-gradle-plugin
+├── spring-cloud-contract-maven-plugin
 └── spring-cloud-contract-verifier-standalone-test-samples
 ```
 
@@ -255,8 +255,8 @@ Here you can find the Spring Cloud Contract folder structure
  - `spring-cloud-contract-spec` - contains specification modules (contains concept of a Contract)
  - `spring-cloud-contract-stub-runner` - contains Stub Runner related modules
  - `spring-cloud-contract-verifier` - core of the `Spring Cloud Contract Verifier` functionality
- - `spring-cloud-contract-verifier-gradle-plugin` - Gradle plugin for `Spring Cloud Contract Verifier`
- - `spring-cloud-contract-verifier-maven-plugin` - Maven plugin for `Spring Cloud Contract Verifier`
+ - `spring-cloud-contract-gradle-plugin` - Gradle plugin for `Spring Cloud Contract Verifier`
+ - `spring-cloud-contract-maven-plugin` - Maven plugin for `Spring Cloud Contract Verifier`
  - `spring-cloud-contract-verifier-standalone-test-samples` - standalone test sample that use `Spring Cloud Contract Verifier`
 
 === Commands
@@ -270,7 +270,7 @@ To build the core functionality together with Maven Plugin you can run
 To build the Gradle Plugin
 
 ```
-cd spring-cloud-contract-verifier-gradle-plugin
+cd spring-cloud-contract-gradle-plugin
 ./gradlew clean build
 ```
 

docs/src/main/asciidoc/building.adoc

@@ -10,8 +10,8 @@ Here you can find the Spring Cloud Contract folder structure
 ├── spring-cloud-contract-spec
 ├── spring-cloud-contract-stub-runner
 ├── spring-cloud-contract-verifier
-├── spring-cloud-contract-verifier-gradle-plugin
-├── spring-cloud-contract-verifier-maven-plugin
+├── spring-cloud-contract-gradle-plugin
+├── spring-cloud-contract-maven-plugin
 └── spring-cloud-contract-verifier-standalone-test-samples
 ```
 
@@ -20,8 +20,8 @@ Here you can find the Spring Cloud Contract folder structure
  - `spring-cloud-contract-spec` - contains specification modules (contains concept of a Contract)
  - `spring-cloud-contract-stub-runner` - contains Stub Runner related modules
  - `spring-cloud-contract-verifier` - core of the `Spring Cloud Contract Verifier` functionality
- - `spring-cloud-contract-verifier-gradle-plugin` - Gradle plugin for `Spring Cloud Contract Verifier`
- - `spring-cloud-contract-verifier-maven-plugin` - Maven plugin for `Spring Cloud Contract Verifier`
+ - `spring-cloud-contract-gradle-plugin` - Gradle plugin for `Spring Cloud Contract Verifier`
+ - `spring-cloud-contract-maven-plugin` - Maven plugin for `Spring Cloud Contract Verifier`
  - `spring-cloud-contract-verifier-standalone-test-samples` - standalone test sample that use `Spring Cloud Contract Verifier`
 
 === Commands
@@ -35,7 +35,7 @@ To build the core functionality together with Maven Plugin you can run
 To build the Gradle Plugin
 
 ```
-cd spring-cloud-contract-verifier-gradle-plugin
+cd spring-cloud-contract-gradle-plugin
 ./gradlew clean build
 ```
 

docs/src/main/asciidoc/contract.adoc

@@ -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: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-maven-plugin:convert`.
 
 === Limitations
 
@@ -158,7 +158,7 @@ include::{verifier_core_path}/src/test/groovy/org/springframework/cloud/contract
 
 [source,groovy,indent=0]
 ----
-include::{core_path}/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy[tags=base_class,indent=0]
+include::{core_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy[tags=base_class,indent=0]
 ----
 
 === JAX-RS support

docs/src/main/asciidoc/messaging.adoc

@@ -142,7 +142,7 @@ Example of Spring Cloud Contract Verifier Gradle setup:
 
 [source,groovy,indent=0]
 ----
-include::{core_path}/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle[tags=jar_setup,indent=0]
+include::{core_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle[tags=jar_setup,indent=0]
 ----
 
 ==== Maven Setup

docs/src/main/asciidoc/rest.adoc

@@ -19,7 +19,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'org.springframework.cloud:spring-cloud-contract-verifier-gradle-plugin:${verifier_version}'
+		classpath 'org.springframework.cloud:spring-cloud-contract-gradle-plugin:${verifier_version}'
 	}
 }
 
@@ -52,7 +52,7 @@ repositories {
 ----
 <plugin>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
+    <artifactId>spring-cloud-contract-maven-plugin</artifactId>
     <executions>
         <execution>
             <goals>
@@ -66,7 +66,7 @@ repositories {
 ----
 
 
-Read more: https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract-verifier-maven-plugin/[spring-cloud-contract-verifier-maven-plugin]
+Read more: https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract-maven-plugin/[spring-cloud-contract-maven-plugin]
 
 ===== Add stubs
 
@@ -166,7 +166,7 @@ When using Spring Cloud Contract Verifier in default MockMvc you need to create
 
 [source,groovy,indent=0]
 ----
-include::{core_path}/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy[tags=base_class,indent=0]
+include::{core_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy[tags=base_class,indent=0]
 ----
 
 In case of using `Explicit` mode, you can use base class to initialize the whole tested app similarly as in regular integration tests. In case of `JAXRSCLIENT` mode this base class
@@ -230,7 +230,7 @@ Underneath LoanApplication makes a call to FraudDetection service. This request
 ----
 <plugin>
     <groupId>org.springframework.cloud.verifier</groupId>
-    <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
+    <artifactId>spring-cloud-contract-maven-plugin</artifactId>
     <executions>
         <execution>
             <goals>
@@ -243,7 +243,7 @@ Underneath LoanApplication makes a call to FraudDetection service. This request
 </plugin>
 ----
 
-Read more: https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract-verifier-maven-plugin/[spring-cloud-contract-verifier-maven-plugin]
+Read more: https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract-maven-plugin/[spring-cloud-contract-maven-plugin]
 
 ==== Add stubs
 
@@ -274,7 +274,7 @@ To change default configuration just add `configuration` section to plugin defin
 ----
 <plugin>
     <groupId>org.springframework.cloud.verifier</groupId>
-    <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
+    <artifactId>spring-cloud-contract-maven-plugin</artifactId>
     <executions>
         <execution>
             <goals>
@@ -300,7 +300,7 @@ To change default configuration just add `configuration` section to plugin defin
  - **contractsDir** - directory containing contracts written using the GroovyDSL. By default `/src/test/resources/contracts`.
  - **testFramework** - the target test framework to be used; currently Spock and JUnit are supported with Spock being the default framework
 
-For complete information take a look at https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract-verifier-maven-plugin/plugin-info.html[Plugin Documentation]
+For complete information take a look at https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract-maven-plugin/plugin-info.html[Plugin Documentation]
 
 ===== Base class for tests
 
@@ -373,7 +373,7 @@ Sample configuration:
 ----
 <plugin>
     <groupId>org.springframework.cloud.verifier</groupId>
-    <artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
+    <artifactId>spring-cloud-contract-maven-plugin</artifactId>
     <version>${verifier-plugin.version}</version>
     <executions>
         <execution>

docs/src/main/asciidoc/stubrunner.adoc

@@ -32,7 +32,7 @@ Example of Spring Cloud Contract Verifier Gradle setup:
 
 [source,groovy,indent=0]
 ----
-include::{core_path}/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle[tags=jar_setup,indent=0]
+include::{core_path}/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle[tags=jar_setup,indent=0]
 ----
 
 ==== Maven

pom.xml

@@ -35,7 +35,7 @@
 		<module>spring-cloud-contract-verifier</module>
 		<module>spring-cloud-contract-spec</module>
 		<module>spring-cloud-contract-stub-runner</module>
-		<module>spring-cloud-contract-verifier-maven-plugin</module>
+		<module>spring-cloud-contract-tools</module>
 		<module>samples</module>
 	</modules>
 

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

@@ -9,7 +9,7 @@ buildscript {
 	}
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT"
-		classpath "org.springframework.cloud:spring-cloud-contract-verifier-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
+		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
 
@@ -27,7 +27,7 @@ repositories {
 
 apply plugin: 'groovy'
 apply plugin: 'spring-boot'
-apply plugin: 'contract-verifier'
+apply plugin: 'spring-cloud-contract'
 apply plugin: 'maven-publish'
 
 dependencyManagement {

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

@@ -82,7 +82,7 @@
 			</plugin>
 			<plugin>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
+				<artifactId>spring-cloud-contract-maven-plugin</artifactId>
 				<version>${spring-cloud-contract.version}</version>
 				<extensions>true</extensions>
 				<configuration>
@@ -117,7 +117,7 @@
 								<pluginExecution>
 									<pluginExecutionFilter>
 										<groupId>org.springframework.cloud</groupId>
-										<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
+										<artifactId>spring-cloud-contract-maven-plugin</artifactId>
 										<versionRange>[1.0.0.BUILD-SNAPSHOT,)</versionRange>
 										<goals>
 											<goal>convert</goal>

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:spring-cloud-contract-verifier-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
+		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
 
@@ -29,7 +29,7 @@ repositories {
 
 apply plugin: 'groovy'
 apply plugin: 'spring-boot'
-apply plugin: 'contract-verifier'
+apply plugin: 'spring-cloud-contract'
 apply plugin: 'maven-publish'
 
 dependencyManagement {

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

@@ -77,7 +77,7 @@
 			</plugin>
 			<plugin>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
+				<artifactId>spring-cloud-contract-maven-plugin</artifactId>
 				<version>${spring-cloud-contract.version}</version>
 				<extensions>true</extensions>
 				<configuration>
@@ -112,7 +112,7 @@
 								<pluginExecution>
 									<pluginExecutionFilter>
 										<groupId>org.springframework.cloud</groupId>
-										<artifactId>spring-cloud-contract-verifier-maven-plugin</artifactId>
+										<artifactId>spring-cloud-contract-maven-plugin</artifactId>
 										<versionRange>[1.0.0.BUILD-SNAPSHOT,)</versionRange>
 										<goals>
 											<goal>convert</goal>

scripts/build.sh

@@ -16,4 +16,4 @@ echo "Building Maven stuff with additional opts [$ADDITIONAL_MAVEN_OPTS]"
 ./mvnw clean org.jacoco:jacoco-maven-plugin:prepare-agent install -Psonar --batch-mode $ADDITIONAL_MAVEN_OPTS
 
 echo "Building Gradle plugin"
-(cd *-gradle-plugin; ./gradlew clean build install jacocoTestReport)
+(cd */*-gradle-plugin; ./gradlew clean build install jacocoTestReport)

scripts/downloadDependencies.sh

@@ -11,6 +11,6 @@ if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
 fi
 
 ./mvnw -s .settings.xml --fail-never dependency:go-offline || true
-cd $ROOT_FOLDER/spring-cloud-contact-verifier-gradle-plugin && ./gradlew resolveDependencies || true
+cd $ROOT_FOLDER/spring-cloud-contact-gradle-plugin && ./gradlew resolveDependencies || true
 cd $ROOT_FOLDER/samples/samples-standalone && ./mvnw --fail-never dependency:go-offline || true
 cd $ROOT_FOLDER/samples/samples-standalone && ./downloadGradleDeps.sh

scripts/generateDocs.sh

@@ -14,7 +14,7 @@ echo "Building main docs"
 ./mvnw clean install -P docs -DskipTests=true --pl docs
 
 echo "Building maven plugin docs"
-./mvnw site site:stage -DskipTests=true --pl spring-cloud-contract-verifier-maven-plugin
+./mvnw site site:stage -DskipTests=true --pl spring-cloud-contract-maven-plugin
 
 echo "Copying generated maven plugin docs to main docs"
-cp -r spring-cloud-contract-verifier-maven-plugin/target/site docs/target/generated-docs/spring-cloud-contract-verifier-maven-plugin
+cp -r spring-cloud-contract-maven-plugin/target/site docs/target/generated-docs/spring-cloud-contract-maven-plugin

spring-cloud-contract-tools/pom.xml

@@ -0,0 +1,24 @@
+<?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-parent</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<artifactId>spring-cloud-contract-tools</artifactId>
+	<packaging>pom</packaging>
+
+	<name>Spring Cloud Contract Tools</name>
+	<description>Spring Cloud Contract Tools</description>
+
+	<modules>
+		<module>spring-cloud-contract-maven-plugin</module>
+	</modules>
+
+</project>

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

@@ -19,7 +19,7 @@ ext {
 	contractVerifierGradlePluginLibsDir ="$buildDir/contractVerifier-gradle-plugin-libs"
 	messagingLibsDir ="$buildDir/messaging-libs"
 	testSystemProperties = [
-			'contract-verifier-gradle-plugin-libs-dir': contractVerifierGradlePluginLibsDir,
+			'contract-gradle-plugin-libs-dir': contractVerifierGradlePluginLibsDir,
 			'messaging-libs-dir': messagingLibsDir
 	]
 }

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/orphan.gradle

@@ -1,11 +1,11 @@
 // orphaned from the main build when this project moved
-project(":$verifier-root:$verifier-gradle-plugin") {
+project(":$verifier-root:$gradle-plugin") {
 
 	ext.messagingLibsDir ="$buildDir/messaging-libs"
 	ext.contractVerifierGradlePluginLibsDir ="$buildDir/contractVerifier-gradle-plugin-libs"
 
 	ext.testSystemProperties = [
-			'contract-verifier-gradle-plugin-libs-dir': contractVerifierGradlePluginLibsDir,
+			'contract-gradle-plugin-libs-dir': contractVerifierGradlePluginLibsDir,
 			'messaging-libs-dir': messagingLibsDir
 	]
 
@@ -30,7 +30,7 @@ project(":$verifier-root:$verifier-gradle-plugin") {
 		messagingLibs project(":$verifier-root:$verifier-testing-utils")
 		messagingLibs 'org.codehaus.groovy:groovy-all:2.4.5'
 
-		contractVerifierGradlePluginLibs project(":$verifier-root:$verifier-gradle-plugin")
+		contractVerifierGradlePluginLibs project(":$verifier-root:$gradle-plugin")
 	}
 
 	test {
@@ -49,7 +49,7 @@ project(":$verifier-root:$verifier-gradle-plugin") {
 
 	// archive task needs to have jars ready
 	archiveMessagingLibsDependencies.dependsOn project(":$verifier-root:$verifier-messaging-root:$verifier-integration").tasks.jar
-	archiveContractVerifierGradlePluginLibsDependencies.dependsOn project(":$verifier-root:$verifier-gradle-plugin").tasks.jar
+	archiveContractVerifierGradlePluginLibsDependencies.dependsOn project(":$verifier-root:$gradle-plugin").tasks.jar
 
 	test.dependsOn archiveMessagingLibsDependencies, archiveContractVerifierGradlePluginLibsDependencies
 

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy

@@ -48,7 +48,7 @@ abstract class ContractVerifierIntegrationSpec extends Specification {
 
 	protected void setupForProject(String projectRoot) {
 		copyResourcesToRoot(projectRoot)
-		String gradlePluginSysProp = System.getProperty("contract-verifier-gradle-plugin-libs-dir")
+		String gradlePluginSysProp = System.getProperty("contract-gradle-plugin-libs-dir")
 		String gradlePluginLibsDir = (gradlePluginSysProp ?: new File("build/").absolutePath.toString()).replace('\\', '\\\\')
 		String messagingLibDirProp = System.getProperty("messaging-libs-dir")
 		String messagingLibDir = (messagingLibDirProp ?: new File("build/").absolutePath.toString()).replace('\\', '\\\\')

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle

@@ -5,7 +5,7 @@ buildscript {
 }
 
 apply plugin: 'groovy'
-apply plugin: 'contract-verifier'
+apply plugin: 'spring-cloud-contract'
 apply plugin: 'maven-publish'
 
 group = 'org.springframework.cloud.testprojects'

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle

@@ -52,7 +52,7 @@ subprojects {
 
 configure([project(':fraudDetectionService'), project(':loanApplicationService')]) {
 	apply plugin: 'spring-boot'
-	apply plugin: 'contract-verifier'
+	apply plugin: 'spring-cloud-contract'
 	apply plugin: 'maven-publish'
 
 	ext {

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle

@@ -52,7 +52,7 @@ subprojects {
 
 configure([project(':fraudDetectionService'), project(':loanApplicationService')]) {
 	apply plugin: 'spring-boot'
-	apply plugin: 'contract-verifier'
+	apply plugin: 'spring-cloud-contract'
 	apply plugin: 'maven-publish'
 
 	ext {