OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=97

0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch

@@ -1,8 +1,8 @@
 From d2db56cd30a48bd2ece7a5112e67c80417406a36 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
 Date: Fri, 29 Apr 2022 12:08:21 +0200
-Subject: [PATCH] Let maven_depmap.py generate metadata with dependencies under
+Subject: [PATCH 1/3] Let maven_depmap.py generate metadata with dependencies
- certain circumstances
+ under certain circumstances
 
 ---
  java-utils/maven_depmap.py | 43 +++++++++++++++++++++++++++++++++++++-

0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch

@@ -0,0 +1,29 @@
+From c0a4b557eb9a3b20c36fabe67ffac953ba78d2a5 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:10 +0200
+Subject: [PATCH 2/3] Do not try to construct POM from maven coordinate string
+
+---
+ java-utils/maven_depmap.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
+index f684a728..367632e6 100644
+--- a/java-utils/maven_depmap.py
++++ b/java-utils/maven_depmap.py
+@@ -312,8 +312,10 @@ def _main():
+     if namespace:
+         artifact.namespace = namespace
+ 
+-    pom = POM(pom_path)
+-    if pom.parent or pom.packaging == "pom":
++    pom = None
++    if have_pom:
++        pom = POM(pom_path)
++    if not pom or pom.parent or pom.packaging == "pom":
+         artifact.properties["xmvn.resolver.disableEffectivePom"] = "true"
+     else:
+         deps = []
+-- 
+2.36.0
+

0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch

@@ -0,0 +1,136 @@
+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
+

javapackages-tools.changes

@@ -1,8 +1,10 @@
 -------------------------------------------------------------------
 Fri Apr 29 10:21:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
-- Added patch:
+- Added patches:
   * 0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch
+  * 0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch
+  * 0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch
     + Let maven_depmap.py generate metadata with dependencies under
       certain circumstances
 

javapackages-tools.spec

@@ -47,6 +47,8 @@ Patch1:         python-optional.patch
 Patch2:         suse-no-epoch.patch
 #PATCH-FIX-SUSE: Let maven_depmap.py generate metadata with dependencies under certain circumstances
 Patch3:         0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch
+Patch4:         0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch
+Patch5:         0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch
 BuildRequires:  asciidoc
 BuildRequires:  fdupes
 BuildRequires:  perl