SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makes jdk13 build pass with Gradle

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-08-04 08:14:44 +02:00
parent dd5fb8f55b
commit d97db26001
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/spring-cloud-contract-docker/pom.xml
View File

@@ -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>

1
pom.xml
View File

@@ -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>

26
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
View File

@@ -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>