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 2023/11/11 12:58:35 UTC
(maven-assembly-plugin) branch MASSEMBLY-1000-2 created (now 1a199c15)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MASSEMBLY-1000-2
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
at 1a199c15 [MASSEMBLY-1000] ITs - cleanups
This branch includes the following new commits:
new 1a199c15 [MASSEMBLY-1000] ITs - cleanups
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-assembly-plugin) 01/01: [MASSEMBLY-1000] ITs - cleanups
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MASSEMBLY-1000-2
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 1a199c1556e8897259d88cefdd2a01128927c0b6
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Nov 11 13:58:12 2023 +0100
[MASSEMBLY-1000] ITs - cleanups
- remove property testVersion
- use it-project-parent in all ITs
- bind versions for standard plugins in it-project-parent
---
pom.xml | 4 --
src/it/it-project-parent/pom.xml | 25 +++++++++++
.../add-classpath/invoker.properties | 2 +-
.../classpath-descriptor/invoker.properties | 2 +-
.../descriptorDirectoryScan/invoker.properties | 2 +-
.../file-copyIntoTopDir/invoker.properties | 2 +-
.../file-sameName/invoker.properties | 2 +-
.../basic-features/formats-zstd/invoker.properties | 2 +-
.../basic-features/formats/invoker.properties | 2 +-
.../basic-features/local-repo-interp/pom.xml | 6 ++-
.../invoker.properties | 2 +-
.../invoker.properties | 2 +-
.../invoker.properties | 2 +-
.../invoker.properties | 2 +-
src/it/projects/bugs/massembly-324/pom.xml | 10 ++++-
src/it/projects/bugs/massembly-559/pom.xml | 8 +++-
src/it/projects/bugs/massembly-580/pom.xml | 7 +++-
src/it/projects/bugs/massembly-583/child1/pom.xml | 7 +++-
src/it/projects/bugs/massembly-583/child2/pom.xml | 8 +++-
src/it/projects/bugs/massembly-583/pom.xml | 10 ++++-
src/it/projects/bugs/massembly-730/pom.xml | 14 +++----
src/it/projects/bugs/massembly-731/pom.xml | 8 +++-
src/it/projects/bugs/massembly-732/pom.xml | 10 ++++-
src/it/projects/bugs/massembly-733/pom.xml | 8 +++-
src/it/projects/bugs/massembly-737/pom.xml | 8 +---
.../projects/bugs/massembly-743/invoker.properties | 2 +-
src/it/projects/bugs/massembly-743/pom.xml | 1 -
src/it/projects/bugs/massembly-891/pom.xml | 6 +++
src/it/projects/bugs/massembly-919/bundle/pom.xml | 1 -
src/it/projects/bugs/massembly-919/pom.xml | 7 ++++
src/it/projects/bugs/massembly-920/pom.xml | 7 ++++
src/it/projects/bugs/massembly-956/pom.xml | 7 ++++
src/it/projects/bugs/massembly-964/pom.xml | 6 +++
.../handler-def/pom.xml | 8 +++-
.../handler-def/pom.xml | 8 +++-
.../handler-def/pom.xml | 8 +++-
.../invoker.properties | 2 +-
.../including-pom-dependency/invoker.properties | 2 +-
.../including-sar-dependency/invoker.properties | 2 +-
.../projects/dependency-sets/massembly-395/pom.xml | 48 ++++++++++++----------
.../projects/dependency-sets/massembly-619/pom.xml | 7 +++-
.../projects/dependency-sets/massembly-675/pom.xml | 1 -
.../projects/dependency-sets/massembly-955/pom.xml | 1 -
.../projects/dependency-sets/massembly-969/pom.xml | 1 -
.../file-set-fileMode/invoker.properties | 2 +-
.../fileItem-fileMode/invoker.properties | 2 +-
.../invoker.properties | 2 +-
.../invoker.properties | 2 +-
.../dont-use-default-excludes/invoker.properties | 2 +-
.../excluding-svn-dirs/invoker.properties | 2 +-
.../include-base-directory/invoker.properties | 2 +-
.../file-sets/massembly-665/invoker.properties | 2 +-
.../platformspecific-filesets/invoker.properties | 2 +-
.../file-sets/precedence-check/invoker.properties | 2 +-
.../use-default-excludes/invoker.properties | 2 +-
.../filter-comp-descriptor-path/invoker.properties | 2 +-
.../invoker.properties | 2 +-
.../massembly-934_concat-files/invoker.properties | 2 +-
.../no-appendAssemblyId-no-classifier/pom.xml | 2 +-
src/it/projects/multimodule/massembly-317/pom.xml | 48 ++++++++++++----------
src/it/projects/multimodule/massembly-474/pom.xml | 24 ++++-------
src/it/projects/multimodule/massembly-619/pom.xml | 20 ++++-----
src/it/projects/reproducible/invoker.properties | 2 +-
63 files changed, 261 insertions(+), 143 deletions(-)
diff --git a/pom.xml b/pom.xml
index 84c03210..68777ec9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,7 +365,6 @@ under the License.
<id>run-its</id>
<properties>
<test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
- <testVersion>${project.version}</testVersion>
</properties>
<build>
@@ -374,9 +373,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
- <properties>
- <testVersion>${testVersion}</testVersion>
- </properties>
<showVersion>true</showVersion>
</configuration>
<dependencies>
diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml
index 5d7157a6..7c588ae9 100644
--- a/src/it/it-project-parent/pom.xml
+++ b/src/it/it-project-parent/pom.xml
@@ -33,11 +33,36 @@ under the License.
<artifactId>maven-assembly-plugin</artifactId>
<version>@project.version@</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>@version.maven-clean-plugin@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>@version.maven-compiler-plugin@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@version.maven-deploy-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-install-plugin</artifactId>
+ <version>@version.maven-install-plugin@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@version.maven-resources-plugin@</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/src/it/projects/basic-features/add-classpath/invoker.properties b/src/it/projects/basic-features/add-classpath/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/basic-features/add-classpath/invoker.properties
+++ b/src/it/projects/basic-features/add-classpath/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/classpath-descriptor/invoker.properties b/src/it/projects/basic-features/classpath-descriptor/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/basic-features/classpath-descriptor/invoker.properties
+++ b/src/it/projects/basic-features/classpath-descriptor/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties b/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
+++ b/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties b/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
index 2da4fe64..6e45db42 100644
--- a/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
+++ b/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/file-sameName/invoker.properties b/src/it/projects/basic-features/file-sameName/invoker.properties
index 2da4fe64..6e45db42 100644
--- a/src/it/projects/basic-features/file-sameName/invoker.properties
+++ b/src/it/projects/basic-features/file-sameName/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/formats-zstd/invoker.properties b/src/it/projects/basic-features/formats-zstd/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/basic-features/formats-zstd/invoker.properties
+++ b/src/it/projects/basic-features/formats-zstd/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/formats/invoker.properties b/src/it/projects/basic-features/formats/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/basic-features/formats/invoker.properties
+++ b/src/it/projects/basic-features/formats/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/local-repo-interp/pom.xml b/src/it/projects/basic-features/local-repo-interp/pom.xml
index 5e14cc43..5fedf674 100644
--- a/src/it/projects/basic-features/local-repo-interp/pom.xml
+++ b/src/it/projects/basic-features/local-repo-interp/pom.xml
@@ -29,7 +29,11 @@ under the License.
<groupId>test</groupId>
<artifactId>test</artifactId>
<version>1</version>
-
+
+ <properties>
+ <testVersion>@project.version@</testVersion>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties b/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
+++ b/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties b/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
+++ b/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties b/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
+++ b/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties b/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
index 2da4fe64..6e45db42 100644
--- a/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
+++ b/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/bugs/massembly-324/pom.xml b/src/it/projects/bugs/massembly-324/pom.xml
index d36034b1..b48a0d3b 100644
--- a/src/it/projects/bugs/massembly-324/pom.xml
+++ b/src/it/projects/bugs/massembly-324/pom.xml
@@ -21,16 +21,22 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>mygroup</groupId>
<artifactId>project2</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
diff --git a/src/it/projects/bugs/massembly-559/pom.xml b/src/it/projects/bugs/massembly-559/pom.xml
index f9098d89..b4707c57 100644
--- a/src/it/projects/bugs/massembly-559/pom.xml
+++ b/src/it/projects/bugs/massembly-559/pom.xml
@@ -19,6 +19,13 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>test-assembly-transitive-bug</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -37,7 +44,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<executions>
<execution>
<id>create-assembly</id>
diff --git a/src/it/projects/bugs/massembly-580/pom.xml b/src/it/projects/bugs/massembly-580/pom.xml
index 0d362903..74a172a9 100644
--- a/src/it/projects/bugs/massembly-580/pom.xml
+++ b/src/it/projects/bugs/massembly-580/pom.xml
@@ -20,6 +20,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>com.sulake.maven</groupId>
<artifactId>directory-mode-ignored</artifactId>
<version>10-SNAPSHOT</version>
@@ -43,7 +49,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<configuration>
<finalName>project-deploy</finalName>
<appendAssemblyId>false</appendAssemblyId>
diff --git a/src/it/projects/bugs/massembly-583/child1/pom.xml b/src/it/projects/bugs/massembly-583/child1/pom.xml
index 872c67ca..7daf25a9 100644
--- a/src/it/projects/bugs/massembly-583/child1/pom.xml
+++ b/src/it/projects/bugs/massembly-583/child1/pom.xml
@@ -21,7 +21,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>mygroup</groupId>
+ <parent>
+ <groupId>mygroup</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
<artifactId>project1</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/src/it/projects/bugs/massembly-583/child2/pom.xml b/src/it/projects/bugs/massembly-583/child2/pom.xml
index a8f32951..394bb6b5 100644
--- a/src/it/projects/bugs/massembly-583/child2/pom.xml
+++ b/src/it/projects/bugs/massembly-583/child2/pom.xml
@@ -21,7 +21,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>mygroup</groupId>
+ <parent>
+ <groupId>mygroup</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
<artifactId>project2</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -45,7 +50,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
diff --git a/src/it/projects/bugs/massembly-583/pom.xml b/src/it/projects/bugs/massembly-583/pom.xml
index 8ffb0a5d..865f7ab0 100644
--- a/src/it/projects/bugs/massembly-583/pom.xml
+++ b/src/it/projects/bugs/massembly-583/pom.xml
@@ -20,10 +20,16 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>mygroup</groupId>
<artifactId>parent</artifactId>
- <version>0.0.1</version>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/src/it/projects/bugs/massembly-730/pom.xml b/src/it/projects/bugs/massembly-730/pom.xml
index d0949491..c87a39f8 100644
--- a/src/it/projects/bugs/massembly-730/pom.xml
+++ b/src/it/projects/bugs/massembly-730/pom.xml
@@ -20,6 +20,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>fr.husta.test</groupId>
<artifactId>issue-mvn-assembly-plugin-730</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -39,8 +45,6 @@ under the License.
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <!-- <version>2.4.1</version> -->
<configuration>
</configuration>
<executions>
@@ -59,15 +63,9 @@ under the License.
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/src/it/projects/bugs/massembly-731/pom.xml b/src/it/projects/bugs/massembly-731/pom.xml
index fd3f0dd0..520809dd 100644
--- a/src/it/projects/bugs/massembly-731/pom.xml
+++ b/src/it/projects/bugs/massembly-731/pom.xml
@@ -21,6 +21,13 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>mygroup</groupId>
<artifactId>project2</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -29,7 +36,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
diff --git a/src/it/projects/bugs/massembly-732/pom.xml b/src/it/projects/bugs/massembly-732/pom.xml
index 15b58f9b..d48ac08d 100644
--- a/src/it/projects/bugs/massembly-732/pom.xml
+++ b/src/it/projects/bugs/massembly-732/pom.xml
@@ -21,16 +21,22 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>mygroup</groupId>
<artifactId>project2</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
diff --git a/src/it/projects/bugs/massembly-733/pom.xml b/src/it/projects/bugs/massembly-733/pom.xml
index 04335529..047b0180 100644
--- a/src/it/projects/bugs/massembly-733/pom.xml
+++ b/src/it/projects/bugs/massembly-733/pom.xml
@@ -20,6 +20,13 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>localhost</groupId>
<artifactId>MASSEMBLY-733</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -31,7 +38,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/src/it/projects/bugs/massembly-737/pom.xml b/src/it/projects/bugs/massembly-737/pom.xml
index 85ec87a5..91d84a9a 100644
--- a/src/it/projects/bugs/massembly-737/pom.xml
+++ b/src/it/projects/bugs/massembly-737/pom.xml
@@ -29,18 +29,12 @@ under the License.
<packaging>war</packaging>
<build>
- <defaultGoal>package</defaultGoal>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.3.0</version>
+ <version>@version.maven-war-plugin@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/bugs/massembly-743/invoker.properties b/src/it/projects/bugs/massembly-743/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/bugs/massembly-743/invoker.properties
+++ b/src/it/projects/bugs/massembly-743/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/bugs/massembly-743/pom.xml b/src/it/projects/bugs/massembly-743/pom.xml
index 3f1fd748..74e0556f 100644
--- a/src/it/projects/bugs/massembly-743/pom.xml
+++ b/src/it/projects/bugs/massembly-743/pom.xml
@@ -41,7 +41,6 @@ under the License.
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<!-- The configuration of the plugin -->
<configuration>
<!-- Specifies the configuration file of the assembly plugin -->
diff --git a/src/it/projects/bugs/massembly-891/pom.xml b/src/it/projects/bugs/massembly-891/pom.xml
index ff26dc9b..e7cb8502 100644
--- a/src/it/projects/bugs/massembly-891/pom.xml
+++ b/src/it/projects/bugs/massembly-891/pom.xml
@@ -22,6 +22,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.apache.maven.plugins.assembly.it</groupId>
<artifactId>massembly891</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/src/it/projects/bugs/massembly-919/bundle/pom.xml b/src/it/projects/bugs/massembly-919/bundle/pom.xml
index 32e23024..4fe3fffd 100644
--- a/src/it/projects/bugs/massembly-919/bundle/pom.xml
+++ b/src/it/projects/bugs/massembly-919/bundle/pom.xml
@@ -49,7 +49,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
diff --git a/src/it/projects/bugs/massembly-919/pom.xml b/src/it/projects/bugs/massembly-919/pom.xml
index 3280f6f8..3dfbb7dd 100644
--- a/src/it/projects/bugs/massembly-919/pom.xml
+++ b/src/it/projects/bugs/massembly-919/pom.xml
@@ -21,6 +21,13 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>mygroup</groupId>
<artifactId>project2</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/src/it/projects/bugs/massembly-920/pom.xml b/src/it/projects/bugs/massembly-920/pom.xml
index e70f82ba..c0fe30a2 100644
--- a/src/it/projects/bugs/massembly-920/pom.xml
+++ b/src/it/projects/bugs/massembly-920/pom.xml
@@ -21,6 +21,13 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.apache.maven.plugins.assembly.its</groupId>
<artifactId>massembly-920</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/src/it/projects/bugs/massembly-956/pom.xml b/src/it/projects/bugs/massembly-956/pom.xml
index c25157ec..c15735f3 100644
--- a/src/it/projects/bugs/massembly-956/pom.xml
+++ b/src/it/projects/bugs/massembly-956/pom.xml
@@ -21,6 +21,13 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.apache.maven.plugins.assembly.its</groupId>
<artifactId>massembly-920</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/src/it/projects/bugs/massembly-964/pom.xml b/src/it/projects/bugs/massembly-964/pom.xml
index 4ba47b96..b4e659df 100644
--- a/src/it/projects/bugs/massembly-964/pom.xml
+++ b/src/it/projects/bugs/massembly-964/pom.xml
@@ -22,6 +22,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.apache.maven.plugins.assembly.it</groupId>
<artifactId>massembly964</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
index 7cd959a2..71818da8 100644
--- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
+++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
@@ -21,7 +21,13 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.test</groupId>
<version>1</version>
<artifactId>handler-def</artifactId>
diff --git a/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
index 7cd959a2..71818da8 100644
--- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
+++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
@@ -21,7 +21,13 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.test</groupId>
<version>1</version>
<artifactId>handler-def</artifactId>
diff --git a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
index 7cd959a2..71818da8 100644
--- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
+++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
@@ -21,7 +21,13 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.test</groupId>
<version>1</version>
<artifactId>handler-def</artifactId>
diff --git a/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties b/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
index 2da4fe64..6e45db42 100644
--- a/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
+++ b/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties b/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
+++ b/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties b/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
+++ b/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/dependency-sets/massembly-395/pom.xml b/src/it/projects/dependency-sets/massembly-395/pom.xml
index b383abff..0109d4d7 100644
--- a/src/it/projects/dependency-sets/massembly-395/pom.xml
+++ b/src/it/projects/dependency-sets/massembly-395/pom.xml
@@ -20,6 +20,13 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<packaging>pom</packaging>
@@ -44,26 +51,25 @@ under the License.
<module>child2</module>
</modules>
<build>
- <plugins>
- <plugin>
- <inherited>false</inherited>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/zip.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/zip.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/src/it/projects/dependency-sets/massembly-619/pom.xml b/src/it/projects/dependency-sets/massembly-619/pom.xml
index 7be510b0..7aec2422 100644
--- a/src/it/projects/dependency-sets/massembly-619/pom.xml
+++ b/src/it/projects/dependency-sets/massembly-619/pom.xml
@@ -20,6 +20,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<name>bug-test</name>
<groupId>com.example.assembly</groupId>
<artifactId>bug-test</artifactId>
@@ -42,7 +48,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<executions>
<execution>
<id>make-assembly</id>
diff --git a/src/it/projects/dependency-sets/massembly-675/pom.xml b/src/it/projects/dependency-sets/massembly-675/pom.xml
index 369030c8..020bc872 100644
--- a/src/it/projects/dependency-sets/massembly-675/pom.xml
+++ b/src/it/projects/dependency-sets/massembly-675/pom.xml
@@ -48,7 +48,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<executions>
<execution>
<id>assembly</id>
diff --git a/src/it/projects/dependency-sets/massembly-955/pom.xml b/src/it/projects/dependency-sets/massembly-955/pom.xml
index d50b121a..9e10e765 100644
--- a/src/it/projects/dependency-sets/massembly-955/pom.xml
+++ b/src/it/projects/dependency-sets/massembly-955/pom.xml
@@ -49,7 +49,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<executions>
<execution>
<id>assembly</id>
diff --git a/src/it/projects/dependency-sets/massembly-969/pom.xml b/src/it/projects/dependency-sets/massembly-969/pom.xml
index dd5d5431..25cf68d0 100644
--- a/src/it/projects/dependency-sets/massembly-969/pom.xml
+++ b/src/it/projects/dependency-sets/massembly-969/pom.xml
@@ -212,7 +212,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
<executions>
<execution>
<id>assembly</id>
diff --git a/src/it/projects/file-modes/file-set-fileMode/invoker.properties b/src/it/projects/file-modes/file-set-fileMode/invoker.properties
index d66d08a7..508ecfbd 100644
--- a/src/it/projects/file-modes/file-set-fileMode/invoker.properties
+++ b/src/it/projects/file-modes/file-set-fileMode/invoker.properties
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
invoker.os.family = !windows
diff --git a/src/it/projects/file-modes/fileItem-fileMode/invoker.properties b/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
index 2da4fe64..6e45db42 100644
--- a/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
+++ b/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/default-directory-unspecified/invoker.properties b/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
+++ b/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties b/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
+++ b/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties b/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
+++ b/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties b/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
+++ b/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/include-base-directory/invoker.properties b/src/it/projects/file-sets/include-base-directory/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/include-base-directory/invoker.properties
+++ b/src/it/projects/file-sets/include-base-directory/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/massembly-665/invoker.properties b/src/it/projects/file-sets/massembly-665/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/massembly-665/invoker.properties
+++ b/src/it/projects/file-sets/massembly-665/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/platformspecific-filesets/invoker.properties b/src/it/projects/file-sets/platformspecific-filesets/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/platformspecific-filesets/invoker.properties
+++ b/src/it/projects/file-sets/platformspecific-filesets/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/precedence-check/invoker.properties b/src/it/projects/file-sets/precedence-check/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/precedence-check/invoker.properties
+++ b/src/it/projects/file-sets/precedence-check/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/file-sets/use-default-excludes/invoker.properties b/src/it/projects/file-sets/use-default-excludes/invoker.properties
index 728079cb..2016fa42 100644
--- a/src/it/projects/file-sets/use-default-excludes/invoker.properties
+++ b/src/it/projects/file-sets/use-default-excludes/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties b/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
index 2da4fe64..6e45db42 100644
--- a/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
+++ b/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties b/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
index 2da4fe64..6e45db42 100644
--- a/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
+++ b/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/massembly-934_concat-files/invoker.properties b/src/it/projects/massembly-934_concat-files/invoker.properties
index 2da4fe64..6e45db42 100644
--- a/src/it/projects/massembly-934_concat-files/invoker.properties
+++ b/src/it/projects/massembly-934_concat-files/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml b/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
index 47cc494e..150068f3 100644
--- a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
+++ b/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
@@ -36,7 +36,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
+ <version>@project.version@</version>
<type>maven-plugin</type>
</dependency>
<dependency>
diff --git a/src/it/projects/multimodule/massembly-317/pom.xml b/src/it/projects/multimodule/massembly-317/pom.xml
index 01f26b80..cf6983d0 100644
--- a/src/it/projects/multimodule/massembly-317/pom.xml
+++ b/src/it/projects/multimodule/massembly-317/pom.xml
@@ -20,6 +20,13 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<packaging>pom</packaging>
@@ -44,26 +51,25 @@ under the License.
<module>child2</module>
</modules>
<build>
- <plugins>
- <plugin>
- <inherited>false</inherited>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/src/it/projects/multimodule/massembly-474/pom.xml b/src/it/projects/multimodule/massembly-474/pom.xml
index b83f35e5..75a96c3a 100644
--- a/src/it/projects/multimodule/massembly-474/pom.xml
+++ b/src/it/projects/multimodule/massembly-474/pom.xml
@@ -18,25 +18,19 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>maven-assembly-test</groupId>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>maven-assembly-test</groupId>
<artifactId>maven-assembly-test</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Mulitproject for testing assembly </description>
- <build>
- <defaultGoal>clean package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- </plugins>
-
- </build>
+
<modules>
<module>child-client</module>
<module>child-server</module>
diff --git a/src/it/projects/multimodule/massembly-619/pom.xml b/src/it/projects/multimodule/massembly-619/pom.xml
index 2d2d0955..74d4f71d 100644
--- a/src/it/projects/multimodule/massembly-619/pom.xml
+++ b/src/it/projects/multimodule/massembly-619/pom.xml
@@ -19,25 +19,19 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>maven-assembly-test</groupId>
<artifactId>maven-assembly-test</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Mulitproject for testing assembly</description>
- <build>
- <defaultGoal>clean package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- </plugins>
- </build>
<modules>
<module>child-client</module>
<module>descriptor</module>
diff --git a/src/it/projects/reproducible/invoker.properties b/src/it/projects/reproducible/invoker.properties
index cec67fc4..e9840ef3 100644
--- a/src/it/projects/reproducible/invoker.properties
+++ b/src/it/projects/reproducible/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single deploy:deploy
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single deploy:deploy