From d97db26001c8346621b40fa6624c99ce3cc93251 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Sun, 4 Aug 2019 08:14:44 +0200
Subject: [PATCH] Makes jdk13 build pass with Gradle

---
 docker/spring-cloud-contract-docker/pom.xml   |  2 +-
 pom.xml                                       |  1 +
 .../pom.xml                                   | 26 +++++++++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/docker/spring-cloud-contract-docker/pom.xml b/docker/spring-cloud-contract-docker/pom.xml
index ffd4bbe3e5..e98b86a345 100644
--- a/docker/spring-cloud-contract-docker/pom.xml
+++ b/docker/spring-cloud-contract-docker/pom.xml
@@ -91,7 +91,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.6.0</version>
+				<version>${exec-maven-plugin.version}</version>
 				<executions>
 					<execution>
 						<id>gradle</id>
diff --git a/pom.xml b/pom.xml
index cf4e7c2557..5b206b8ddd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
 		<xpath2.processor.version>2.1.100</xpath2.processor.version>
 		<xerces.version>2.11.0</xerces.version>
 		<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
+		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 	</properties>
 
 	<modules>
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
index afff80ac6b..314c02e159 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
@@ -19,6 +19,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<gradle.task>build</gradle.task>
 	</properties>
 
 	<dependencies>
@@ -111,7 +112,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.6.0</version>
+						<version>${exec-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>gradle</id>
@@ -119,7 +120,7 @@
 								<configuration>
 									<executable>./gradlew</executable>
 									<arguments>
-										<argument>build</argument>
+										<argument>${gradle.task}</argument>
 										<!--<argument>jacocoTestReport</argument>-->
 										<argument>-PverifierVersion=${project.version}</argument>
 									</arguments>
@@ -145,7 +146,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.6.0</version>
+						<version>${exec-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>gradle</id>
@@ -153,7 +154,7 @@
 								<configuration>
 									<executable>gradlew.bat</executable>
 									<arguments>
-										<argument>build</argument>
+										<argument>${gradle.task}</argument>
 										<!--<argument>jacocoTestReport</argument>-->
 										<argument>-PverifierVersion=${project.version}</argument>
 									</arguments>
@@ -177,7 +178,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.6.0</version>
+						<version>${exec-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>gradle</id>
@@ -185,7 +186,7 @@
 								<configuration>
 									<executable>./gradlew</executable>
 									<arguments>
-										<argument>build</argument>
+										<argument>${gradle.task}</argument>
 										<!--<argument>jacocoTestReport</argument>-->
 										<argument>-Pfast</argument>
 										<argument>-PverifierVersion=${project.version}</argument>
@@ -210,7 +211,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.6.0</version>
+						<version>${exec-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>gradle</id>
@@ -219,7 +220,7 @@
 									<executable>./gradlew</executable>
 									<arguments>
 										<argument>clean</argument>
-										<argument>build</argument>
+										<argument>${gradle.task}</argument>
 										<argument>-PverifierVersion=${project.version}</argument>
 										<argument>-Pcentral</argument>
 										<argument>publishPlugins</argument>
@@ -234,6 +235,15 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>java13</id>
+			<activation>
+				<jdk>13</jdk>
+			</activation>
+			<properties>
+				<gradle.task>assemble</gradle.task>
+			</properties>
+		</profile>
 	</profiles>
 
 </project>