137 lines
5.5 KiB
Diff
137 lines
5.5 KiB
Diff
From 527108b4d064417ab41da7abd70a47f58fcf91d6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
|
Date: Fri, 29 Apr 2022 13:27:33 +0200
|
|
Subject: [PATCH 3/3] Fix tests after the recent maven_depmap.py changes
|
|
|
|
---
|
|
test/data/maven_depmap/test_alias_extension-want.xml | 6 ------
|
|
test/data/maven_depmap/test_basic-want.xml | 6 ------
|
|
test/data/maven_depmap/test_buildroot-want.xml | 6 ------
|
|
test/data/maven_depmap/test_versioned_with_pom-want.xml | 6 ------
|
|
test/data/maven_depmap/test_war-want.xml | 6 ------
|
|
5 files changed, 30 deletions(-)
|
|
|
|
diff --git a/test/data/maven_depmap/test_alias_extension-want.xml b/test/data/maven_depmap/test_alias_extension-want.xml
|
|
index 6b0d1aee..d502fdf8 100644
|
|
--- a/test/data/maven_depmap/test_alias_extension-want.xml
|
|
+++ b/test/data/maven_depmap/test_alias_extension-want.xml
|
|
@@ -13,9 +13,6 @@
|
|
</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:groupId>alias</ns1:groupId>
|
|
@@ -30,9 +27,6 @@
|
|
</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_basic-want.xml b/test/data/maven_depmap/test_basic-want.xml
|
|
index 540f076a..200044bf 100644
|
|
--- a/test/data/maven_depmap/test_basic-want.xml
|
|
+++ b/test/data/maven_depmap/test_basic-want.xml
|
|
@@ -6,9 +6,6 @@
|
|
<ns1:artifactId>bndlib</ns1:artifactId>
|
|
<ns1:version>1.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:groupId>biz.aQute</ns1:groupId>
|
|
@@ -16,9 +13,6 @@
|
|
<ns1:extension>pom</ns1:extension>
|
|
<ns1:version>1.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 604046a5..9fa588d4 100644
|
|
--- a/test/data/maven_depmap/test_buildroot-want.xml
|
|
+++ b/test/data/maven_depmap/test_buildroot-want.xml
|
|
@@ -7,9 +7,6 @@
|
|
<ns1:version>17</ns1:version>
|
|
<ns1:extension>war</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:groupId>commons</ns1:groupId>
|
|
@@ -17,9 +14,6 @@
|
|
<ns1:version>17</ns1:version>
|
|
<ns1:extension>pom</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_versioned_with_pom-want.xml b/test/data/maven_depmap/test_versioned_with_pom-want.xml
|
|
index c2b344e1..8d259ab9 100644
|
|
--- a/test/data/maven_depmap/test_versioned_with_pom-want.xml
|
|
+++ b/test/data/maven_depmap/test_versioned_with_pom-want.xml
|
|
@@ -9,9 +9,6 @@
|
|
<ns1:version>2013.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:groupId>alias</ns1:groupId>
|
|
@@ -22,9 +19,6 @@
|
|
<ns1:version>2013.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 cac27a84..e8e2e56b 100644
|
|
--- a/test/data/maven_depmap/test_war-want.xml
|
|
+++ b/test/data/maven_depmap/test_war-want.xml
|
|
@@ -7,9 +7,6 @@
|
|
<ns1:version>17</ns1:version>
|
|
<ns1:extension>war</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:groupId>commons</ns1:groupId>
|
|
@@ -17,9 +14,6 @@
|
|
<ns1:extension>pom</ns1:extension>
|
|
<ns1:version>17</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>
|
|
--
|
|
2.36.0
|
|
|