commit 8c24ca03dded48ca1fd22c03e3dd4f5b1947ecf2 Author: Michal Srb msrb@redhat.com Date: Fri Jun 13 10:54:26 2014 +0200
[test] Update maven_depmap test (xmvn.resolver.disableEffectivePom)
.../maven_depmap/test_alias_extension-want.xml | 6 ++++++ test/data/maven_depmap/test_append-want.xml | 3 +++ .../test_append_and_namespace-want.xml | 3 +++ .../maven_depmap/test_append_multiple-want.xml | 3 +++ test/data/maven_depmap/test_basic-want.xml | 6 ++++++ test/data/maven_depmap/test_buildroot-want.xml | 6 ++++++ test/data/maven_depmap/test_cdata-want.xml | 3 +++ test/data/maven_depmap/test_classifier-want.xml | 3 +++ test/data/maven_depmap/test_mvn_spec-want.xml | 3 +++ .../maven_depmap/test_mvn_spec_buildroot-want.xml | 3 +++ test/data/maven_depmap/test_mvn_spec_war-want.xml | 3 +++ test/data/maven_depmap/test_namespace-want.xml | 3 +++ .../test_packaging_pom_no_jar-want.xml | 3 +++ .../data/maven_depmap/test_parent_version-want.xml | 3 +++ test/data/maven_depmap/test_version-want.xml | 3 +++ .../data/maven_depmap/test_version_append-want.xml | 3 +++ .../maven_depmap/test_version_namespace-want.xml | 3 +++ test/data/maven_depmap/test_versioned-want.xml | 3 +++ test/data/maven_depmap/test_versioned2-want.xml | 3 +++ .../test_versioned_classifier-want.xml | 3 +++ .../maven_depmap/test_versioned_with_pom-want.xml | 6 ++++++ test/data/maven_depmap/test_war-want.xml | 6 ++++++ 22 files changed, 81 insertions(+), 0 deletions(-) --- diff --git a/test/data/maven_depmap/test_alias_extension-want.xml b/test/data/maven_depmap/test_alias_extension-want.xml index 34ec10e..f4ed6ef 100644 --- a/test/data/maven_depmap/test_alias_extension-want.xml +++ b/test/data/maven_depmap/test_alias_extension-want.xml @@ -12,6 +12,9 @@ </ns1:alias> </ns1:aliases> ns1:path%s/usr/share/java/commons-io.jar</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> ns1:artifact ns1:groupIdalias</ns1:groupId> @@ -26,6 +29,9 @@ </ns1:alias> </ns1:aliases> ns1:path%s/JPP-alias.pom</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_append-want.xml b/test/data/maven_depmap/test_append-want.xml index 8e0f914..bf9d660 100644 --- a/test/data/maven_depmap/test_append-want.xml +++ b/test/data/maven_depmap/test_append-want.xml @@ -12,6 +12,9 @@ ns1:artifactIdy</ns1:artifactId> </ns1:alias> </ns1:aliases> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_append_and_namespace-want.xml b/test/data/maven_depmap/test_append_and_namespace-want.xml index 1d24156..46053b5 100644 --- a/test/data/maven_depmap/test_append_and_namespace-want.xml +++ b/test/data/maven_depmap/test_append_and_namespace-want.xml @@ -13,6 +13,9 @@ ns1:artifactIdy</ns1:artifactId> </ns1:alias> </ns1:aliases> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_append_multiple-want.xml b/test/data/maven_depmap/test_append_multiple-want.xml index 0a77d53..9989e14 100644 --- a/test/data/maven_depmap/test_append_multiple-want.xml +++ b/test/data/maven_depmap/test_append_multiple-want.xml @@ -16,6 +16,9 @@ ns1:artifactIdw</ns1:artifactId> </ns1:alias> </ns1:aliases> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_basic-want.xml b/test/data/maven_depmap/test_basic-want.xml index 8356636..0ee1d66 100644 --- a/test/data/maven_depmap/test_basic-want.xml +++ b/test/data/maven_depmap/test_basic-want.xml @@ -6,6 +6,9 @@ ns1:artifactIdbndlib</ns1:artifactId> ns1:version1.50.0</ns1:version> ns1:path%s/usr/share/java/bndlib.jar</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> ns1:artifact ns1:groupIdbiz.aQute</ns1:groupId> @@ -13,6 +16,9 @@ ns1:extensionpom</ns1:extension> ns1:version1.50.0</ns1:version> ns1:path%s/JPP-bndlib.pom</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_buildroot-want.xml b/test/data/maven_depmap/test_buildroot-want.xml index 202f43e..acd95d7 100644 --- a/test/data/maven_depmap/test_buildroot-want.xml +++ b/test/data/maven_depmap/test_buildroot-want.xml @@ -7,6 +7,9 @@ ns1:version17</ns1:version> ns1:extensionwar</ns1:extension> ns1:path%s/usr/share/java/commons-war.war</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> ns1:artifact ns1:groupIdcommons</ns1:groupId> @@ -14,6 +17,9 @@ ns1:version17</ns1:version> ns1:extensionpom</ns1:extension> ns1:path/usr/share/maven-poms/JPP-commons-war.pom</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_cdata-want.xml b/test/data/maven_depmap/test_cdata-want.xml index 0c0b509..7f0d84c 100644 --- a/test/data/maven_depmap/test_cdata-want.xml +++ b/test/data/maven_depmap/test_cdata-want.xml @@ -7,6 +7,9 @@ ns1:version1.2.3</ns1:version> ns1:extensionpom</ns1:extension> ns1:path%s/JPP-cdata.pom</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_classifier-want.xml b/test/data/maven_depmap/test_classifier-want.xml index 715e786..99e67a5 100644 --- a/test/data/maven_depmap/test_classifier-want.xml +++ b/test/data/maven_depmap/test_classifier-want.xml @@ -14,6 +14,9 @@ ns1:classifierc</ns1:classifier> </ns1:alias> </ns1:aliases> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_mvn_spec-want.xml b/test/data/maven_depmap/test_mvn_spec-want.xml index e80be49..fb0dd07 100644 --- a/test/data/maven_depmap/test_mvn_spec-want.xml +++ b/test/data/maven_depmap/test_mvn_spec-want.xml @@ -6,6 +6,9 @@ ns1:artifactIdb</ns1:artifactId> ns1:version12</ns1:version> ns1:path%s/usr/share/java/commons-io.jar</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_mvn_spec_buildroot-want.xml b/test/data/maven_depmap/test_mvn_spec_buildroot-want.xml index 22f49f7..d8c5b51 100644 --- a/test/data/maven_depmap/test_mvn_spec_buildroot-want.xml +++ b/test/data/maven_depmap/test_mvn_spec_buildroot-want.xml @@ -7,6 +7,9 @@ ns1:version1</ns1:version> ns1:extensionwar</ns1:extension> ns1:path%s/usr/share/java/commons-war.war</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_mvn_spec_war-want.xml b/test/data/maven_depmap/test_mvn_spec_war-want.xml index ddbc087..d0dbc5b 100644 --- a/test/data/maven_depmap/test_mvn_spec_war-want.xml +++ b/test/data/maven_depmap/test_mvn_spec_war-want.xml @@ -7,6 +7,9 @@ ns1:extensionwar</ns1:extension> ns1:version1</ns1:version> ns1:path%s/usr/share/java/commons-war.war</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_namespace-want.xml b/test/data/maven_depmap/test_namespace-want.xml index 5418253..c66ec91 100644 --- a/test/data/maven_depmap/test_namespace-want.xml +++ b/test/data/maven_depmap/test_namespace-want.xml @@ -7,6 +7,9 @@ ns1:version12</ns1:version> ns1:path%s/usr/share/java/commons-io.jar</ns1:path> ns1:namespacemyns</ns1:namespace> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_packaging_pom_no_jar-want.xml b/test/data/maven_depmap/test_packaging_pom_no_jar-want.xml index e73f74b..6e6bc41 100644 --- a/test/data/maven_depmap/test_packaging_pom_no_jar-want.xml +++ b/test/data/maven_depmap/test_packaging_pom_no_jar-want.xml @@ -7,6 +7,9 @@ ns1:extensionpom</ns1:extension> ns1:version2</ns1:version> ns1:path%s/JPP-apache-commons-io.pom</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_parent_version-want.xml b/test/data/maven_depmap/test_parent_version-want.xml index c784aff..6e4babb 100644 --- a/test/data/maven_depmap/test_parent_version-want.xml +++ b/test/data/maven_depmap/test_parent_version-want.xml @@ -7,6 +7,9 @@ ns1:extensionpom</ns1:extension> ns1:version1</ns1:version> ns1:path%s/JPP-parent-version.pom</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_version-want.xml b/test/data/maven_depmap/test_version-want.xml index fd4bbe7..e4f2b19 100644 --- a/test/data/maven_depmap/test_version-want.xml +++ b/test/data/maven_depmap/test_version-want.xml @@ -11,6 +11,9 @@ ns1:version2</ns1:version> ns1:version3</ns1:version> </ns1:compatVersions> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_version_append-want.xml b/test/data/maven_depmap/test_version_append-want.xml index 6254ff2..377be1b 100644 --- a/test/data/maven_depmap/test_version_append-want.xml +++ b/test/data/maven_depmap/test_version_append-want.xml @@ -17,6 +17,9 @@ ns1:artifactIdb</ns1:artifactId> </ns1:alias> </ns1:aliases> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_version_namespace-want.xml b/test/data/maven_depmap/test_version_namespace-want.xml index 2771080..b7450a4 100644 --- a/test/data/maven_depmap/test_version_namespace-want.xml +++ b/test/data/maven_depmap/test_version_namespace-want.xml @@ -18,6 +18,9 @@ ns1:artifactIdb</ns1:artifactId> </ns1:alias> </ns1:aliases> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_versioned-want.xml b/test/data/maven_depmap/test_versioned-want.xml index 57f557b..bf53205 100644 --- a/test/data/maven_depmap/test_versioned-want.xml +++ b/test/data/maven_depmap/test_versioned-want.xml @@ -10,6 +10,9 @@ ns1:version2.0.0</ns1:version> </ns1:compatVersions> ns1:path%s/usr/share/java/versioned-2.0.0.war</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_versioned2-want.xml b/test/data/maven_depmap/test_versioned2-want.xml index 736a1c8..250bc84 100644 --- a/test/data/maven_depmap/test_versioned2-want.xml +++ b/test/data/maven_depmap/test_versioned2-want.xml @@ -9,6 +9,9 @@ ns1:version1.2</ns1:version> </ns1:compatVersions> ns1:path%s/usr/share/java/versioned2-1.2.jar</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_versioned_classifier-want.xml b/test/data/maven_depmap/test_versioned_classifier-want.xml index c017782..de8e50b 100644 --- a/test/data/maven_depmap/test_versioned_classifier-want.xml +++ b/test/data/maven_depmap/test_versioned_classifier-want.xml @@ -11,6 +11,9 @@ ns1:version1.2</ns1:version> </ns1:compatVersions> ns1:path%s/usr/share/java/versioned-3-tests-1.jar</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_versioned_with_pom-want.xml b/test/data/maven_depmap/test_versioned_with_pom-want.xml index 070099a..dbcd09b 100644 --- a/test/data/maven_depmap/test_versioned_with_pom-want.xml +++ b/test/data/maven_depmap/test_versioned_with_pom-want.xml @@ -9,6 +9,9 @@ ns1:version2013.10</ns1:version> </ns1:compatVersions> ns1:path%s/usr/share/java/testversioned-2013.10.jar</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> ns1:artifact ns1:groupIdalias</ns1:groupId> @@ -19,6 +22,9 @@ ns1:version2013.10</ns1:version> </ns1:compatVersions> ns1:path%s/JPP-testversioned-2013.10.pom</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata> diff --git a/test/data/maven_depmap/test_war-want.xml b/test/data/maven_depmap/test_war-want.xml index 187f18d..05c413e 100644 --- a/test/data/maven_depmap/test_war-want.xml +++ b/test/data/maven_depmap/test_war-want.xml @@ -7,6 +7,9 @@ ns1:version17</ns1:version> ns1:extensionwar</ns1:extension> ns1:path%s/usr/share/java/commons-war.war</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> ns1:artifact ns1:groupIdcommons</ns1:groupId> @@ -14,6 +17,9 @@ ns1:extensionpom</ns1:extension> ns1:version17</ns1:version> ns1:path%s/JPP-commons-war.pom</ns1:path> + ns1:properties + <xmvn.resolver.disableEffectivePom>true</xmvn.resolver.disableEffectivePom> + </ns1:properties> </ns1:artifact> </ns1:artifacts> </ns1:metadata>
java-sig-commits@lists.fedoraproject.org