diff options
| author | Sylwester Lachiewicz <slachiewicz@gmail.com> | 2019-01-09 14:31:39 +0100 |
|---|---|---|
| committer | Evgeny Mandrikov <138671+Godin@users.noreply.github.com> | 2019-01-09 14:31:39 +0100 |
| commit | bf8a1161bd9285b0997ea84ede1fa25abc6b71b2 (patch) | |
| tree | 729134bc1ab24d94d29ad5fcf27fc391e4825e53 | |
| parent | 0a6bf71575171332d155703ed3a6fc33b279078c (diff) | |
| download | platform_external_jacoco-bf8a1161bd9285b0997ea84ede1fa25abc6b71b2.tar.gz platform_external_jacoco-bf8a1161bd9285b0997ea84ede1fa25abc6b71b2.tar.bz2 platform_external_jacoco-bf8a1161bd9285b0997ea84ede1fa25abc6b71b2.zip | |
Upgrade maven-plugin-plugin to 3.6.0 and maven-shade-plugin to 3.2.1 (#820)
| -rw-r--r-- | org.jacoco.build/pom.xml | 55 | ||||
| -rw-r--r-- | org.jacoco.core.test.validation/pom.xml | 9 |
2 files changed, 2 insertions, 62 deletions
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml index 4cb2f480..b7529999 100644 --- a/org.jacoco.build/pom.xml +++ b/org.jacoco.build/pom.xml @@ -364,7 +364,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.5</version> + <version>3.6.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -389,7 +389,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.1.0</version> + <version>3.2.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -734,57 +734,6 @@ </build> </profile> - <!-- - Following profiles enable compilation into bytecode version 9 - when requested "bytecode.version" greater than 9, - because this is maximum that can be processed by - maven-shade-plugin (https://issues.apache.org/jira/browse/MSHADE-289) - and maven-plugin-plugin (https://issues.apache.org/jira/browse/MPLUGIN-335), - This is overridden for tests. - --> - - <profile> - <id>java10-bytecode</id> - <activation> - <property> - <name>bytecode.version</name> - <value>10</value> - </property> - </activation> - <properties> - <maven.compiler.source>9</maven.compiler.source> - <maven.compiler.target>9</maven.compiler.target> - </properties> - </profile> - - <profile> - <id>java11-bytecode</id> - <activation> - <property> - <name>bytecode.version</name> - <value>11</value> - </property> - </activation> - <properties> - <maven.compiler.source>9</maven.compiler.source> - <maven.compiler.target>9</maven.compiler.target> - </properties> - </profile> - - <profile> - <id>java12-bytecode</id> - <activation> - <property> - <name>bytecode.version</name> - <value>12</value> - </property> - </activation> - <properties> - <maven.compiler.source>9</maven.compiler.source> - <maven.compiler.target>9</maven.compiler.target> - </properties> - </profile> - <!-- This profile enables use of ECJ --> <profile> <id>ecj</id> diff --git a/org.jacoco.core.test.validation/pom.xml b/org.jacoco.core.test.validation/pom.xml index 04bd835b..650d5870 100644 --- a/org.jacoco.core.test.validation/pom.xml +++ b/org.jacoco.core.test.validation/pom.xml @@ -148,9 +148,6 @@ </activation> <properties> <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget> - <!-- see respective profile in org.jacoco.build about this override --> - <maven.compiler.source>10</maven.compiler.source> - <maven.compiler.target>10</maven.compiler.target> </properties> <modules> <module>../org.jacoco.core.test.validation.kotlin</module> @@ -170,9 +167,6 @@ </activation> <properties> <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget> - <!-- see respective profile in org.jacoco.build about this override --> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> </properties> <modules> <module>../org.jacoco.core.test.validation.kotlin</module> @@ -192,9 +186,6 @@ </activation> <properties> <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget> - <!-- see respective profile in org.jacoco.build about this override --> - <maven.compiler.source>12</maven.compiler.source> - <maven.compiler.target>12</maven.compiler.target> </properties> <modules> <module>../org.jacoco.core.test.validation.kotlin</module> |