Use version.maven-surefire-plugin in ITs maven-parent 50 removed the version.maven-surefire property (apache-parent 40 renamed it), so the invoker @token@ interpolation no longer resolves and the IT builds fail on surefire plugin resolution. Signed-off-by: Sylwester Lachiewicz <slachiewicz@apache.org>
diff --git a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml index eb684cd..315c207 100644 --- a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
@@ -41,7 +41,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml index 78be564..4fbf744 100644 --- a/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml +++ b/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml
@@ -76,7 +76,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml index 9899763..d472fb2 100644 --- a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml +++ b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
@@ -96,7 +96,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml index b474afb..db13a86 100644 --- a/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml +++ b/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
@@ -74,7 +74,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-war-plugin</artifactId>
diff --git a/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml index 9878223..4901f3a 100644 --- a/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml +++ b/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
@@ -45,7 +45,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml index e022e43..bbf2a56 100644 --- a/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml +++ b/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
@@ -84,7 +84,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-11-junit-5.x/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-11-junit-5.x/reference/pom.xml index 90eda6c..3dee35b 100644 --- a/maven-archetype-quickstart/src/test/resources/projects/it-java-11-junit-5.x/reference/pom.xml +++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-11-junit-5.x/reference/pom.xml
@@ -61,7 +61,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-11/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-11/reference/pom.xml index 56bb0e1..5745dd4 100644 --- a/maven-archetype-quickstart/src/test/resources/projects/it-java-11/reference/pom.xml +++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-11/reference/pom.xml
@@ -44,7 +44,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.x/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.x/reference/pom.xml index b2c21df..92e8eeb 100644 --- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.x/reference/pom.xml +++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.x/reference/pom.xml
@@ -45,7 +45,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml index 886a4d8..a5a52fc 100644 --- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml +++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml
@@ -45,7 +45,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml index e39746e..6536f86 100644 --- a/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml +++ b/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
@@ -54,7 +54,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-site-skin/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-site-skin/src/main/resources-filtered/archetype-resources/pom.xml index 9432195..56e2e7d 100644 --- a/maven-archetype-site-skin/src/main/resources-filtered/archetype-resources/pom.xml +++ b/maven-archetype-site-skin/src/main/resources-filtered/archetype-resources/pom.xml
@@ -54,7 +54,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml index 51be065..092433a 100644 --- a/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml +++ b/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml
@@ -38,7 +38,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${version.maven-surefire}</version> + <version>${version.maven-surefire-plugin}</version> </plugin> <plugin> <artifactId>maven-war-plugin</artifactId>