Merge branch '1.2.x'

.gitignore

@@ -21,6 +21,7 @@ bin/
 # Package Files #
 *.war
 *.ear
+*.versionsBackup
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

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

@@ -66,6 +66,11 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.rest-assured</groupId>
+			<artifactId>rest-assured</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -208,10 +208,10 @@
 						<consoleOutput>true</consoleOutput>
 						<failsOnError>true</failsOnError>
 						<sourceDirectories>
-							${project.basedir}/src/main/java,${project.basedir}/src/main/groovy
+							<sourceDirectory>${project.basedir}/src/main/java,${project.basedir}/src/main/groovy</sourceDirectory>
 						</sourceDirectories>
 						<testSourceDirectories>
-							${project.basedir}/src/test/java,${project.basedir}/src/test/groovy
+							<sourceDirectory>${project.basedir}/src/test/java,${project.basedir}/src/test/groovy</sourceDirectory>
 						</testSourceDirectories>
 					</configuration>
 					<goals>