diff --git a/docs/pom.xml b/docs/pom.xml
index fa80936250..39319c8d80 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -15,6 +15,7 @@
spring-cloud-contract
${basedir}/..
+ true
@@ -46,6 +47,49 @@
build-helper-maven-plugin
false
+
+ org.apache.maven.plugins
+ maven-site-plugin
+
+ ${main.basedir}/spring-cloud-contract-verifier-maven-plugin/src/site/
+ ${build.directory}/generated-docs/spring-cloud-contract-verifier-maven-plugin>
+ true
+
+ true
+ true
+ false
+ en
+ UTF-8
+ UTF-8
+
+
+
+ font
+ coderay
+ style
+ 2
+ true
+ true
+
+
+
+
+
+ generate-site
+ process-resources
+
+ site
+
+
+
+
+
+ org.asciidoctor
+ asciidoctor-maven-plugin
+ 1.5.3
+
+
+
diff --git a/spring-cloud-contract-verifier-maven-plugin/docs/pom.xml b/spring-cloud-contract-verifier-maven-plugin/docs/pom.xml
deleted file mode 100644
index 1c02de1ddb..0000000000
--- a/spring-cloud-contract-verifier-maven-plugin/docs/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
- 4.0.0
-
- org.springframework.cloud
- spring-cloud-build
- 1.1.1.RELEASE
-
-
-
- spring-cloud-contract-verifier-docs
- pom
- Spring Cloud Contract Verifier Docs
- Spring Contract Verifier Docs
- 1.0.0.BUILD-SNAPSHOT
-
- spring-cloud-contract-verifier-maven-plugin
- ${basedir}/..
-
-
-
- docs
-
-
-
- org.asciidoctor
- asciidoctor-maven-plugin
- 1.5.3
- false
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- false
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- false
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
-
-
-
diff --git a/spring-cloud-contract-verifier-maven-plugin/docs/src/main/asciidoc/README.adoc b/spring-cloud-contract-verifier-maven-plugin/docs/src/main/asciidoc/README.adoc
deleted file mode 100644
index ac49eb468b..0000000000
--- a/spring-cloud-contract-verifier-maven-plugin/docs/src/main/asciidoc/README.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-image::https://travis-ci.org/Codearte/accurest-maven-plugin.svg?branch=master[Build Status, link=https://travis-ci.org/Codearte/accurest-maven-plugin]
-image::https://img.shields.io/github/issues/Codearte/accurest/maven.svg[Github Issues, link=https://github.com/Codearte/accurest/labels/maven]
-
-//[](https://maven-badges.herokuapp.com/maven-central/io.codearte.accurest/accurest-maven-plugin)
-
-= Spring Cloud Contract Verifier Maven Plugin
-
-== Documentation
-
-* http://codearte.github.io/accurest/[Spring Cloud Contract Verifier Documentation]
-* http://codearte.github.io/accurest-maven-plugin/plugin-info.html[Spring Cloud Contract Verifier Maven Plugin Documentation Site]
-
-== Contributing
-
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
\ No newline at end of file
diff --git a/spring-cloud-contract-verifier-maven-plugin/docs/src/main/asciidoc/spring-cloud-contract-verifier-maven-plugin.adoc b/spring-cloud-contract-verifier-maven-plugin/docs/src/main/asciidoc/spring-cloud-contract-verifier-maven-plugin.adoc
deleted file mode 100644
index b2fd89ebfd..0000000000
--- a/spring-cloud-contract-verifier-maven-plugin/docs/src/main/asciidoc/spring-cloud-contract-verifier-maven-plugin.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-:root_folder: ../../../../spring-cloud-contract-verifier-maven-plugin
-
-include::{root_folder}/src/site/asciidoc/complex-content.adoc[]
\ No newline at end of file
diff --git a/spring-cloud-contract-verifier-maven-plugin/docs/src/main/ruby/generate_readme.sh b/spring-cloud-contract-verifier-maven-plugin/docs/src/main/ruby/generate_readme.sh
deleted file mode 100755
index 6d0ce9dc54..0000000000
--- a/spring-cloud-contract-verifier-maven-plugin/docs/src/main/ruby/generate_readme.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env ruby
-
-base_dir = File.join(File.dirname(__FILE__),'../../..')
-src_dir = File.join(base_dir, "/src/main/asciidoc")
-require 'asciidoctor'
-require 'optparse'
-
-options = {}
-file = "#{src_dir}/README.adoc"
-
-OptionParser.new do |o|
- o.on('-o OUTPUT_FILE', 'Output file (default is stdout)') { |file| options[:to_file] = file unless file=='-' }
- o.on('-h', '--help') { puts o; exit }
- o.parse!
-end
-
-file = ARGV[0] if ARGV.length>0
-
-# Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/scripts/asciidoc-coalescer.rb
-doc = Asciidoctor.load_file file, safe: :unsafe, header_only: true, attributes: options[:attributes]
-header_attr_names = (doc.instance_variable_get :@attributes_modified).to_a
-header_attr_names.each {|k| doc.attributes[%(#{k}!)] = '' unless doc.attr? k }
-attrs = doc.attributes
-attrs['allow-uri-read'] = true
-puts attrs
-
-out = "// Do not edit this file (e.g. go instead to src/main/asciidoc)\n\n"
-doc = Asciidoctor.load_file file, safe: :unsafe, parse: false, attributes: attrs
-out << doc.reader.read
-
-unless options[:to_file]
- puts out
-else
- File.open(options[:to_file],'w+') do |file|
- file.write(out)
- end
-end
diff --git a/spring-cloud-contract-verifier-maven-plugin/pom.xml b/spring-cloud-contract-verifier-maven-plugin/pom.xml
index 71477a6de0..334d6593c9 100644
--- a/spring-cloud-contract-verifier-maven-plugin/pom.xml
+++ b/spring-cloud-contract-verifier-maven-plugin/pom.xml
@@ -10,37 +10,446 @@
..
- spring-cloud-contract-verifier-maven-plugin-parent
- pom
+ spring-cloud-contract-verifier-maven-plugin
+ maven-plugin
+ 1.0.0.BUILD-SNAPSHOT
- Spring Cloud Contract Verifier Maven Plugin
- Spring Cloud Contract Verifier Maven Plugin Parent
+ Spring Cloud Contract Verifier Maven Plugin
+ Spring Cloud Contract Verifier Maven Plugin
+ https://github.com/spring-cloud/spring-cloud-contract
-
- docs
- spring-cloud-contract-verifier-maven-plugin
-
+
+ 3.2.5
+ 3.4
+
+ UTF-8
+ UTF-8
+
+ true
+
+ 1.0.0.BUILD-SNAPSHOT
+ 1.1.0
+
+ 1.7
+ 1.7
+
+
+ 2016
+
+
+
+ repo.spring.io
+ Spring Release Repository
+ https://repo.spring.io/plugins-release-local
+
+
+ repo.spring.io
+ Spring Snapshot Repository
+ https://repo.spring.io/plugins-snapshot-local
+
+
+ github
+ scm:git:git@github.com:spring-cloud/spring-cloud-contract.git
+
+
-
-
-
- org.codehaus.gmavenplus
- gmavenplus-plugin
- 1.5
-
-
-
- addSources
- addTestSources
- compile
- testCompile
-
-
-
-
-
-
+
+
+ org.codehaus.gmavenplus
+ gmavenplus-plugin
+
+
+
+ addSources
+ generateStubs
+ compile
+ removeStubs
+
+
+
+
+
+ org.codehaus.plexus
+ plexus-component-metadata
+
+
+
+ generate-metadata
+ generate-test-metadata
+
+
+
+
+
+ maven-plugin-plugin
+
+ true
+
+
+
+ generated-helpmojo
+
+ helpmojo
+
+
+
+ generate-descriptor
+
+ descriptor
+
+
+
+
+
+ io.takari.maven.plugins
+ takari-lifecycle-plugin
+ true
+
+
+ testProperties
+ process-test-resources
+
+ testProperties
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+ com.mycila
+ license-maven-plugin
+
+
+
+ src/**
+
+
+ **/.idea/**
+ **/*.adoc
+
+ true
+ true
+
+ ${project.inceptionYear}
+ Pivotal
+
+ UTF-8
+
+
+
+
+ check
+
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+
+
+ **/HelpMojo.class
+
+
+
+
+ prepare-agent
+
+ prepare-agent
+
+
+
+
+
+ org.eluder.coveralls
+ coveralls-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+
+ true
+
+ true
+ true
+ false
+ en
+ UTF-8
+ UTF-8
+
+
+
+ font
+ coderay
+ style
+ 2
+
+
+
+
+
+ org.asciidoctor
+ asciidoctor-maven-plugin
+ 1.5.3
+
+
+
+
+
+
+ org.springframework.cloud.contract
+ spring-cloud-contract-verifier-core
+ ${spring.cloud.contract.verifier.version}
+
+
+ org.springframework.cloud.contract
+ spring-cloud-contract-verifier-converters
+ ${spring.cloud.contract.verifier.version}
+
+
+ org.springframework.cloud.contract
+ spring-cloud-contract-stub-runner
+ ${spring.cloud.contract.verifier.version}
+
+
+
+ org.eclipse.aether
+ aether-api
+ ${aether.version}
+ provided
+
+
+
+ org.apache.maven.shared
+ maven-filtering
+ 3.1.0
+
+
+
+ ch.qos.logback
+ logback-core
+ 1.1.3
+
+
+ org.slf4j
+ slf4j-simple
+ 1.7.12
+ test
+
+
+
+ javax.inject
+ javax.inject
+ 1
+ provided
+
+
+ org.apache.maven
+ maven-core
+ ${maven.version}
+ provided
+
+
+
+ org.apache.maven
+ maven-plugin-api
+ ${maven.version}
+ provided
+
+
+ org.apache.maven
+ maven-model
+
+
+ org.apache.maven
+ maven-artifact
+
+
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
+
+
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ ${maven.plugin.plugin.version}
+ provided
+
+
+
+ org.apache.maven
+ maven-archiver
+ 3.0.0
+
+
+ org.codehaus.plexus
+ plexus-archiver
+ 3.1
+
+
+
+ io.takari.maven.plugins
+ takari-plugin-testing
+ 2.9.0
+ test
+
+
+ io.takari.maven.plugins
+ takari-plugin-integration-testing
+ 2.9.0
+ pom
+ test
+
+
+ org.apache.maven
+ maven-compat
+ ${maven.version}
+ test
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+ org.assertj
+ assertj-core
+ 2.4.0
+ test
+
+
+
+
+
+
+ release
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.6
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 3.0.0
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.10.3
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+
+
+
+ spring
+
+ true
+
+
+
+ spring-snapshots
+ Spring Snapshots
+ http://repo.spring.io/libs-snapshot-local
+
+ true
+
+
+
+ spring-milestones
+ Spring Milestones
+ http://repo.spring.io/libs-milestone-local
+
+ false
+
+
+
+ spring-releases
+ Spring Releases
+ http://repo.spring.io/release
+
+ false
+
+
+
+
+
+ spring-snapshots
+ Spring Snapshots
+ http://repo.spring.io/libs-snapshot-local
+
+ true
+
+
+
+ spring-milestones
+ Spring Milestones
+ http://repo.spring.io/libs-milestone-local
+
+ false
+
+
+
+ spring-plugin-snapshots
+ Spring Snapshots
+ http://repo.spring.io/plugins-snapshot-local
+
+ true
+
+
+
+ spring-plugin-milestones
+ Spring Milestones
+ http://repo.spring.io/plugins-milestone-local
+
+ false
+
+
+
+
+
+
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/pom.xml b/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/pom.xml
deleted file mode 100644
index 5419775ec1..0000000000
--- a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/pom.xml
+++ /dev/null
@@ -1,473 +0,0 @@
-
-
- 4.0.0
-
- org.springframework.cloud.contract
- spring-cloud-contract-verifier-maven-plugin
- maven-plugin
- 1.0.0.BUILD-SNAPSHOT
-
- Spring Cloud Contract Verifier Maven Plugin
- Spring Cloud Contract Verifier Maven Plugin
- https://github.com/spring-cloud/spring-cloud-contract
-
-
- 3.2.5
- 3.4
-
- UTF-8
- UTF-8
-
- 1.0.0.BUILD-SNAPSHOT
- 1.1.0
-
- 1.7
- 1.7
-
-
- 2016
-
-
-
- repo.spring.io
- Spring Release Repository
- https://repo.spring.io/plugins-release-local
-
-
- repo.spring.io
- Spring Snapshot Repository
- https://repo.spring.io/plugins-snapshot-local
-
-
- github
- scm:git:git@github.com:spring-cloud/spring-cloud-contract.git
-
-
-
-
-
-
- org.codehaus.gmavenplus
- gmavenplus-plugin
-
-
-
- addSources
- generateStubs
- compile
- removeStubs
-
-
-
-
-
- org.codehaus.plexus
- plexus-component-metadata
-
-
-
- generate-metadata
- generate-test-metadata
-
-
-
-
-
- maven-plugin-plugin
-
- true
-
-
-
- generated-helpmojo
-
- helpmojo
-
-
-
- generate-descriptor
-
- descriptor
-
-
-
-
-
- io.takari.maven.plugins
- takari-lifecycle-plugin
- true
-
-
- testProperties
- process-test-resources
-
- testProperties
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
-
- integration-test
- verify
-
-
-
-
-
- com.mycila
- license-maven-plugin
-
-
-
- src/**
-
-
- **/.idea/**
- **/*.adoc
-
- true
- true
-
- ${project.inceptionYear}
- Pivotal
-
- UTF-8
-
-
-
-
- check
-
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
-
-
- **/HelpMojo.class
-
-
-
-
- prepare-agent
-
- prepare-agent
-
-
-
-
-
- org.eluder.coveralls
- coveralls-maven-plugin
-
-
- org.apache.maven.plugins
- maven-release-plugin
-
- false
- true
- v@{project.version}
-
-
-
- org.apache.maven.plugins
- maven-scm-publish-plugin
-
- ${project.scm.developerConnection}
- gh-pages
- ${project.reporting.outputDirectory}
-
-
-
- scm-publish
- site-deploy
-
- publish-scm
-
-
-
-
-
- org.apache.maven.plugins
- maven-site-plugin
-
- true
-
- true
- true
- false
- en
- UTF-8
- UTF-8
-
-
-
- font
- coderay
- style
- 2
-
-
-
-
-
- org.asciidoctor
- asciidoctor-maven-plugin
- 1.5.3
-
-
-
-
-
-
-
-
- org.springframework.cloud.contract
- spring-cloud-contract-verifier-core
- ${spring.cloud.contract.verifier.version}
-
-
- org.springframework.cloud.contract
- spring-cloud-contract-verifier-converters
- ${spring.cloud.contract.verifier.version}
-
-
- org.springframework.cloud.contract
- spring-cloud-contract-stub-runner
- ${spring.cloud.contract.verifier.version}
-
-
-
- org.eclipse.aether
- aether-api
- ${aether.version}
- provided
-
-
-
- org.apache.maven.shared
- maven-filtering
- 3.1.0
-
-
-
- ch.qos.logback
- logback-core
- 1.1.3
-
-
- org.slf4j
- slf4j-simple
- 1.7.12
- test
-
-
-
- javax.inject
- javax.inject
- 1
- provided
-
-
- org.apache.maven
- maven-core
- ${maven.version}
- provided
-
-
-
- org.apache.maven
- maven-plugin-api
- ${maven.version}
- provided
-
-
- org.apache.maven
- maven-model
-
-
- org.apache.maven
- maven-artifact
-
-
- org.eclipse.sisu
- org.eclipse.sisu.plexus
-
-
-
-
- org.apache.maven.plugin-tools
- maven-plugin-annotations
- ${maven.plugin.plugin.version}
- provided
-
-
-
- org.apache.maven
- maven-archiver
- 3.0.0
-
-
- org.codehaus.plexus
- plexus-archiver
- 3.1
-
-
-
- io.takari.maven.plugins
- takari-plugin-testing
- 2.9.0
- test
-
-
- io.takari.maven.plugins
- takari-plugin-integration-testing
- 2.9.0
- pom
- test
-
-
- org.apache.maven
- maven-compat
- ${maven.version}
- test
-
-
- junit
- junit
- 4.12
- test
-
-
- org.assertj
- assertj-core
- 2.4.0
- test
-
-
-
-
-
-
- release
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.6
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 3.0.0
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 2.10.3
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
-
-
-
- spring
-
- true
-
-
-
- spring-snapshots
- Spring Snapshots
- http://repo.spring.io/libs-snapshot-local
-
- true
-
-
-
- spring-milestones
- Spring Milestones
- http://repo.spring.io/libs-milestone-local
-
- false
-
-
-
- spring-releases
- Spring Releases
- http://repo.spring.io/release
-
- false
-
-
-
-
-
- spring-snapshots
- Spring Snapshots
- http://repo.spring.io/libs-snapshot-local
-
- true
-
-
-
- spring-milestones
- Spring Milestones
- http://repo.spring.io/libs-milestone-local
-
- false
-
-
-
- spring-plugin-snapshots
- Spring Snapshots
- http://repo.spring.io/plugins-snapshot-local
-
- true
-
-
-
- spring-plugin-milestones
- Spring Milestones
- http://repo.spring.io/plugins-milestone-local
-
- false
-
-
-
-
-
-
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex.adoc b/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex.adoc
deleted file mode 100644
index e29ea2b549..0000000000
--- a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-:root_folder: ../../..
-
-include::complex.adoc[]
\ No newline at end of file
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/contracts/Sample.groovy b/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/contracts/Sample.groovy
deleted file mode 100644
index fb8ef5908e..0000000000
--- a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/contracts/Sample.groovy
+++ /dev/null
@@ -1,18 +0,0 @@
-org.springframework.cloud.contract.spec.Contract.make {
- request {
- method 'POST'
- url('/users') {
-
- }
- headers {
- header 'Content-Type': 'application/json'
- }
- body '''{ "login" : "john", "name": "John The Contract" }'''
- }
- response {
- status 200
- headers {
- header 'Location': '/users/john'
- }
- }
-}
\ No newline at end of file
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/mappings/Sample.json b/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/mappings/Sample.json
deleted file mode 100644
index 6641a7d26f..0000000000
--- a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/mappings/Sample.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "request" : {
- "url" : "/users",
- "method" : "POST",
- "bodyPatterns" : [ {
- "matchesJsonPath" : "$[?(@.login == 'john')]"
- }, {
- "matchesJsonPath" : "$[?(@.name == 'John The Contract')]"
- } ],
- "headers" : {
- "Content-Type" : {
- "equalTo" : "application/json"
- }
- }
- },
- "response" : {
- "status" : 200,
- "headers" : {
- "Location" : "/users/john"
- }
- }
-}
\ No newline at end of file
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/etc/header.txt b/spring-cloud-contract-verifier-maven-plugin/src/etc/header.txt
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/etc/header.txt
rename to spring-cloud-contract-verifier-maven-plugin/src/etc/header.txt
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/CopyContracts.groovy b/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/CopyContracts.groovy
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/CopyContracts.groovy
rename to spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/CopyContracts.groovy
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/ManifestCreator.groovy b/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/ManifestCreator.groovy
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/ManifestCreator.groovy
rename to spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/ManifestCreator.groovy
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/AetherStubDownloaderFactory.groovy b/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/AetherStubDownloaderFactory.groovy
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/AetherStubDownloaderFactory.groovy
rename to spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/AetherStubDownloaderFactory.groovy
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/LocalStubRunner.groovy b/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/LocalStubRunner.groovy
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/LocalStubRunner.groovy
rename to spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/LocalStubRunner.groovy
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/RemoteStubRunner.groovy b/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/RemoteStubRunner.groovy
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/RemoteStubRunner.groovy
rename to spring-cloud-contract-verifier-maven-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/maven/stubrunner/RemoteStubRunner.groovy
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/ConvertMojo.java b/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/ConvertMojo.java
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/ConvertMojo.java
rename to spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/ConvertMojo.java
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateStubsMojo.java b/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateStubsMojo.java
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateStubsMojo.java
rename to spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateStubsMojo.java
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateTestsMojo.java b/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateTestsMojo.java
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateTestsMojo.java
rename to spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateTestsMojo.java
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/RunMojo.java b/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/RunMojo.java
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/RunMojo.java
rename to spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/RunMojo.java
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/spring-cloud-contract-verifier-maven-plugin/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/main/resources/META-INF/plexus/components.xml
rename to spring-cloud-contract-verifier-maven-plugin/src/main/resources/META-INF/plexus/components.xml
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex-content.adoc b/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex-content.adoc
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex-content.adoc
rename to spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex-content.adoc
diff --git a/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex.adoc b/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex.adoc
new file mode 100644
index 0000000000..7da39099d4
--- /dev/null
+++ b/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/complex.adoc
@@ -0,0 +1,3 @@
+:root_folder: ../../..
+
+include::complex-content.adoc[]
\ No newline at end of file
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/index.adoc b/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/index.adoc
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/index.adoc
rename to spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/index.adoc
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/junit.adoc b/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/junit.adoc
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/junit.adoc
rename to spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/junit.adoc
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/spock.adoc b/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/spock.adoc
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/spock.adoc
rename to spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/spock.adoc
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/usage.adoc b/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/usage.adoc
similarity index 100%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/usage.adoc
rename to spring-cloud-contract-verifier-maven-plugin/src/site/asciidoc/usage.adoc
diff --git a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/site.xml b/spring-cloud-contract-verifier-maven-plugin/src/site/site.xml
similarity index 91%
rename from spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/site.xml
rename to spring-cloud-contract-verifier-maven-plugin/src/site/site.xml
index f2b1e347e5..83840f3433 100644
--- a/spring-cloud-contract-verifier-maven-plugin/spring-cloud-contract-verifier-maven-plugin/src/site/site.xml
+++ b/spring-cloud-contract-verifier-maven-plugin/src/site/site.xml
@@ -33,7 +33,7 @@
true
true
- codearte/accurest-maven-plugin
+ spring-cloud/spring-cloud-contract
right
orange
@@ -51,7 +51,7 @@