From 1a199c1556e8897259d88cefdd2a01128927c0b6 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sat, 11 Nov 2023 13:58:12 +0100 Subject: [PATCH] [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 +- .../invoker.properties | 2 +- .../file-copyIntoTopDir/invoker.properties | 2 +- .../file-sameName/invoker.properties | 2 +- .../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 ++- .../bugs/massembly-583/child1/pom.xml | 7 ++- .../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 +--- .../bugs/massembly-743/invoker.properties | 2 +- src/it/projects/bugs/massembly-743/pom.xml | 1 - src/it/projects/bugs/massembly-891/pom.xml | 6 +++ .../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 +- .../invoker.properties | 2 +- .../invoker.properties | 2 +- .../dependency-sets/massembly-395/pom.xml | 48 +++++++++++-------- .../dependency-sets/massembly-619/pom.xml | 7 ++- .../dependency-sets/massembly-675/pom.xml | 1 - .../dependency-sets/massembly-955/pom.xml | 1 - .../dependency-sets/massembly-969/pom.xml | 1 - .../file-set-fileMode/invoker.properties | 2 +- .../fileItem-fileMode/invoker.properties | 2 +- .../invoker.properties | 2 +- .../invoker.properties | 2 +- .../invoker.properties | 2 +- .../excluding-svn-dirs/invoker.properties | 2 +- .../include-base-directory/invoker.properties | 2 +- .../massembly-665/invoker.properties | 2 +- .../invoker.properties | 2 +- .../precedence-check/invoker.properties | 2 +- .../use-default-excludes/invoker.properties | 2 +- .../invoker.properties | 2 +- .../invoker.properties | 2 +- .../invoker.properties | 2 +- .../no-appendAssemblyId-no-classifier/pom.xml | 2 +- .../multimodule/massembly-317/pom.xml | 48 +++++++++++-------- .../multimodule/massembly-474/pom.xml | 24 ++++------ .../multimodule/massembly-619/pom.xml | 20 +++----- .../projects/reproducible/invoker.properties | 2 +- 63 files changed, 261 insertions(+), 143 deletions(-) diff --git a/pom.xml b/pom.xml index 84c032108..68777ec9a 100644 --- a/pom.xml +++ b/pom.xml @@ -365,7 +365,6 @@ under the License. run-its file://${project.build.testOutputDirectory}/remote-repository - ${project.version} @@ -374,9 +373,6 @@ under the License. org.apache.maven.plugins maven-invoker-plugin - - ${testVersion} - true diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml index 5d7157a63..7c588ae96 100644 --- a/src/it/it-project-parent/pom.xml +++ b/src/it/it-project-parent/pom.xml @@ -33,11 +33,36 @@ under the License. maven-assembly-plugin @project.version@ + + org.apache.maven.plugins + maven-clean-plugin + @version.maven-clean-plugin@ + + + org.apache.maven.plugins + maven-compiler-plugin + @version.maven-compiler-plugin@ + + + org.apache.maven.plugins + maven-deploy-plugin + @version.maven-deploy-plugin@ + org.apache.maven.plugins maven-jar-plugin @version.maven-jar-plugin@ + + org.apache.maven.plugins + maven-install-plugin + @version.maven-install-plugin@ + + + org.apache.maven.plugins + maven-resources-plugin + @version.maven-resources-plugin@ + org.apache.maven.plugins maven-surefire-plugin diff --git a/src/it/projects/basic-features/add-classpath/invoker.properties b/src/it/projects/basic-features/add-classpath/invoker.properties index 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 2da4fe64d..6e45db42b 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 2da4fe64d..6e45db42b 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 5e14cc437..5fedf674b 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. test test 1 - + + + @project.version@ + + 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 2da4fe64d..6e45db42b 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 d36034b14..b48a0d3bc 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"> 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + mygroup project2 0.0.1-SNAPSHOT - jar + jar maven-assembly-plugin - ${testVersion} assembly.xml diff --git a/src/it/projects/bugs/massembly-559/pom.xml b/src/it/projects/bugs/massembly-559/pom.xml index f9098d89b..b4707c57f 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. 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + test test-assembly-transitive-bug 0.0.1-SNAPSHOT @@ -37,7 +44,6 @@ under the License. org.apache.maven.plugins maven-assembly-plugin - ${testVersion} create-assembly diff --git a/src/it/projects/bugs/massembly-580/pom.xml b/src/it/projects/bugs/massembly-580/pom.xml index 0d3629030..74a172a97 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"> 4.0.0 + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + com.sulake.maven directory-mode-ignored 10-SNAPSHOT @@ -43,7 +49,6 @@ under the License. maven-assembly-plugin - ${testVersion} project-deploy false diff --git a/src/it/projects/bugs/massembly-583/child1/pom.xml b/src/it/projects/bugs/massembly-583/child1/pom.xml index 872c67ca5..7daf25a98 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"> 4.0.0 - mygroup + + mygroup + parent + 0.0.1-SNAPSHOT + + project1 0.0.1-SNAPSHOT diff --git a/src/it/projects/bugs/massembly-583/child2/pom.xml b/src/it/projects/bugs/massembly-583/child2/pom.xml index a8f32951d..394bb6b59 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"> 4.0.0 - mygroup + + mygroup + parent + 0.0.1-SNAPSHOT + + project2 0.0.1-SNAPSHOT @@ -45,7 +50,6 @@ under the License. maven-assembly-plugin - ${testVersion} src/main/assembly/assembly.xml diff --git a/src/it/projects/bugs/massembly-583/pom.xml b/src/it/projects/bugs/massembly-583/pom.xml index 8ffb0a5d8..865f7ab09 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"> 4.0.0 - + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + mygroup parent - 0.0.1 + 0.0.1-SNAPSHOT pom diff --git a/src/it/projects/bugs/massembly-730/pom.xml b/src/it/projects/bugs/massembly-730/pom.xml index d0949491e..c87a39f84 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"> 4.0.0 + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + fr.husta.test issue-mvn-assembly-plugin-730 0.0.1-SNAPSHOT @@ -39,8 +45,6 @@ under the License. maven-assembly-plugin - ${testVersion} - @@ -59,15 +63,9 @@ under the License. - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - org.apache.maven.plugins maven-surefire-plugin - 2.18 true diff --git a/src/it/projects/bugs/massembly-731/pom.xml b/src/it/projects/bugs/massembly-731/pom.xml index fd3f0dd04..520809dd6 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"> 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + mygroup project2 0.0.1-SNAPSHOT @@ -29,7 +36,6 @@ under the License. maven-assembly-plugin - ${testVersion} assembly.xml diff --git a/src/it/projects/bugs/massembly-732/pom.xml b/src/it/projects/bugs/massembly-732/pom.xml index 15b58f9bb..d48ac08d1 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"> 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + mygroup project2 0.0.1-SNAPSHOT - jar + jar maven-assembly-plugin - ${testVersion} assembly.xml diff --git a/src/it/projects/bugs/massembly-733/pom.xml b/src/it/projects/bugs/massembly-733/pom.xml index 04335529a..047b0180c 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. 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + localhost MASSEMBLY-733 1.0-SNAPSHOT @@ -31,7 +38,6 @@ under the License. org.apache.maven.plugins maven-assembly-plugin - ${testVersion} package diff --git a/src/it/projects/bugs/massembly-737/pom.xml b/src/it/projects/bugs/massembly-737/pom.xml index 85ec87a56..91d84a9a8 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. war - package - - org.apache.maven.plugins - maven-assembly-plugin - ${testVersion} - org.apache.maven.plugins maven-war-plugin - 3.3.0 + @version.maven-war-plugin@ diff --git a/src/it/projects/bugs/massembly-743/invoker.properties b/src/it/projects/bugs/massembly-743/invoker.properties index 728079cb1..2016fa42e 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 3f1fd7482..74e0556f4 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. true org.apache.maven.plugins maven-assembly-plugin - ${testVersion} diff --git a/src/it/projects/bugs/massembly-891/pom.xml b/src/it/projects/bugs/massembly-891/pom.xml index ff26dc9bb..e7cb8502d 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"> 4.0.0 + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + org.apache.maven.plugins.assembly.it massembly891 0.0.1-SNAPSHOT diff --git a/src/it/projects/bugs/massembly-919/bundle/pom.xml b/src/it/projects/bugs/massembly-919/bundle/pom.xml index 32e23024a..4fe3fffd9 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. maven-assembly-plugin - ${testVersion} assembly.xml diff --git a/src/it/projects/bugs/massembly-919/pom.xml b/src/it/projects/bugs/massembly-919/pom.xml index 3280f6f83..3dfbb7dd8 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"> 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + mygroup project2 0.0.1-SNAPSHOT diff --git a/src/it/projects/bugs/massembly-920/pom.xml b/src/it/projects/bugs/massembly-920/pom.xml index e70f82bad..c0fe30a2e 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"> 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + org.apache.maven.plugins.assembly.its massembly-920 0.0.1-SNAPSHOT diff --git a/src/it/projects/bugs/massembly-956/pom.xml b/src/it/projects/bugs/massembly-956/pom.xml index c25157ec8..c15735f36 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"> 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + org.apache.maven.plugins.assembly.its massembly-920 0.0.1-SNAPSHOT diff --git a/src/it/projects/bugs/massembly-964/pom.xml b/src/it/projects/bugs/massembly-964/pom.xml index 4ba47b96b..b4e659df6 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"> 4.0.0 + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + org.apache.maven.plugins.assembly.it massembly964 0.0.1-SNAPSHOT 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 7cd959a29..71818da83 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. 4.0.0 - + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + org.test 1 handler-def 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 7cd959a29..71818da83 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. 4.0.0 - + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + org.test 1 handler-def 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 7cd959a29..71818da83 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. 4.0.0 - + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + org.test 1 handler-def diff --git a/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties b/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties index 2da4fe64d..6e45db42b 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 b383abffc..0109d4d75 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. 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + com.mycompany.app my-app pom @@ -44,26 +51,25 @@ under the License. child2 - - - false - maven-assembly-plugin - ${testVersion} - - - src/main/assembly/zip.xml - - - - - make-assembly - package - - single - - - - - + + + false + maven-assembly-plugin + + + src/main/assembly/zip.xml + + + + + make-assembly + package + + single + + + + + diff --git a/src/it/projects/dependency-sets/massembly-619/pom.xml b/src/it/projects/dependency-sets/massembly-619/pom.xml index 7be510b04..7aec24220 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"> 4.0.0 + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + bug-test com.example.assembly bug-test @@ -42,7 +48,6 @@ under the License. maven-assembly-plugin - ${testVersion} make-assembly diff --git a/src/it/projects/dependency-sets/massembly-675/pom.xml b/src/it/projects/dependency-sets/massembly-675/pom.xml index 369030c84..020bc8726 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. maven-assembly-plugin - ${testVersion} assembly diff --git a/src/it/projects/dependency-sets/massembly-955/pom.xml b/src/it/projects/dependency-sets/massembly-955/pom.xml index d50b121ad..9e10e7659 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. maven-assembly-plugin - ${testVersion} assembly diff --git a/src/it/projects/dependency-sets/massembly-969/pom.xml b/src/it/projects/dependency-sets/massembly-969/pom.xml index dd5d5431b..25cf68d08 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. maven-assembly-plugin - ${testVersion} assembly 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 d66d08a7b..508ecfbd7 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 2da4fe64d..6e45db42b 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 728079cb1..2016fa42e 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 2da4fe64d..6e45db42b 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 2da4fe64d..6e45db42b 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 2da4fe64d..6e45db42b 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 47cc494e2..150068f3c 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. org.apache.maven.plugins maven-assembly-plugin - ${testVersion} + @project.version@ maven-plugin diff --git a/src/it/projects/multimodule/massembly-317/pom.xml b/src/it/projects/multimodule/massembly-317/pom.xml index 01f26b80b..cf6983d04 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. 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + com.mycompany.app my-app pom @@ -44,26 +51,25 @@ under the License. child2 - - - false - maven-assembly-plugin - ${testVersion} - - - assembly.xml - - - - - make-assembly - package - - single - - - - - + + + false + maven-assembly-plugin + + + assembly.xml + + + + + make-assembly + package + + single + + + + + diff --git a/src/it/projects/multimodule/massembly-474/pom.xml b/src/it/projects/multimodule/massembly-474/pom.xml index b83f35e5a..75a96c3a7 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. --> 4.0.0 - maven-assembly-test + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + + maven-assembly-test maven-assembly-test 0.0.1-SNAPSHOT pom Mulitproject for testing assembly - - clean package - - - - maven-assembly-plugin - ${testVersion} - - - - - - - + child-client child-server diff --git a/src/it/projects/multimodule/massembly-619/pom.xml b/src/it/projects/multimodule/massembly-619/pom.xml index 2d2d09554..74d4f71de 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. 4.0.0 + + + org.apache.maven.plugin.assembly.test + it-project-parent + 1 + + maven-assembly-test maven-assembly-test 0.0.1-SNAPSHOT pom Mulitproject for testing assembly - - clean package - - - - maven-assembly-plugin - ${testVersion} - - - - - - child-client descriptor diff --git a/src/it/projects/reproducible/invoker.properties b/src/it/projects/reproducible/invoker.properties index cec67fc46..e9840ef38 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