From a21b7dbf24dd79b0d36d02d8489aba93ffcaccef Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 15 Aug 2022 16:39:25 +0200 Subject: [PATCH] IT tests cleanup - add explicit version for plugin under test - don't use clean goal - invoker cleans during clone - reformat poms --- pom.xml | 1 - src/it/projects/bom-flattenMode/bom/pom.xml | 7 +- src/it/projects/bom-flattenMode/pom.xml | 23 +- src/it/projects/bom-pomElements/bom/pom.xml | 7 +- src/it/projects/bom-pomElements/pom.xml | 23 +- .../projects/cmd-property-substituion/pom.xml | 8 +- src/it/projects/complete-artifact-pom/pom.xml | 22 +- .../projects/complete-mavenplugin-pom/pom.xml | 20 +- .../module-with-parent/pom.xml | 2 +- .../module/pom.xml | 26 +- .../pom.xml | 229 +++++++++--------- .../module/pom.xml | 5 +- .../complete-multimodule-parent-pom/pom.xml | 22 +- src/it/projects/custom-packaging/pom.xml | 4 +- src/it/projects/external-parent/pom.xml | 28 +-- src/it/projects/fat-jar/pom.xml | 8 +- .../pom.xml | 6 +- .../flatten-dependency-all-classifier/pom.xml | 66 ++--- .../parent/pom.xml | 5 +- .../pom.xml | 6 +- .../pom.xml | 68 +++--- .../pom.xml | 94 +++---- .../pom.xml | 66 ++--- .../module-a/pom.xml | 31 +-- .../module-b/pom.xml | 31 +-- .../pom.xml | 78 +++--- .../pom.xml | 76 +++--- .../flatten-dependency-all-optional/pom.xml | 6 +- .../pom.xml | 54 +++-- .../pom.xml | 54 +++-- .../pom.xml | 52 ++-- .../pom.xml | 62 ++--- .../flatten-dependency-all-simple/pom.xml | 52 ++-- .../flatten-dependency-all-transitive/pom.xml | 52 ++-- src/it/projects/flatten-shaded-drp/pom.xml | 185 +++++++------- .../projects/gwt-sources-dependency/pom.xml | 7 +- .../inherit-parent-dependency/pom.xml | 9 +- .../pom.xml | 77 +++--- .../pom.xml | 4 +- .../projects/inherit-parent-profile/pom.xml | 13 +- src/it/projects/jdk-profile-active/pom.xml | 9 +- src/it/projects/jdk-profile-inactive/pom.xml | 11 +- .../projects/legacy-property-support/pom.xml | 10 +- .../no-overwrite-3.6.2-before/pom.xml | 11 +- .../projects/no-overwrite-3.6.3-later/pom.xml | 11 +- .../optional-elements-modeMinimum/pom.xml | 27 ++- .../optional-elements-modeOss/pom.xml | 25 +- .../optional-elements-modeOssrh/pom.xml | 25 +- .../pom.xml | 25 +- .../pom.xml | 11 +- .../parent/pom.xml | 3 +- .../os-profile-active-in-parent/pom.xml | 5 +- src/it/projects/os-profile-active/pom.xml | 5 +- src/it/projects/os-profile-inactive/pom.xml | 5 +- .../parent-with-version-range/pom.xml | 19 +- .../pom.xml | 3 +- .../profile-with-dependencies-active/pom.xml | 3 +- .../parent/pom.xml | 17 +- .../pom.xml | 7 +- .../pom.xml | 3 +- .../parent/pom.xml | 3 +- .../pom.xml | 5 +- .../pom.xml | 3 +- .../projects/profile-with-deps-import/pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../profile-with-properties-active/pom.xml | 5 +- .../profile-with-properties-inactive/pom.xml | 5 +- .../projects/property-profile-active/pom.xml | 3 +- .../property-profile-inactive/pom.xml | 3 +- .../projects/resolve-gav-properties/pom.xml | 11 +- .../resolve-projects-in-reactor/bom/pom.xml | 51 ++-- .../resolve-projects-in-reactor/jar/pom.xml | 42 ++-- .../resolve-projects-in-reactor/pom.xml | 18 +- .../pom.xml | 105 ++++---- src/it/projects/resolve-properties-ci/pom.xml | 121 ++++----- src/it/projects/resolve-properties/pom.xml | 11 +- .../setup-customarchive-maven-plugin/pom.xml | 4 +- .../system-scope-dep-variable/pom.xml | 97 ++++---- .../projects/test-scoped-dependency/pom.xml | 7 +- src/it/projects/transitive-dependency/pom.xml | 7 +- .../xml-header-comment-present/pom.xml | 5 +- 90 files changed, 1218 insertions(+), 1123 deletions(-) diff --git a/pom.xml b/pom.xml index fb52bfb3..35a1270f 100644 --- a/pom.xml +++ b/pom.xml @@ -251,7 +251,6 @@ ${project.build.directory}/it/interpolated-settings.xml - clean ${project.groupId}:${project.artifactId}:${project.version}:flatten -Drevision=1.2.3.4 src/it/projects diff --git a/src/it/projects/bom-flattenMode/bom/pom.xml b/src/it/projects/bom-flattenMode/bom/pom.xml index 7c8b24b8..2740179b 100644 --- a/src/it/projects/bom-flattenMode/bom/pom.xml +++ b/src/it/projects/bom-flattenMode/bom/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its @@ -8,7 +9,7 @@ bom pom ${bom.project.version} - + @@ -79,5 +80,5 @@ - + diff --git a/src/it/projects/bom-flattenMode/pom.xml b/src/it/projects/bom-flattenMode/pom.xml index b0192990..0563adf4 100644 --- a/src/it/projects/bom-flattenMode/pom.xml +++ b/src/it/projects/bom-flattenMode/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -12,7 +12,7 @@ 4.0.8.RELEASE 0.9.1-beta1 - + verify @@ -20,6 +20,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ true bom @@ -45,7 +46,7 @@ dep 1.1 - + This project contains a module with a BOM. @@ -77,7 +78,7 @@ bom - + Codehaus @@ -87,7 +88,7 @@ parent-depMngt 2 - + none @@ -99,17 +100,17 @@ 3.0 - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org - \ No newline at end of file + diff --git a/src/it/projects/bom-pomElements/bom/pom.xml b/src/it/projects/bom-pomElements/bom/pom.xml index 7c8b24b8..2740179b 100644 --- a/src/it/projects/bom-pomElements/bom/pom.xml +++ b/src/it/projects/bom-pomElements/bom/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its @@ -8,7 +9,7 @@ bom pom ${bom.project.version} - + @@ -79,5 +80,5 @@ - + diff --git a/src/it/projects/bom-pomElements/pom.xml b/src/it/projects/bom-pomElements/pom.xml index 3e926660..e105d854 100644 --- a/src/it/projects/bom-pomElements/pom.xml +++ b/src/it/projects/bom-pomElements/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -12,7 +12,7 @@ 4.0.8.RELEASE 0.9.1-beta1 - + verify @@ -20,6 +20,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ true @@ -47,7 +48,7 @@ dep 1.1 - + This project contains a module with a BOM. @@ -79,7 +80,7 @@ bom - + Codehaus @@ -89,7 +90,7 @@ parent-depMngt 2 - + none @@ -101,17 +102,17 @@ 3.0 - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org - \ No newline at end of file + diff --git a/src/it/projects/cmd-property-substituion/pom.xml b/src/it/projects/cmd-property-substituion/pom.xml index a57095e9..a21dcbea 100644 --- a/src/it/projects/cmd-property-substituion/pom.xml +++ b/src/it/projects/cmd-property-substituion/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its @@ -6,7 +7,7 @@ 0.0.1-SNAPSHOT ${cmd.test.property} - FallbackDefaultValue + FallbackDefaultValue verify @@ -14,10 +15,11 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ oss - \ No newline at end of file + diff --git a/src/it/projects/complete-artifact-pom/pom.xml b/src/it/projects/complete-artifact-pom/pom.xml index fe949093..437ef089 100644 --- a/src/it/projects/complete-artifact-pom/pom.xml +++ b/src/it/projects/complete-artifact-pom/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -22,7 +22,7 @@ This project contains only required ignorable elements - + @@ -30,7 +30,7 @@ dep 1.1 - + @@ -70,7 +70,7 @@ parent-depMngt 2 - + none @@ -81,22 +81,22 @@ 3.0 - + value - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org - \ No newline at end of file + diff --git a/src/it/projects/complete-mavenplugin-pom/pom.xml b/src/it/projects/complete-mavenplugin-pom/pom.xml index c28826eb..a9827332 100644 --- a/src/it/projects/complete-mavenplugin-pom/pom.xml +++ b/src/it/projects/complete-mavenplugin-pom/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -9,7 +9,7 @@ 3.0 - + @@ -35,7 +35,7 @@ dep 1.1 - + @@ -75,7 +75,7 @@ parent-depMngt 2 - + none @@ -86,17 +86,17 @@ value - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org - \ No newline at end of file + diff --git a/src/it/projects/complete-multimodule-parent-pom-cifriendly/module-with-parent/pom.xml b/src/it/projects/complete-multimodule-parent-pom-cifriendly/module-with-parent/pom.xml index 47d9c4b6..15389e29 100644 --- a/src/it/projects/complete-multimodule-parent-pom-cifriendly/module-with-parent/pom.xml +++ b/src/it/projects/complete-multimodule-parent-pom-cifriendly/module-with-parent/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its multimodule-module-with-parent-cifriendly diff --git a/src/it/projects/complete-multimodule-parent-pom-cifriendly/module/pom.xml b/src/it/projects/complete-multimodule-parent-pom-cifriendly/module/pom.xml index 1291c797..01e8a8ff 100644 --- a/src/it/projects/complete-multimodule-parent-pom-cifriendly/module/pom.xml +++ b/src/it/projects/complete-multimodule-parent-pom-cifriendly/module/pom.xml @@ -1,17 +1,17 @@ - 4.0.0 - org.codehaus.mojo.flatten.its - multimodule-module-cifriendly - ${revision} + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.codehaus.mojo.flatten.its + multimodule-module-cifriendly + ${revision} - - - org.codehaus.mojo.flatten.its - dep - ${revision} - - + + + org.codehaus.mojo.flatten.its + dep + ${revision} + + - \ No newline at end of file + diff --git a/src/it/projects/complete-multimodule-parent-pom-cifriendly/pom.xml b/src/it/projects/complete-multimodule-parent-pom-cifriendly/pom.xml index 9c7aad92..b1f1685b 100644 --- a/src/it/projects/complete-multimodule-parent-pom-cifriendly/pom.xml +++ b/src/it/projects/complete-multimodule-parent-pom-cifriendly/pom.xml @@ -1,117 +1,118 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - complete-multimodule-parent-pom-cifriendly - ${revision} - pom - - - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - resolveCiFriendliesOnly - - - - - - - http://localhost - - - - - Robert Scholte - - - - - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - - - - This project contains only required, pom specific and ignorable elements - - - - hohwille - Jörg Hohwiller - - - - - http://mojo.codehaus.org/downloads - - - 2014 - - - jira - http://jira.codehaus.org/browse/MOJO - - - - - announce - - - - - module - module-with-parent - - - Complete POM - - Codehaus - - - - org.codehaus.mojo.flatten.its - parent-depMngt - 2 - - - - - none - @repository.proxy.url@ - - - - - - 3.0 - - - - - 1.2.3.0 - - value - - - - target/site - - - - - - http://svn.codehaus.org/mojo - - - http://mojo.codehaus.org + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + 4.0.0 + org.codehaus.mojo.flatten.its + complete-multimodule-parent-pom-cifriendly + ${revision} + pom + + + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + resolveCiFriendliesOnly + + + + + + + http://localhost + + + + + Robert Scholte + + + + + + + org.codehaus.mojo.flatten.its + dep + 1.1 + + + + + This project contains only required, pom specific and ignorable elements + + + + hohwille + Jörg Hohwiller + + + + + http://mojo.codehaus.org/downloads + + + 2014 + + + jira + http://jira.codehaus.org/browse/MOJO + + + + + announce + + + + + module + module-with-parent + + + Complete POM + + Codehaus + + + + org.codehaus.mojo.flatten.its + parent-depMngt + 2 + + + + + none + @repository.proxy.url@ + + + + + + 3.0 + + + + + 1.2.3.0 + + value + + + + target/site + + + + + + http://svn.codehaus.org/mojo + + + http://mojo.codehaus.org diff --git a/src/it/projects/complete-multimodule-parent-pom/module/pom.xml b/src/it/projects/complete-multimodule-parent-pom/module/pom.xml index 510864d1..95a65028 100644 --- a/src/it/projects/complete-multimodule-parent-pom/module/pom.xml +++ b/src/it/projects/complete-multimodule-parent-pom/module/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 org.codehaus.mojo.flatten.its multimodule-module 0.0.1-SNAPSHOT - \ No newline at end of file + diff --git a/src/it/projects/complete-multimodule-parent-pom/pom.xml b/src/it/projects/complete-multimodule-parent-pom/pom.xml index ae7ea07b..9a408f80 100644 --- a/src/it/projects/complete-multimodule-parent-pom/pom.xml +++ b/src/it/projects/complete-multimodule-parent-pom/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -29,7 +29,7 @@ dep 1.1 - + This project contains only required, pom specific and ignorable elements @@ -61,7 +61,7 @@ module - + Complete POM Codehaus @@ -72,7 +72,7 @@ parent-depMngt 2 - + none @@ -83,22 +83,22 @@ 3.0 - + value - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org - \ No newline at end of file + diff --git a/src/it/projects/custom-packaging/pom.xml b/src/it/projects/custom-packaging/pom.xml index c8e36016..a73a0c7b 100644 --- a/src/it/projects/custom-packaging/pom.xml +++ b/src/it/projects/custom-packaging/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/src/it/projects/external-parent/pom.xml b/src/it/projects/external-parent/pom.xml index f91dd750..d1b2c63f 100644 --- a/src/it/projects/external-parent/pom.xml +++ b/src/it/projects/external-parent/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -14,7 +14,7 @@ http://localhost - + Robert Scholte @@ -32,7 +32,7 @@ - test + test org.springframework.boot @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ dep 1.1 - + @@ -83,14 +83,14 @@ Codehaus - + none @repository.proxy.url@ - + no-one @@ -101,22 +101,22 @@ 3.0 - + value - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org - \ No newline at end of file + diff --git a/src/it/projects/fat-jar/pom.xml b/src/it/projects/fat-jar/pom.xml index 248bc85e..5e92b9f6 100644 --- a/src/it/projects/fat-jar/pom.xml +++ b/src/it/projects/fat-jar/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its @@ -27,7 +28,7 @@ - test2 + test2 org.codehaus.mojo.flatten.its @@ -42,10 +43,11 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ fatjar - \ No newline at end of file + diff --git a/src/it/projects/flatten-dependency-all-both-test-and-transitive/pom.xml b/src/it/projects/flatten-dependency-all-both-test-and-transitive/pom.xml index 8ca9f3a6..557e58e2 100644 --- a/src/it/projects/flatten-dependency-all-both-test-and-transitive/pom.xml +++ b/src/it/projects/flatten-dependency-all-both-test-and-transitive/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its flatten-dependency-all-both-test-and-transitive @@ -10,6 +11,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ oss all @@ -32,4 +34,4 @@ test - \ No newline at end of file + diff --git a/src/it/projects/flatten-dependency-all-classifier/pom.xml b/src/it/projects/flatten-dependency-all-classifier/pom.xml index 8c91e6e2..33f8df7d 100644 --- a/src/it/projects/flatten-dependency-all-classifier/pom.xml +++ b/src/it/projects/flatten-dependency-all-classifier/pom.xml @@ -1,34 +1,36 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-classifier - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-classifier + 0.0.1-SNAPSHOT - - - org.codehaus.mojo.flatten.its - dep - 1.1 - testlib - test - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - + + + org.codehaus.mojo.flatten.its + dep + 1.1 + testlib + test + + + org.codehaus.mojo.flatten.its + dep + 1.1 + + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-optional/parent/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-optional/parent/pom.xml index f45e910c..99fe1c23 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-optional/parent/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-optional/parent/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its flatten-dependency-all-depmgnt-optional-parent @@ -20,4 +21,4 @@ - \ No newline at end of file + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-optional/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-optional/pom.xml index 7eed0968..a8b35a7b 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-optional/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-optional/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its flatten-dependency-all-depmgnt-optional @@ -16,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ all @@ -30,4 +32,4 @@ true - \ No newline at end of file + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-provided-transitive/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-provided-transitive/pom.xml index 309ce9d3..abf3f5a0 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-provided-transitive/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-provided-transitive/pom.xml @@ -1,37 +1,39 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-depmgnt-provided-transitive - 0.0.1-SNAPSHOT - - - - - org.codehaus.mojo.flatten.its - dep - 1.1 - provided - - - + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-depmgnt-provided-transitive + 0.0.1-SNAPSHOT + - - org.codehaus.mojo.flatten.its - parent-deps - 1 - + + org.codehaus.mojo.flatten.its + dep + 1.1 + provided + + + + + + org.codehaus.mojo.flatten.its + parent-deps + 1 + + - - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-resolution-order-transitive/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-resolution-order-transitive/pom.xml index eda2d4de..2e77872d 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-resolution-order-transitive/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-resolution-order-transitive/pom.xml @@ -1,50 +1,52 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-depmgnt-transitive - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-depmgnt-transitive + 0.0.1-SNAPSHOT + + + org.codehaus.mojo.flatten.its + core + + + org.codehaus.mojo.flatten.its + core1 + + + + - - org.codehaus.mojo.flatten.its - core - - - org.codehaus.mojo.flatten.its - core1 - + + org.codehaus.mojo.flatten.its + core + 3.2.1 + + + org.codehaus.mojo.flatten.its + core1 + 5.2.6 + + + org.codehaus.mojo.flatten.its + dep + 1.1 + + - - - - org.codehaus.mojo.flatten.its - core - 3.2.1 - - - org.codehaus.mojo.flatten.its - core1 - 5.2.6 - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - - - - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-simple/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-simple/pom.xml index eeceafcc..e318e637 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-simple/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-simple/pom.xml @@ -1,36 +1,38 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-depmgnt-simple - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-depmgnt-simple + 0.0.1-SNAPSHOT + + + org.codehaus.mojo.flatten.its + dep + + + + - - org.codehaus.mojo.flatten.its - dep - + + org.codehaus.mojo.flatten.its + dep + 1.1 + + - - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - - - - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/module-a/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/module-a/pom.xml index e16855ce..4beda31e 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/module-a/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/module-a/pom.xml @@ -1,20 +1,21 @@ - - 4.0.0 + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-depmgnt-transitive-complex-module-a + 0.0.1-SNAPSHOT + + org.codehaus.mojo.flatten.its - flatten-dependency-depmgnt-transitive-complex-module-a + flatten-dependency-all-depmgnt-transitive-complex 0.0.1-SNAPSHOT + - - org.codehaus.mojo.flatten.its - flatten-dependency-all-depmgnt-transitive-complex - 0.0.1-SNAPSHOT - - - - - org.codehaus.mojo.flatten.its - core - - + + + org.codehaus.mojo.flatten.its + core + + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/module-b/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/module-b/pom.xml index 911fcc53..97ee2b0e 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/module-b/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/module-b/pom.xml @@ -1,20 +1,21 @@ - - 4.0.0 + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-depmgnt-transitive-complex-module-b + 0.0.1-SNAPSHOT + + org.codehaus.mojo.flatten.its - flatten-dependency-depmgnt-transitive-complex-module-b + flatten-dependency-all-depmgnt-transitive-complex 0.0.1-SNAPSHOT + - - org.codehaus.mojo.flatten.its - flatten-dependency-all-depmgnt-transitive-complex - 0.0.1-SNAPSHOT - - - - - org.codehaus.mojo.flatten.its - dep - - + + + org.codehaus.mojo.flatten.its + dep + + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/pom.xml index f5819726..18728dcc 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-transitive-complex/pom.xml @@ -1,41 +1,43 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-depmgnt-transitive-complex - 0.0.1-SNAPSHOT - pom + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-depmgnt-transitive-complex + 0.0.1-SNAPSHOT + pom - - module-a - module-b - + + module-a + module-b + - - - - org.codehaus.mojo.flatten.its - core - 3.2.1 - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - - + + + + org.codehaus.mojo.flatten.its + core + 3.2.1 + + + org.codehaus.mojo.flatten.its + dep + 1.1 + + + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - bom - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + bom + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-depmgnt-transitive/pom.xml b/src/it/projects/flatten-dependency-all-depmgnt-transitive/pom.xml index 65784f8b..23832974 100644 --- a/src/it/projects/flatten-dependency-all-depmgnt-transitive/pom.xml +++ b/src/it/projects/flatten-dependency-all-depmgnt-transitive/pom.xml @@ -1,41 +1,43 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-depmgnt-transitive - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-depmgnt-transitive + 0.0.1-SNAPSHOT + + + org.codehaus.mojo.flatten.its + core + + + + - - org.codehaus.mojo.flatten.its - core - + + org.codehaus.mojo.flatten.its + core + 3.2.1 + + + org.codehaus.mojo.flatten.its + dep + 1.1 + + - - - - org.codehaus.mojo.flatten.its - core - 3.2.1 - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - - - - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-optional/pom.xml b/src/it/projects/flatten-dependency-all-optional/pom.xml index 0aedb441..cff15f7e 100644 --- a/src/it/projects/flatten-dependency-all-optional/pom.xml +++ b/src/it/projects/flatten-dependency-all-optional/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its flatten-dependency-all-optional @@ -10,6 +11,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ all @@ -25,4 +27,4 @@ true - \ No newline at end of file + diff --git a/src/it/projects/flatten-dependency-all-provided-children/pom.xml b/src/it/projects/flatten-dependency-all-provided-children/pom.xml index 152ad6e9..953ed253 100644 --- a/src/it/projects/flatten-dependency-all-provided-children/pom.xml +++ b/src/it/projects/flatten-dependency-all-provided-children/pom.xml @@ -1,28 +1,30 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-depmgnt-provided-transitive - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-depmgnt-provided-transitive + 0.0.1-SNAPSHOT - - - org.codehaus.mojo.flatten.its - parent-deps - 1 - provided - - + + + org.codehaus.mojo.flatten.its + parent-deps + 1 + provided + + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-provided-direct/pom.xml b/src/it/projects/flatten-dependency-all-provided-direct/pom.xml index 246d3976..a1eaee4f 100644 --- a/src/it/projects/flatten-dependency-all-provided-direct/pom.xml +++ b/src/it/projects/flatten-dependency-all-provided-direct/pom.xml @@ -1,28 +1,30 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-provided-direct - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-provided-direct + 0.0.1-SNAPSHOT - - - org.codehaus.mojo.flatten.its - dep - 1.1 - provided - - + + + org.codehaus.mojo.flatten.its + dep + 1.1 + provided + + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-provided-transitive/pom.xml b/src/it/projects/flatten-dependency-all-provided-transitive/pom.xml index 05fb4f2d..a4daa2ae 100644 --- a/src/it/projects/flatten-dependency-all-provided-transitive/pom.xml +++ b/src/it/projects/flatten-dependency-all-provided-transitive/pom.xml @@ -1,27 +1,29 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-provided-transitive - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-provided-transitive + 0.0.1-SNAPSHOT - - - org.codehaus.mojo.flatten.its - parent-deps - 1.1 - - + + + org.codehaus.mojo.flatten.its + parent-deps + 1.1 + + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-resolution-order/pom.xml b/src/it/projects/flatten-dependency-all-resolution-order/pom.xml index 8be6fbd3..00880fe4 100644 --- a/src/it/projects/flatten-dependency-all-resolution-order/pom.xml +++ b/src/it/projects/flatten-dependency-all-resolution-order/pom.xml @@ -1,32 +1,34 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-resolution-order - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-resolution-order + 0.0.1-SNAPSHOT - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - - org.codehaus.mojo.flatten.its - test - 2.0 - - + + + org.codehaus.mojo.flatten.its + dep + 1.1 + + + org.codehaus.mojo.flatten.its + test + 2.0 + + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-simple/pom.xml b/src/it/projects/flatten-dependency-all-simple/pom.xml index 6bf00456..0891c368 100644 --- a/src/it/projects/flatten-dependency-all-simple/pom.xml +++ b/src/it/projects/flatten-dependency-all-simple/pom.xml @@ -1,27 +1,29 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-simple - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-simple + 0.0.1-SNAPSHOT - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - + + + org.codehaus.mojo.flatten.its + dep + 1.1 + + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-dependency-all-transitive/pom.xml b/src/it/projects/flatten-dependency-all-transitive/pom.xml index 9c32e71d..e0ad9d5f 100644 --- a/src/it/projects/flatten-dependency-all-transitive/pom.xml +++ b/src/it/projects/flatten-dependency-all-transitive/pom.xml @@ -1,27 +1,29 @@ - - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-dependency-all-transitive - 0.0.1-SNAPSHOT + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-dependency-all-transitive + 0.0.1-SNAPSHOT - - - org.codehaus.mojo.flatten.its - core - 3.2.1 - - + + + org.codehaus.mojo.flatten.its + core + 3.2.1 + + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - all - - - - - \ No newline at end of file + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + all + + + + + diff --git a/src/it/projects/flatten-shaded-drp/pom.xml b/src/it/projects/flatten-shaded-drp/pom.xml index b604813e..da0d7efc 100644 --- a/src/it/projects/flatten-shaded-drp/pom.xml +++ b/src/it/projects/flatten-shaded-drp/pom.xml @@ -1,105 +1,106 @@ - 4.0.0 - org.codehaus.mojo.flatten.its - flatten-shaded-drp - 0.0.1${rev}-SNAPSHOT + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-shaded-drp + 0.0.1${rev}-SNAPSHOT - - 3.2.1 - - 1.8 - 1.8 - + + 3.2.1 + + 1.8 + 1.8 + - - - com.google.guava - guava - 31.1-jre - - - org.apache.maven - maven-archiver - 3.6.0 - - + + + com.google.guava + guava + 31.1-jre + + + org.apache.maven + maven-archiver + 3.6.0 + + - - package + + package - - - org.codehaus.mojo - flatten-maven-plugin - - true - ossrh - true - - - - flatten - prepare-package - - flatten - - - - + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + true + ossrh + true + + + + flatten + prepare-package + + flatten + + + + - - org.apache.maven.plugins - maven-shade-plugin - 3.3.0 - - true - true - - - com.google.guava:* - - - - - - shade - package - - shade - - - - - - + + org.apache.maven.plugins + maven-shade-plugin + 3.3.0 + + true + true + + + com.google.guava:* + + + + + + shade + package + + shade + + + + + + - - - - foo - - - willNotBeActive - - + + + + foo + + + willNotBeActive + + - - - org.codehaus.mojo.flatten.its - core - ${flatten.its.version} - - - - + + + org.codehaus.mojo.flatten.its + core + ${flatten.its.version} + + + + - - - no-one - @repository.proxy.url@ - - + + + no-one + @repository.proxy.url@ + + diff --git a/src/it/projects/gwt-sources-dependency/pom.xml b/src/it/projects/gwt-sources-dependency/pom.xml index 0cd77699..708ec913 100644 --- a/src/it/projects/gwt-sources-dependency/pom.xml +++ b/src/it/projects/gwt-sources-dependency/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.codehaus.mojo.flatten.its gwt-sources-dependency @@ -18,5 +19,5 @@ sources - - \ No newline at end of file + + diff --git a/src/it/projects/inherit-parent-dependency/pom.xml b/src/it/projects/inherit-parent-dependency/pom.xml index be61c0f3..8f352505 100644 --- a/src/it/projects/inherit-parent-dependency/pom.xml +++ b/src/it/projects/inherit-parent-dependency/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 - + org.codehaus.mojo.flatten.its parent-deps @@ -8,5 +9,5 @@ resolve-properties 0.0.1-SNAPSHOT - - \ No newline at end of file + + diff --git a/src/it/projects/inherit-parent-dependencyManagement-cifriendly/pom.xml b/src/it/projects/inherit-parent-dependencyManagement-cifriendly/pom.xml index c22e64f1..68bdef9a 100644 --- a/src/it/projects/inherit-parent-dependencyManagement-cifriendly/pom.xml +++ b/src/it/projects/inherit-parent-dependencyManagement-cifriendly/pom.xml @@ -1,42 +1,43 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.codehaus.mojo.flatten.its - parent-depMngt-properties - 2 - - inherit-parent-dependencyManagement-cifriendly - ${revision} - - - 2.0 - + + org.codehaus.mojo.flatten.its + parent-depMngt-properties + 2 + + inherit-parent-dependencyManagement-cifriendly + ${revision} - - - org.codehaus.mojo.flatten.its - dep - - - org.codehaus.mojo.flatten.its - test - ${test.version} - test - - + + 2.0 + - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - resolveCiFriendliesOnly - - - - - \ No newline at end of file + + + org.codehaus.mojo.flatten.its + dep + + + org.codehaus.mojo.flatten.its + test + ${test.version} + test + + + + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + resolveCiFriendliesOnly + + + + + diff --git a/src/it/projects/inherit-parent-dependencyManagement/pom.xml b/src/it/projects/inherit-parent-dependencyManagement/pom.xml index e1661faf..5d8f562d 100644 --- a/src/it/projects/inherit-parent-dependencyManagement/pom.xml +++ b/src/it/projects/inherit-parent-dependencyManagement/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -16,4 +16,4 @@ dep - \ No newline at end of file + diff --git a/src/it/projects/inherit-parent-profile/pom.xml b/src/it/projects/inherit-parent-profile/pom.xml index 60e11ee4..3bb8b52a 100644 --- a/src/it/projects/inherit-parent-profile/pom.xml +++ b/src/it/projects/inherit-parent-profile/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 - + org.codehaus.mojo.flatten.its parent-profile @@ -8,7 +9,7 @@ inherit-parent-profile 0.0.1-SNAPSHOT - + myprofile @@ -24,7 +25,7 @@ - + - - \ No newline at end of file + + diff --git a/src/it/projects/jdk-profile-active/pom.xml b/src/it/projects/jdk-profile-active/pom.xml index 10c3cc95..7f3d2332 100644 --- a/src/it/projects/jdk-profile-active/pom.xml +++ b/src/it/projects/jdk-profile-active/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.codehaus.mojo.flatten.its jdk-profile-active 0.0.1-SNAPSHOT - + jdk @@ -18,5 +19,5 @@ - - \ No newline at end of file + + diff --git a/src/it/projects/jdk-profile-inactive/pom.xml b/src/it/projects/jdk-profile-inactive/pom.xml index 858920dd..125e7901 100644 --- a/src/it/projects/jdk-profile-inactive/pom.xml +++ b/src/it/projects/jdk-profile-inactive/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.codehaus.mojo.flatten.its jdk-profile-inactive 0.0.1-SNAPSHOT - + jdk @@ -23,7 +24,7 @@ @repository.proxy.url@ - + verify @@ -57,5 +58,5 @@ - - \ No newline at end of file + + diff --git a/src/it/projects/legacy-property-support/pom.xml b/src/it/projects/legacy-property-support/pom.xml index e6e5e830..e4d74ea0 100644 --- a/src/it/projects/legacy-property-support/pom.xml +++ b/src/it/projects/legacy-property-support/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 org.codehaus.mojo.flatten.its legacy-property-support 0.0.1-SNAPSHOT ${artifactId} - + org.codehaus.mojo flatten-maven-plugin + @project.version@ resolve @@ -19,5 +21,5 @@ - - \ No newline at end of file + + diff --git a/src/it/projects/no-overwrite-3.6.2-before/pom.xml b/src/it/projects/no-overwrite-3.6.2-before/pom.xml index 136905a7..24074863 100644 --- a/src/it/projects/no-overwrite-3.6.2-before/pom.xml +++ b/src/it/projects/no-overwrite-3.6.2-before/pom.xml @@ -1,13 +1,14 @@ - + 4.0.0 org.codehaus.mojo.flatten.its resolve-properties 0.0.1-SNAPSHOT - + 1.1 - + org.codehaus.mojo.flatten.its @@ -15,5 +16,5 @@ ${depVersion} - - \ No newline at end of file + + diff --git a/src/it/projects/no-overwrite-3.6.3-later/pom.xml b/src/it/projects/no-overwrite-3.6.3-later/pom.xml index 136905a7..24074863 100644 --- a/src/it/projects/no-overwrite-3.6.3-later/pom.xml +++ b/src/it/projects/no-overwrite-3.6.3-later/pom.xml @@ -1,13 +1,14 @@ - + 4.0.0 org.codehaus.mojo.flatten.its resolve-properties 0.0.1-SNAPSHOT - + 1.1 - + org.codehaus.mojo.flatten.its @@ -15,5 +16,5 @@ ${depVersion} - - \ No newline at end of file + + diff --git a/src/it/projects/optional-elements-modeMinimum/pom.xml b/src/it/projects/optional-elements-modeMinimum/pom.xml index 43e4039f..01d70978 100644 --- a/src/it/projects/optional-elements-modeMinimum/pom.xml +++ b/src/it/projects/optional-elements-modeMinimum/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -13,6 +13,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ minimum @@ -23,7 +24,7 @@ http://localhost - + Robert Scholte @@ -31,7 +32,7 @@ This project contains only required ignorable elements - + @@ -39,7 +40,7 @@ dep 1.1 - + @@ -78,14 +79,14 @@ parent-depMngt 2 - + none @repository.proxy.url@ - + no-one @@ -96,22 +97,22 @@ 3.0 - + value - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org - \ No newline at end of file + diff --git a/src/it/projects/optional-elements-modeOss/pom.xml b/src/it/projects/optional-elements-modeOss/pom.xml index 6dce2349..4f2b3586 100644 --- a/src/it/projects/optional-elements-modeOss/pom.xml +++ b/src/it/projects/optional-elements-modeOss/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -13,6 +13,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ oss @@ -23,7 +24,7 @@ http://localhost - + Robert Scholte @@ -31,7 +32,7 @@ This project contains only required ignorable elements - + @@ -39,7 +40,7 @@ dep 1.1 - + @@ -78,14 +79,14 @@ parent-depMngt 2 - + none @repository.proxy.url@ - + no-one @@ -96,22 +97,22 @@ 3.0 - + value - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org diff --git a/src/it/projects/optional-elements-modeOssrh/pom.xml b/src/it/projects/optional-elements-modeOssrh/pom.xml index 59c0a274..ba7e7bd9 100644 --- a/src/it/projects/optional-elements-modeOssrh/pom.xml +++ b/src/it/projects/optional-elements-modeOssrh/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -13,6 +13,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ ossrh @@ -23,7 +24,7 @@ http://localhost - + Robert Scholte @@ -31,7 +32,7 @@ This project contains only required ignorable elements - + @@ -39,7 +40,7 @@ dep 1.1 - + @@ -78,14 +79,14 @@ parent-depMngt 2 - + none @repository.proxy.url@ - + no-one @@ -96,22 +97,22 @@ 3.0 - + value - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org diff --git a/src/it/projects/optional-elements-pomElements-legacy/pom.xml b/src/it/projects/optional-elements-pomElements-legacy/pom.xml index cc20bf35..717e505a 100644 --- a/src/it/projects/optional-elements-pomElements-legacy/pom.xml +++ b/src/it/projects/optional-elements-pomElements-legacy/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its @@ -13,6 +13,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ @@ -38,7 +39,7 @@ http://localhost - + Robert Scholte @@ -46,7 +47,7 @@ This project contains only required ignorable elements - + @@ -54,7 +55,7 @@ dep 1.1 - + @@ -93,14 +94,14 @@ parent-depMngt 2 - + none @repository.proxy.url@ - + no-one @@ -111,22 +112,22 @@ 3.0 - + value - + target/site - + - + http://svn.codehaus.org/mojo - - + + http://mojo.codehaus.org diff --git a/src/it/projects/optional-elements-pomElements-suggested/pom.xml b/src/it/projects/optional-elements-pomElements-suggested/pom.xml index 805351ad..663bcbfe 100644 --- a/src/it/projects/optional-elements-pomElements-suggested/pom.xml +++ b/src/it/projects/optional-elements-pomElements-suggested/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -21,12 +21,12 @@ ${key} - - + + 42${key}42 - + ${key} @@ -42,7 +42,7 @@ 2.0 - + @@ -51,6 +51,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ keep diff --git a/src/it/projects/os-profile-active-in-parent/parent/pom.xml b/src/it/projects/os-profile-active-in-parent/parent/pom.xml index 58da702b..718702fc 100644 --- a/src/it/projects/os-profile-active-in-parent/parent/pom.xml +++ b/src/it/projects/os-profile-active-in-parent/parent/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its os-profile-active-in-parent_parent diff --git a/src/it/projects/os-profile-active-in-parent/pom.xml b/src/it/projects/os-profile-active-in-parent/pom.xml index ab1b7aa4..91f89c86 100644 --- a/src/it/projects/os-profile-active-in-parent/pom.xml +++ b/src/it/projects/os-profile-active-in-parent/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its os-profile-active-in-parent @@ -10,4 +11,4 @@ 0.0.1-SNAPSHOT parent - \ No newline at end of file + diff --git a/src/it/projects/os-profile-active/pom.xml b/src/it/projects/os-profile-active/pom.xml index 5e26a48b..c23eeca9 100644 --- a/src/it/projects/os-profile-active/pom.xml +++ b/src/it/projects/os-profile-active/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its os-profile-active @@ -21,4 +22,4 @@ - + diff --git a/src/it/projects/os-profile-inactive/pom.xml b/src/it/projects/os-profile-inactive/pom.xml index d6303b7e..8d804956 100644 --- a/src/it/projects/os-profile-inactive/pom.xml +++ b/src/it/projects/os-profile-inactive/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its os-profile-active @@ -21,4 +22,4 @@ - + diff --git a/src/it/projects/parent-with-version-range/pom.xml b/src/it/projects/parent-with-version-range/pom.xml index 79a21264..648d0002 100644 --- a/src/it/projects/parent-with-version-range/pom.xml +++ b/src/it/projects/parent-with-version-range/pom.xml @@ -1,13 +1,14 @@ - - 4.0.0 + + 4.0.0 - - org.codehaus.mojo.flatten.its - parent-deps - [0,2] - + + org.codehaus.mojo.flatten.its + parent-deps + [0,2] + - parent-with-version-range - 0.0.1-SNAPSHOT + parent-with-version-range + 0.0.1-SNAPSHOT diff --git a/src/it/projects/profile-with-dependencies-active-disabled/pom.xml b/src/it/projects/profile-with-dependencies-active-disabled/pom.xml index 10a5ca39..42848971 100644 --- a/src/it/projects/profile-with-dependencies-active-disabled/pom.xml +++ b/src/it/projects/profile-with-dependencies-active-disabled/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-dependencies-active-disabled diff --git a/src/it/projects/profile-with-dependencies-active/pom.xml b/src/it/projects/profile-with-dependencies-active/pom.xml index b9627bcc..9564ca04 100644 --- a/src/it/projects/profile-with-dependencies-active/pom.xml +++ b/src/it/projects/profile-with-dependencies-active/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-dependencies-active diff --git a/src/it/projects/profile-with-dependencies-inherit-parent-dependencyManagement/parent/pom.xml b/src/it/projects/profile-with-dependencies-inherit-parent-dependencyManagement/parent/pom.xml index 700c84c9..62414946 100644 --- a/src/it/projects/profile-with-dependencies-inherit-parent-dependencyManagement/parent/pom.xml +++ b/src/it/projects/profile-with-dependencies-inherit-parent-dependencyManagement/parent/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-dependencies-inherit-parent-dependencyManagement_parent @@ -7,13 +8,13 @@ - - - org.codehaus.mojo.flatten.its - dep - 1.1 - - + + + org.codehaus.mojo.flatten.its + dep + 1.1 + + diff --git a/src/it/projects/profile-with-dependencies-inherit-parent-dependencyManagement/pom.xml b/src/it/projects/profile-with-dependencies-inherit-parent-dependencyManagement/pom.xml index 349dfd65..ed6c8777 100644 --- a/src/it/projects/profile-with-dependencies-inherit-parent-dependencyManagement/pom.xml +++ b/src/it/projects/profile-with-dependencies-inherit-parent-dependencyManagement/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-dependencies-inherit-parent-dependencyManagement @@ -22,7 +23,7 @@ - + myprofile @@ -37,5 +38,5 @@ - + diff --git a/src/it/projects/profile-with-dependencies-not-triggered/pom.xml b/src/it/projects/profile-with-dependencies-not-triggered/pom.xml index fb93dc41..a37d015b 100644 --- a/src/it/projects/profile-with-dependencies-not-triggered/pom.xml +++ b/src/it/projects/profile-with-dependencies-not-triggered/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-dependencies-not-triggered diff --git a/src/it/projects/profile-with-dependencies-triggered-by-folder-presence/parent/pom.xml b/src/it/projects/profile-with-dependencies-triggered-by-folder-presence/parent/pom.xml index bd5a8c19..096e6d87 100644 --- a/src/it/projects/profile-with-dependencies-triggered-by-folder-presence/parent/pom.xml +++ b/src/it/projects/profile-with-dependencies-triggered-by-folder-presence/parent/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-dependencies-triggered-by-folder-presence-parent diff --git a/src/it/projects/profile-with-dependencies-triggered-by-folder-presence/pom.xml b/src/it/projects/profile-with-dependencies-triggered-by-folder-presence/pom.xml index 4e90fcbe..7389edb6 100644 --- a/src/it/projects/profile-with-dependencies-triggered-by-folder-presence/pom.xml +++ b/src/it/projects/profile-with-dependencies-triggered-by-folder-presence/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-dependencies-triggered-by-folder-presence @@ -15,7 +16,7 @@ - + org.codehaus.mojo.flatten.its profile-with-dependencies-triggered-by-folder-presence-parent diff --git a/src/it/projects/profile-with-dependencies-triggered/pom.xml b/src/it/projects/profile-with-dependencies-triggered/pom.xml index 93bc6b1a..22ccd06a 100644 --- a/src/it/projects/profile-with-dependencies-triggered/pom.xml +++ b/src/it/projects/profile-with-dependencies-triggered/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-dependencies-triggered diff --git a/src/it/projects/profile-with-deps-import/pom.xml b/src/it/projects/profile-with-deps-import/pom.xml index 6f182e52..9c28ecee 100644 --- a/src/it/projects/profile-with-deps-import/pom.xml +++ b/src/it/projects/profile-with-deps-import/pom.xml @@ -12,6 +12,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-active/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-active/pom.xml index 03603a04..cf1dd8c3 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-active/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-active/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ all diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-inactive/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-inactive/pom.xml index 808154b5..f263d147 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-inactive/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-inactive/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ all diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss-bom/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss-bom/pom.xml index 31a0c540..a214621b 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss-bom/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss-bom/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-from-parent/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-from-parent/pom.xml index cc702e21..3bc75d51 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-from-parent/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-from-parent/pom.xml @@ -24,6 +24,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-multilevel/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-multilevel/pom.xml index ca3b9b42..50bdd6bf 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-multilevel/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-multilevel/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-optional-in-profile/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-optional-in-profile/pom.xml index 9d93fc3b..493917b4 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-optional-in-profile/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-optional-in-profile/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ true diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-scope-in-profile/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-scope-in-profile/pom.xml index 6500d9e0..d059ffba 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-scope-in-profile/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk-scope-in-profile/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ true diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk/pom.xml index fa8a7e26..2e0f3889 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-jdk/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ true diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-rule/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-rule/pom.xml index 553fee8d..90418321 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-rule/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-rule/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ diff --git a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-test/pom.xml b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-test/pom.xml index bdd0f72f..d4e28de8 100644 --- a/src/it/projects/profile-with-deps-inherit-parent-depMgmt-test/pom.xml +++ b/src/it/projects/profile-with-deps-inherit-parent-depMgmt-test/pom.xml @@ -17,6 +17,7 @@ org.codehaus.mojo flatten-maven-plugin + @project.version@ diff --git a/src/it/projects/profile-with-properties-active/pom.xml b/src/it/projects/profile-with-properties-active/pom.xml index afe10046..904fd899 100644 --- a/src/it/projects/profile-with-properties-active/pom.xml +++ b/src/it/projects/profile-with-properties-active/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-properties-active @@ -21,5 +22,5 @@ PROFILE-VALUE - + diff --git a/src/it/projects/profile-with-properties-inactive/pom.xml b/src/it/projects/profile-with-properties-inactive/pom.xml index afe10046..904fd899 100644 --- a/src/it/projects/profile-with-properties-inactive/pom.xml +++ b/src/it/projects/profile-with-properties-inactive/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its profile-with-properties-active @@ -21,5 +22,5 @@ PROFILE-VALUE - + diff --git a/src/it/projects/property-profile-active/pom.xml b/src/it/projects/property-profile-active/pom.xml index 57af9c08..67b2f99f 100644 --- a/src/it/projects/property-profile-active/pom.xml +++ b/src/it/projects/property-profile-active/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its property-profile-active diff --git a/src/it/projects/property-profile-inactive/pom.xml b/src/it/projects/property-profile-inactive/pom.xml index 72829dd2..94841e61 100644 --- a/src/it/projects/property-profile-inactive/pom.xml +++ b/src/it/projects/property-profile-inactive/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.codehaus.mojo.flatten.its property-profile-inactive diff --git a/src/it/projects/resolve-gav-properties/pom.xml b/src/it/projects/resolve-gav-properties/pom.xml index 6f9f2091..65b5a93a 100644 --- a/src/it/projects/resolve-gav-properties/pom.xml +++ b/src/it/projects/resolve-gav-properties/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.codehaus.mojo.flatten.its resolve-properties 0.0.1-SNAPSHOT - + org.codehaus.mojo.flatten.its dep @@ -12,7 +13,7 @@ util 3.2.1 - + ${depGroupId} @@ -20,7 +21,7 @@ ${depVersion} - + @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/src/it/projects/resolve-projects-in-reactor/bom/pom.xml b/src/it/projects/resolve-projects-in-reactor/bom/pom.xml index e6dfca36..a36b870d 100644 --- a/src/it/projects/resolve-projects-in-reactor/bom/pom.xml +++ b/src/it/projects/resolve-projects-in-reactor/bom/pom.xml @@ -2,31 +2,32 @@ - 4.0.0 - org.codehaus.mojo.flatten.its - bom - 0.0.1-SNAPSHOT - pom + 4.0.0 + org.codehaus.mojo.flatten.its + bom + 0.0.1-SNAPSHOT + pom - - - - junit - junit - 4.13.2 - - - + + + + junit + junit + 4.13.2 + + + - - - - org.codehaus.mojo - flatten-maven-plugin - - bom - - - - + + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + bom + + + + diff --git a/src/it/projects/resolve-projects-in-reactor/jar/pom.xml b/src/it/projects/resolve-projects-in-reactor/jar/pom.xml index 86db5211..b38bcc2c 100644 --- a/src/it/projects/resolve-projects-in-reactor/jar/pom.xml +++ b/src/it/projects/resolve-projects-in-reactor/jar/pom.xml @@ -2,27 +2,27 @@ - 4.0.0 - org.codehaus.mojo.flatten.its - jar - 0.0.1-SNAPSHOT + 4.0.0 + org.codehaus.mojo.flatten.its + jar + 0.0.1-SNAPSHOT - - - - org.codehaus.mojo.flatten.its - bom - 0.0.1-SNAPSHOT - pom - import - - - + + + + org.codehaus.mojo.flatten.its + bom + 0.0.1-SNAPSHOT + pom + import + + + - - - junit - junit - - + + + junit + junit + + diff --git a/src/it/projects/resolve-projects-in-reactor/pom.xml b/src/it/projects/resolve-projects-in-reactor/pom.xml index 64e97b6d..29201b39 100644 --- a/src/it/projects/resolve-projects-in-reactor/pom.xml +++ b/src/it/projects/resolve-projects-in-reactor/pom.xml @@ -2,15 +2,15 @@ - 4.0.0 + 4.0.0 - org.codehaus.mojo.flatten.its - resolve-projects-in-reactor - 0.0.1-SNAPSHOT - pom + org.codehaus.mojo.flatten.its + resolve-projects-in-reactor + 0.0.1-SNAPSHOT + pom - - bom - jar - + + bom + jar + diff --git a/src/it/projects/resolve-properties-ci-do-not-interpolate-profile-activation-file/pom.xml b/src/it/projects/resolve-properties-ci-do-not-interpolate-profile-activation-file/pom.xml index 0eabb7c0..93a19ade 100644 --- a/src/it/projects/resolve-properties-ci-do-not-interpolate-profile-activation-file/pom.xml +++ b/src/it/projects/resolve-properties-ci-do-not-interpolate-profile-activation-file/pom.xml @@ -1,56 +1,57 @@ - 4.0.0 - org.codehaus.mojo.flatten.its - resolve-properties-ci-do-not-interpolate-profile-activation-file - ${revision} + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.codehaus.mojo.flatten.its + resolve-properties-ci-do-not-interpolate-profile-activation-file + ${revision} - - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - resolveCiFriendliesOnly - - - - + + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + resolveCiFriendliesOnly + + + + - - - 0 - - - file.txt - - - - - 1 - - - ${basedir}/file.txt - - - - - 2 - - - ${any.property} - - - - - 3 - - - ${revision} - - - - + + + 0 + + + file.txt + + + + + 1 + + + ${basedir}/file.txt + + + + + 2 + + + ${any.property} + + + + + 3 + + + ${revision} + + + + diff --git a/src/it/projects/resolve-properties-ci/pom.xml b/src/it/projects/resolve-properties-ci/pom.xml index eff7e217..bf741802 100644 --- a/src/it/projects/resolve-properties-ci/pom.xml +++ b/src/it/projects/resolve-properties-ci/pom.xml @@ -1,65 +1,66 @@ - 4.0.0 - org.codehaus.mojo.flatten.its - resolve-properties-ci - ${revision} + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.codehaus.mojo.flatten.its + resolve-properties-ci + ${revision} - - 1.1 - 3.2.1 - ${revision} - ${revision1} - ${small} - ${small1} - ${changelist} - ${sha1} - + + 1.1 + 3.2.1 + ${revision} + ${revision1} + ${small} + ${small1} + ${changelist} + ${sha1} + - - - org.codehaus.mojo.flatten.its - dep - ${revision} - ${small} - - - org.codehaus.mojo.flatten.its - dep - 1.2.3.1 - ${small1} - - - org.codehaus.mojo.flatten.its - dep - revision - small2 - - + + + org.codehaus.mojo.flatten.its + dep + ${revision} + ${small} + + + org.codehaus.mojo.flatten.its + dep + 1.2.3.1 + ${small1} + + + org.codehaus.mojo.flatten.its + dep + revision + small2 + + - - - verify - - - org.codehaus.mojo - flatten-maven-plugin - - resolveCiFriendliesOnly - - - - + + + verify + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + resolveCiFriendliesOnly + + + + - - - - true - - - ${revision} - ${revision1} - - - - \ No newline at end of file + + + + true + + + ${revision} + ${revision1} + + + + diff --git a/src/it/projects/resolve-properties/pom.xml b/src/it/projects/resolve-properties/pom.xml index 73ae90f2..becbee4e 100644 --- a/src/it/projects/resolve-properties/pom.xml +++ b/src/it/projects/resolve-properties/pom.xml @@ -1,14 +1,15 @@ - + 4.0.0 org.codehaus.mojo.flatten.its resolve-properties 0.0.1-SNAPSHOT - + 1.1 3.2.1 - + org.codehaus.mojo.flatten.its @@ -16,7 +17,7 @@ ${depVersion} - + @@ -31,4 +32,4 @@ - \ No newline at end of file + diff --git a/src/it/projects/setup-customarchive-maven-plugin/pom.xml b/src/it/projects/setup-customarchive-maven-plugin/pom.xml index effc1fe9..cde2da72 100644 --- a/src/it/projects/setup-customarchive-maven-plugin/pom.xml +++ b/src/it/projects/setup-customarchive-maven-plugin/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.codehaus.mojo.flatten.its customarchive-maven-plugin @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/src/it/projects/system-scope-dep-variable/pom.xml b/src/it/projects/system-scope-dep-variable/pom.xml index d129646f..b4565978 100644 --- a/src/it/projects/system-scope-dep-variable/pom.xml +++ b/src/it/projects/system-scope-dep-variable/pom.xml @@ -1,55 +1,56 @@ - 4.0.0 - org.codehaus.mojo.flatten.its - system-scope-dep-variable - 0.1-SNAPSHOT - jar + 4.0.0 + org.codehaus.mojo.flatten.its + system-scope-dep-variable + 0.1-SNAPSHOT + jar - - UTF-8 - 1.7 - 1.7 - + + UTF-8 + 1.7 + 1.7 + - - - com.oracle.java - tools - 8.0 - system - ${java.home}/../lib/tools.jar - - + + + com.oracle.java + tools + 8.0 + system + ${java.home}/../lib/tools.jar + + - - - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - + + + + org.codehaus.mojo + flatten-maven-plugin + @project.version@ + + + flatten + + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + diff --git a/src/it/projects/test-scoped-dependency/pom.xml b/src/it/projects/test-scoped-dependency/pom.xml index ac6a6d5e..84b9912a 100644 --- a/src/it/projects/test-scoped-dependency/pom.xml +++ b/src/it/projects/test-scoped-dependency/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.codehaus.mojo.flatten.its resolve-properties 0.0.1-SNAPSHOT - + org.codehaus.mojo.flatten.its @@ -12,4 +13,4 @@ test - \ No newline at end of file + diff --git a/src/it/projects/transitive-dependency/pom.xml b/src/it/projects/transitive-dependency/pom.xml index 5e5cf406..ea4149ff 100644 --- a/src/it/projects/transitive-dependency/pom.xml +++ b/src/it/projects/transitive-dependency/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.codehaus.mojo.flatten.its transitive-dependency 0.0.1-SNAPSHOT - + org.codehaus.mojo.flatten.its @@ -11,4 +12,4 @@ 5.3.8 - \ No newline at end of file + diff --git a/src/it/projects/xml-header-comment-present/pom.xml b/src/it/projects/xml-header-comment-present/pom.xml index 261f0673..7618b707 100644 --- a/src/it/projects/xml-header-comment-present/pom.xml +++ b/src/it/projects/xml-header-comment-present/pom.xml @@ -17,9 +17,10 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.codehaus.mojo.flatten.its xml-header-comment-present 0.0.1-SNAPSHOT - \ No newline at end of file +