From 99d64cb1092cedf9c074ddde9b9f9fb65be2d93e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mariusz=20Smyku=C5=82a?= <mariuszs@gmail.com>
Date: Thu, 1 Sep 2016 22:05:08 +0200
Subject: [PATCH] simplifed maven configuration and url fixes (#70)

---
 .../src/site/asciidoc/complex-content.adoc             |  2 +-
 .../src/site/asciidoc/junit.adoc                       |  2 +-
 .../src/site/asciidoc/spock.adoc                       |  2 +-
 .../src/test/projects/spring-boot-groovy/pom.xml       | 10 +---------
 .../src/test/projects/spring-boot-java/pom.xml         | 10 +---------
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/complex-content.adoc b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/complex-content.adoc
index b3fdeee917..c882a826ce 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/complex-content.adoc
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/complex-content.adoc
@@ -35,4 +35,4 @@ include::{root_folder}/src/test/projects/complex-configuration/src/test/contract
 
 === Project source code
 
-https://github.com/Codearte/accurest-maven-plugin/tree/master/src/test/projects/complex-configuration
\ No newline at end of file
+https://github.com/Codearte/accurest-maven-plugin/tree/master/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration
\ No newline at end of file
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/junit.adoc b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/junit.adoc
index 6d5acf3dbd..d5750bec55 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/junit.adoc
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/junit.adoc
@@ -26,4 +26,4 @@ include::../../../src/test/projects/spring-boot-java/src/test/java/hello/BaseAcc
 
 === Project source code
 
-https://github.com/spring-cloud/spring-cloud-contract/tree/master/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java
\ No newline at end of file
+https://github.com/spring-cloud/spring-cloud-contract/tree/master/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java
\ No newline at end of file
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/spock.adoc b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/spock.adoc
index 1741df6bd5..45e6e6c1f0 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/spock.adoc
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/spock.adoc
@@ -26,4 +26,4 @@ include::../../../src/test/projects/spring-boot-groovy/src/test/groovy/hello/Bas
 
 === Project source code
 
-https://github.com/spring-cloud/spring-cloud-contract/tree/master/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy
+https://github.com/spring-cloud/spring-cloud-contract/tree/master/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
index 2e85fbb77c..f77ceb71f8 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
@@ -86,15 +86,7 @@
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-maven-plugin</artifactId>
                 <version>${spring-cloud-verifier-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>convert</goal>
-                            <goal>generateStubs</goal>
-                            <goal>generateTests</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <extensions>true</extensions>
                 <configuration>
                     <baseClassForTests>hello.BaseAccurest</baseClassForTests>
                     <testFramework>SPOCK</testFramework>
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
index 46e95e1e87..b3579b8d72 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
@@ -91,15 +91,7 @@
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-maven-plugin</artifactId>
                 <version>${spring-cloud-verifier-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>convert</goal>
-                            <goal>generateStubs</goal>
-                            <goal>generateTests</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <extensions>true</extensions>
                 <configuration>
                     <baseClassForTests>hello.BaseAccurest</baseClassForTests>
                 </configuration>