diff options
author | Alexander Kurtakov | 2020-09-17 08:49:49 +0000 |
---|---|---|
committer | Jay Arthanareeswaran | 2020-09-17 10:19:50 +0000 |
commit | aa50af3debacd092c368293c5e4d19fa5a8c670a (patch) | |
tree | e014fccd117546279be21f82bd6b78bd6efe0e9c | |
parent | 4b922fd6713290cd684dbf8ce9a09e3ce91ca185 (diff) | |
download | eclipse.jdt.core-aa50af3debacd092c368293c5e4d19fa5a8c670a.tar.gz eclipse.jdt.core-aa50af3debacd092c368293c5e4d19fa5a8c670a.tar.xz eclipse.jdt.core-aa50af3debacd092c368293c5e4d19fa5a8c670a.zip |
Bug 567061 - Streamline usage of maven-toolchains-pluginI20200917-1800
Define maven-toolchains-plguin in pluginManagement and hook execution
phase there.
Bump version to latest version of the plugin.
Remove redundant information from modules poms after that.
Change-Id: I5c9bbb91b2317f970f283530acdef10ac1c12461
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r-- | org.eclipse.jdt.core.tests.builder/pom.xml | 27 | ||||
-rw-r--r-- | org.eclipse.jdt.core.tests.compiler/pom.xml | 63 | ||||
-rw-r--r-- | org.eclipse.jdt.core.tests.model/pom.xml | 63 | ||||
-rw-r--r-- | org.eclipse.jdt.tests.latestBREE/pom.xml | 27 | ||||
-rw-r--r-- | pom.xml | 19 |
5 files changed, 18 insertions, 181 deletions
diff --git a/org.eclipse.jdt.core.tests.builder/pom.xml b/org.eclipse.jdt.core.tests.builder/pom.xml index 30f6587ccf..c2afdbfea3 100644 --- a/org.eclipse.jdt.core.tests.builder/pom.xml +++ b/org.eclipse.jdt.core.tests.builder/pom.xml @@ -51,15 +51,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -81,15 +72,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -112,15 +94,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> diff --git a/org.eclipse.jdt.core.tests.compiler/pom.xml b/org.eclipse.jdt.core.tests.compiler/pom.xml index ae1f53446d..f502970c74 100644 --- a/org.eclipse.jdt.core.tests.compiler/pom.xml +++ b/org.eclipse.jdt.core.tests.compiler/pom.xml @@ -53,15 +53,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -83,15 +74,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -114,15 +96,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -145,15 +118,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -176,15 +140,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -206,15 +161,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -236,15 +182,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> diff --git a/org.eclipse.jdt.core.tests.model/pom.xml b/org.eclipse.jdt.core.tests.model/pom.xml index 6078f18f28..b3ec15ad6e 100644 --- a/org.eclipse.jdt.core.tests.model/pom.xml +++ b/org.eclipse.jdt.core.tests.model/pom.xml @@ -54,15 +54,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -84,15 +75,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -115,15 +97,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -146,15 +119,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -177,15 +141,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -208,15 +163,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -239,15 +185,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> diff --git a/org.eclipse.jdt.tests.latestBREE/pom.xml b/org.eclipse.jdt.tests.latestBREE/pom.xml index 7f3bc0230e..e17e002f76 100644 --- a/org.eclipse.jdt.tests.latestBREE/pom.xml +++ b/org.eclipse.jdt.tests.latestBREE/pom.xml @@ -50,15 +50,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -80,15 +71,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -110,15 +92,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-toolchains-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>toolchain</goal> - </goals> - </execution> - </executions> <configuration> <toolchains> <jdk> @@ -69,8 +69,25 @@ <module>org.eclipse.jdt.apt.tests</module> <module>org.eclipse.jdt.compiler.apt.tests</module> </modules> - + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-toolchains-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>toolchain</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> |