You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/03/12 20:17:00 UTC
(maven-compiler-plugin) 01/01: [MCOMPILER-585] Refresh plugins versions in ITs
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MCOMPILER-585
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 70b44831824e57b5369cf203386290faca74ae4a
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Mar 12 21:16:45 2024 +0100
[MCOMPILER-585] Refresh plugins versions in ITs
---
src/it/MCOMPILER-170/invoker.properties | 1 -
src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties | 2 --
src/it/MCOMPILER-298/invoker.properties | 1 -
src/it/MCOMPILER-481-requires-static-included/pom.xml | 3 +--
src/it/MCOMPILER-525/pom.xml | 4 ++--
src/it/mcompiler-120/invoker.properties | 1 -
.../multirelease-patterns/multimodule/multirelease/pom.xml | 2 +-
src/it/multirelease-patterns/multimodule/pom.xml | 2 +-
.../multiproject/multirelease-base/pom.xml | 1 -
src/it/multirelease-patterns/multiproject/pom.xml | 12 +++++++++++-
src/it/multirelease-patterns/packaging-plugin/pom.xml | 4 ++--
.../singleproject-runtime/invoker.properties | 1 -
src/it/multirelease-patterns/singleproject-runtime/pom.xml | 13 +++++++++++--
.../singleproject-toolchains/invoker.properties | 2 --
.../multirelease-patterns/singleproject-toolchains/pom.xml | 8 ++++----
src/it/non-english-warnings/pom.xml | 2 +-
src/it/setup_annotation-verify-plugin/pom.xml | 2 +-
src/it/setup_jar_automodule/pom.xml | 2 +-
18 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/src/it/MCOMPILER-170/invoker.properties b/src/it/MCOMPILER-170/invoker.properties
index 9f346f9..868a258 100644
--- a/src/it/MCOMPILER-170/invoker.properties
+++ b/src/it/MCOMPILER-170/invoker.properties
@@ -16,4 +16,3 @@
# under the License.
invoker.goals = clean compile -T4
-invoker.maven.version = 3.0+
diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties b/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
index 66f3f58..028c62b 100644
--- a/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
+++ b/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
@@ -17,5 +17,3 @@
invoker.java.version = 1.8+
invoker.toolchain.jdk.version=1.9
-# Due to toolchain support
-invoker.maven.version = 3.3.1+
\ No newline at end of file
diff --git a/src/it/MCOMPILER-298/invoker.properties b/src/it/MCOMPILER-298/invoker.properties
index 928055c..b1a0463 100644
--- a/src/it/MCOMPILER-298/invoker.properties
+++ b/src/it/MCOMPILER-298/invoker.properties
@@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 1.8+
invoker.goals = test
diff --git a/src/it/MCOMPILER-481-requires-static-included/pom.xml b/src/it/MCOMPILER-481-requires-static-included/pom.xml
index 5bcd1bc..966312b 100644
--- a/src/it/MCOMPILER-481-requires-static-included/pom.xml
+++ b/src/it/MCOMPILER-481-requires-static-included/pom.xml
@@ -49,10 +49,9 @@ under the License.
</configuration>
</plugin>
<plugin>
- <!-- TODO: This IT fails with surefire 3.x -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/MCOMPILER-525/pom.xml b/src/it/MCOMPILER-525/pom.xml
index 48de91e..ce4080e 100644
--- a/src/it/MCOMPILER-525/pom.xml
+++ b/src/it/MCOMPILER-525/pom.xml
@@ -35,12 +35,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.3.0</version>
+ <version>@version.maven-jar-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>3.1.0</version>
+ <version>@version.maven-antrun-plugin@</version>
<executions>
<execution>
<id>touch</id>
diff --git a/src/it/mcompiler-120/invoker.properties b/src/it/mcompiler-120/invoker.properties
index 86f9130..98a8e95 100644
--- a/src/it/mcompiler-120/invoker.properties
+++ b/src/it/mcompiler-120/invoker.properties
@@ -17,4 +17,3 @@
invoker.goals = clean compile
invoker.buildResult = failure
-invoker.java.version = 1.6+
diff --git a/src/it/multirelease-patterns/multimodule/multirelease/pom.xml b/src/it/multirelease-patterns/multimodule/multirelease/pom.xml
index 220864c..d7af7c8 100644
--- a/src/it/multirelease-patterns/multimodule/multirelease/pom.xml
+++ b/src/it/multirelease-patterns/multimodule/multirelease/pom.xml
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
+ <version>@version.maven-assembly-plugin@</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
diff --git a/src/it/multirelease-patterns/multimodule/pom.xml b/src/it/multirelease-patterns/multimodule/pom.xml
index bf411e6..b4e4812 100644
--- a/src/it/multirelease-patterns/multimodule/pom.xml
+++ b/src/it/multirelease-patterns/multimodule/pom.xml
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml b/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml
index fbf2bcb..6c5ad95 100644
--- a/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml
+++ b/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml
@@ -92,7 +92,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.0</version>
<executions>
<execution>
<id>add-java9-supplement</id>
diff --git a/src/it/multirelease-patterns/multiproject/pom.xml b/src/it/multirelease-patterns/multiproject/pom.xml
index 533282f..79740d2 100644
--- a/src/it/multirelease-patterns/multiproject/pom.xml
+++ b/src/it/multirelease-patterns/multiproject/pom.xml
@@ -35,10 +35,20 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>@version.maven-dependency-plugin@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>@version.maven-jar-plugin@</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/multirelease-patterns/packaging-plugin/pom.xml b/src/it/multirelease-patterns/packaging-plugin/pom.xml
index 593d4a1..88fde2d 100644
--- a/src/it/multirelease-patterns/packaging-plugin/pom.xml
+++ b/src/it/multirelease-patterns/packaging-plugin/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>@version.maven-surefire@</version>
<configuration>
<!-- this shows that the Java 9 code isn't tested -->
<testFailureIgnore>true</testFailureIgnore>
@@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.21.0</version>
+ <version>@version.maven-surefire@</version>
<executions>
<execution>
<goals>
diff --git a/src/it/multirelease-patterns/singleproject-runtime/invoker.properties b/src/it/multirelease-patterns/singleproject-runtime/invoker.properties
index 318b31a..a15f4d0 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/invoker.properties
+++ b/src/it/multirelease-patterns/singleproject-runtime/invoker.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 1.8+
invoker.goals = verify
\ No newline at end of file
diff --git a/src/it/multirelease-patterns/singleproject-runtime/pom.xml b/src/it/multirelease-patterns/singleproject-runtime/pom.xml
index a5be9ce..fb8647e 100644
--- a/src/it/multirelease-patterns/singleproject-runtime/pom.xml
+++ b/src/it/multirelease-patterns/singleproject-runtime/pom.xml
@@ -38,10 +38,20 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>@version.maven-jar-plugin@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>@version.maven-surefire@</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>@version.maven-surefire@</version>
<configuration>
<!-- this shows that the Java 9 code isn't tested -->
<testFailureIgnore>true</testFailureIgnore>
@@ -54,7 +64,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.21.0</version>
<executions>
<execution>
<goals>
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties b/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
index 3e89fdd..193b2ad 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
+++ b/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
@@ -16,5 +16,3 @@
# under the License.
invoker.goals = verify -Pmulti-jar
invoker.toolchain.jdk.version=1.9
-# Due to toolchain support
-invoker.maven.version = 3.3.1+
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
index 154f8ae..3919762 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
+++ b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
+ <version>3.1.0</version>
<executions>
<execution>
<goals>
@@ -114,7 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.21.0</version>
+ <version>@version.maven-surefire@</version>
<executions>
<execution>
<goals>
@@ -200,7 +200,7 @@
<!-- Run the unit tests with the JVM used to run maven -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>@version.maven-surefire@</version>
<configuration>
<jvm>${env.JAVA_HOME}/bin/java</jvm>
<!-- this shows that the Java 9 code isn't tested -->
@@ -245,7 +245,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>@version.maven-jar-plugin@</version>
<configuration>
<archive>
<manifestEntries>
diff --git a/src/it/non-english-warnings/pom.xml b/src/it/non-english-warnings/pom.xml
index aaadacd..efb74e8 100644
--- a/src/it/non-english-warnings/pom.xml
+++ b/src/it/non-english-warnings/pom.xml
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
<configuration>
<fork>false</fork>
<showWarnings>true</showWarnings>
diff --git a/src/it/setup_annotation-verify-plugin/pom.xml b/src/it/setup_annotation-verify-plugin/pom.xml
index f6ae99b..67e2311 100644
--- a/src/it/setup_annotation-verify-plugin/pom.xml
+++ b/src/it/setup_annotation-verify-plugin/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.3</version>
+ <version>@version.maven-plugin-tools@</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/it/setup_jar_automodule/pom.xml b/src/it/setup_jar_automodule/pom.xml
index b20e48b..8cac660 100644
--- a/src/it/setup_jar_automodule/pom.xml
+++ b/src/it/setup_jar_automodule/pom.xml
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
+ <version>@version.maven-jar-plugin@</version>
<configuration>
<archive>
<manifestEntries>