This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new 47dacb5 [MARCHETYPES-83] Upgrade Parent to 43, use plugins versions
from parent
47dacb5 is described below
commit 47dacb51d75fd4963b279ef2409ffbd91b6ed347
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Sat Aug 17 14:00:20 2024 +0200
[MARCHETYPES-83] Upgrade Parent to 43, use plugins versions from parent
---
.../resources-filtered/archetype-resources/pom.xml | 17 +++++---------
.../src/main/resources/archetype-resources/pom.xml | 14 ++++++------
.../resources-filtered/archetype-resources/pom.xml | 22 +++++++++---------
.../resources-filtered/archetype-resources/pom.xml | 13 +++++------
.../resources-filtered/archetype-resources/pom.xml | 26 +++++++++-------------
.../projects/it-basic/archetype.properties | 2 +-
.../test/resources/projects/it-basic/verify.groovy | 14 ++++++------
.../resources-filtered/archetype-resources/pom.xml | 14 ++++++------
.../resources-filtered/archetype-resources/pom.xml | 14 ++++++------
maven-archetype-quickstart/pom.xml | 10 +++++++++
.../resources-filtered/archetype-resources/pom.xml | 18 +++++++--------
.../it-java-11-junit-5.4.2/reference/pom.xml | 18 +++++++--------
.../projects/it-java-11/reference/pom.xml | 18 +++++++--------
.../it-java-7-junit-4.12/archetype.properties | 2 +-
.../it-java-7-junit-4.12/reference/pom.xml | 22 +++++++++---------
.../projects/it-java-7/archetype.properties | 2 +-
.../resources/projects/it-java-7/reference/pom.xml | 22 +++++++++---------
.../resources-filtered/archetype-resources/pom.xml | 18 +++++++--------
.../resources-filtered/archetype-resources/pom.xml | 6 ++---
.../resources/projects/it-basic/reference/pom.xml | 6 ++---
.../resources-filtered/archetype-resources/pom.xml | 22 +++++++++---------
.../resources-filtered/archetype-resources/pom.xml | 6 ++---
.../resources-filtered/archetype-resources/pom.xml | 14 ++++++------
plugin-versions.properties | 17 --------------
pom.xml | 16 ++++++-------
25 files changed, 167 insertions(+), 186 deletions(-)
diff --git
a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
index 8f3b9e0..0290d41 100644
---
a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
+++
b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
@@ -25,35 +25,30 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>${archetype}</version>
+ <version>${version.maven-archetype-plugin}</version>
</extension>
</extensions>
<pluginManagement><!-- lock down plugins versions to avoid using Maven
defaults (may be moved to parent pom) -->
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>${archetype}</version>
- <configuration>
- <properties>
- <https.protocols>\${https.protocols}</https.protocols>
- </properties>
- </configuration>
+ <version>${version.maven-archetype-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
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 a369de7..ad49520 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
@@ -28,32 +28,32 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar}</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
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 c454f7d..78be564 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
@@ -63,48 +63,48 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar}</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>${war}</version>
+ <version>${version.maven-war-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
- <version>${ear}</version>
+ <version>${version.maven-ear-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-ejb-plugin</artifactId>
- <version>${ejb}</version>
+ <version>${version.maven-ejb-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc}</version>
+ <version>${version.maven-javadoc-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
b/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
index b56344f..8533de3 100644
---
a/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
+++
b/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
@@ -29,19 +29,19 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>${site}</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${pir}</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
<plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${plugin}</version>
+ <artifactId>maven-plugin-report-plugin</artifactId>
+ <version>${version.maven-plugin-tools}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -53,8 +53,7 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
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 654796c..7c16a67 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
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${plugin}</version>
+ <version>${version.maven-plugin-tools}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -91,40 +91,40 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_maven-plugin_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${plugin}</version>
+ <version>${version.maven-plugin-tools}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar}</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>${invoker}</version>
+ <version>${version.maven-invoker-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -132,7 +132,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${plugin}</version>
<configuration>
<!-- <goalPrefix>${artifactId}</goalPrefix> -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -163,7 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>${invoker}</version>
+ <version>${version.maven-invoker-plugin}</version>
<configuration>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>\${project.build.directory}/local-repo</localRepositoryPath>
@@ -172,9 +171,6 @@
<goal>clean</goal>
<goal>test-compile</goal>
</goals>
- <properties>
- <https.protocols>\${https.protocols}</https.protocols>
- </properties>
</configuration>
<executions>
<execution>
diff --git
a/maven-archetype-plugin/src/test/resources/projects/it-basic/archetype.properties
b/maven-archetype-plugin/src/test/resources/projects/it-basic/archetype.properties
index 3c844bb..03e055b 100644
---
a/maven-archetype-plugin/src/test/resources/projects/it-basic/archetype.properties
+++
b/maven-archetype-plugin/src/test/resources/projects/it-basic/archetype.properties
@@ -1,4 +1,4 @@
groupId=archetype.it
-artifactId=basic-plugin
+artifactId=basic-maven-plugin
version=0.1-SNAPSHOT
package=it.pkg.plugin
diff --git
a/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
b/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
index 534a08c..de86e23 100644
--- a/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
+++ b/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
@@ -1,4 +1,4 @@
-File descriptorFile = new File( basedir,
"project/basic-plugin/target/classes/META-INF/maven/plugin.xml" );
+File descriptorFile = new File( basedir,
"project/basic-maven-plugin/target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
def pluginDescriptor = new XmlParser().parse( descriptorFile );
@@ -22,21 +22,21 @@ assert parameter.type.text() == 'java.io.File'
assert parameter.required.text() == 'true'
assert parameter.description.text() == 'Location of the file.'
-File testFile = new File( basedir,
"project/basic-plugin/src/main/java/it/pkg/plugin/MyMojo.java" );
+File testFile = new File( basedir,
"project/basic-maven-plugin/src/main/java/it/pkg/plugin/MyMojo.java" );
assert testFile.exists()
-testFile = new File( basedir,
"project/basic-plugin/src/test/java/it/pkg/plugin/MyMojoTest.java" );
+testFile = new File( basedir,
"project/basic-maven-plugin/src/test/java/it/pkg/plugin/MyMojoTest.java" );
assert testFile.exists()
-testFile = new File( basedir,
"project/basic-plugin/src/test/resources/project-to-test/pom.xml" );
+testFile = new File( basedir,
"project/basic-maven-plugin/src/test/resources/project-to-test/pom.xml" );
assert testFile.exists()
-testFile = new File( basedir,
"project/basic-plugin/src/it/simple-it/verify.groovy" );
+testFile = new File( basedir,
"project/basic-maven-plugin/src/it/simple-it/verify.groovy" );
assert testFile.exists()
-testFile = new File( basedir, "project/basic-plugin/src/it/simple-it/pom.xml"
);
+testFile = new File( basedir,
"project/basic-maven-plugin/src/it/simple-it/pom.xml" );
assert testFile.exists()
-testFile = new File( basedir, "project/basic-plugin/src/it/settings.xml" );
+testFile = new File( basedir, "project/basic-maven-plugin/src/it/settings.xml"
);
assert testFile.exists()
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 93a372f..b474afb 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
@@ -61,32 +61,32 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_war_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>${war}</version>
+ <version>${version.maven-war-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
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 3025fbb..12fdb7b 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
@@ -32,32 +32,32 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar}</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-archetype-quickstart/pom.xml
b/maven-archetype-quickstart/pom.xml
index 27b9f06..91f30b3 100644
--- a/maven-archetype-quickstart/pom.xml
+++ b/maven-archetype-quickstart/pom.xml
@@ -39,4 +39,14 @@ under the License.
<version>4.13.1</version>
</dependency>
</dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
</project>
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 3b6bec7..1c5c161 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
@@ -66,41 +66,41 @@
<!-- clean lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle
-->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- default lifecycle, jar packaging: see
https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar}</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
<!-- site lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle
-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>${site}</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${pir}</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/maven-archetype-quickstart/src/test/resources/projects/it-java-11-junit-5.4.2/reference/pom.xml
b/maven-archetype-quickstart/src/test/resources/projects/it-java-11-junit-5.4.2/reference/pom.xml
index 4dc0f5d..b922e5b 100644
---
a/maven-archetype-quickstart/src/test/resources/projects/it-java-11-junit-5.4.2/reference/pom.xml
+++
b/maven-archetype-quickstart/src/test/resources/projects/it-java-11-junit-5.4.2/reference/pom.xml
@@ -37,41 +37,41 @@
<!-- clean lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle
-->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- default lifecycle, jar packaging: see
https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
<!-- site lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle
-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.1</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
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 48d7b6c..56bb0e1 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
@@ -31,41 +31,41 @@
<!-- clean lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle
-->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- default lifecycle, jar packaging: see
https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
<!-- site lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle
-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.1</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties
b/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties
index 57dffc9..45b3a62 100644
---
a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties
+++
b/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties
@@ -1,5 +1,5 @@
groupId=archetype.it
-artifactId=java-8-junit-412-quickstart
+artifactId=java-7-junit-412-quickstart
version=0.1-SNAPSHOT
package=it.pkg
javaCompilerVersion=1.7
diff --git
a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml
b/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml
index cfd0d9b..f719528 100644
---
a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml
+++
b/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>archetype.it</groupId>
- <artifactId>java-8-junit-412-quickstart</artifactId>
+ <artifactId>java-7-junit-412-quickstart</artifactId>
<version>0.1-SNAPSHOT</version>
- <name>java-8-junit-412-quickstart</name>
+ <name>java-7-junit-412-quickstart</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
@@ -32,41 +32,41 @@
<!-- clean lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle
-->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- default lifecycle, jar packaging: see
https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
<!-- site lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle
-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.1</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties
b/maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties
index aa0925e..f03bcf4 100644
---
a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties
+++
b/maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties
@@ -1,5 +1,5 @@
groupId=archetype.it
-artifactId=java-8-quickstart
+artifactId=java-7-quickstart
version=0.1-SNAPSHOT
package=it.pkg
javaCompilerVersion=7
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 6f0184c..886a4d8 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
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>archetype.it</groupId>
- <artifactId>java-8-quickstart</artifactId>
+ <artifactId>java-7-quickstart</artifactId>
<version>0.1-SNAPSHOT</version>
- <name>java-8-quickstart</name>
+ <name>java-7-quickstart</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
@@ -32,41 +32,41 @@
<!-- clean lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle
-->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- default lifecycle, jar packaging: see
https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
<!-- site lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle
-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.1</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
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 7da9d28..5f3ca8c 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
@@ -32,40 +32,40 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>${site}</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${pir}</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar}</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
b/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
index d79488d..7e2707b 100644
---
a/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
+++
b/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
@@ -28,15 +28,15 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>${site}</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${pir}</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
index a44a20c..39c3877 100644
---
a/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
+++
b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
@@ -28,15 +28,15 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.4.0</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
+ <version>3.12.1</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.6.1</version>
</plugin>
</plugins>
</pluginManagement>
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 a79ba94..9432195 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
@@ -12,8 +12,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <sitePluginVersion>${site}</sitePluginVersion>
- <mpirVersion>${pir}</mpirVersion>
+ <sitePluginVersion>${version.maven-site-plugin}</sitePluginVersion>
+ <mpirVersion>${version.maven-project-info-reports-plugin}</mpirVersion>
</properties>
<build>
@@ -33,40 +33,40 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>${site}</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>${invoker}</version>
+ <version>${version.maven-invoker-plugin}</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar}</version>
+ <version>${version.maven-jar-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
b/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
index ad9e304..18a26c2 100644
---
a/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
+++
b/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
@@ -29,15 +29,15 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>${site}</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${pir}</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
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 17310d9..af432ec 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
@@ -34,32 +34,32 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>${clean}</version>
+ <version>${version.maven-clean-plugin}</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_war_packaging
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${resources}</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler}</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>${war}</version>
+ <version>${version.maven-war-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${install}</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>${deploy}</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/plugin-versions.properties b/plugin-versions.properties
deleted file mode 100644
index dca307c..0000000
--- a/plugin-versions.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-clean 3.1.0
-site 3.9.1
-install 2.5.2
-deploy 2.8.2
-resources 3.2.0
-compiler 3.8.1
-surefire 2.22.2
-jar 3.2.0
-ejb 3.1.0
-plugin 3.6.0
-war 3.3.1
-ear 3.2.0
-rar 2.4
-archetype 3.2.0
-invoker 3.2.1
-pir 3.1.1
-javadoc 3.2.0
diff --git a/pom.xml b/pom.xml
index bf34197..bb0ba61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>41</version>
+ <version>43</version>
<relativePath />
</parent>
@@ -73,6 +73,10 @@ under the License.
</distributionManagement>
<properties>
+ <!-- additional plugins versions - not presents in parent -->
+ <version.maven-ejb-plugin>3.2.1</version.maven-ejb-plugin>
+ <version.maven-archetype-plugin>3.2.0</version.maven-archetype-plugin>
+
<maven.site.path>archetypes-archives/archetypes-LATEST</maven.site.path>
<rat.skip>true</rat.skip>
<project.build.outputTimestamp>2020-04-05T12:04:00Z</project.build.outputTimestamp>
@@ -91,9 +95,6 @@ under the License.
</repositories>
<build>
- <filters>
- <filter>../plugin-versions.properties</filter>
- </filters>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -108,12 +109,9 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-archetype-plugin}</version>
<configuration>
<ignoreEOLStyle>true</ignoreEOLStyle>
- <properties>
- <https.protocols>${https.protocols}</https.protocols>
- </properties>
</configuration>
<dependencies>
<dependency>
@@ -136,7 +134,7 @@ under the License.
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-archetype-plugin}</version>
</extension>
</extensions>
</build>
