Accepting request 359146 from Java:packages

1

OBS-URL: https://build.opensuse.org/request/show/359146
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javapackages-tools?expand=0&rev=13

create_valid_xml_comments.patch

@@ -0,0 +1,22 @@
+From 84211c0ee761e93ee507f5d37e9fc80ec377e89d Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 3 Dec 2015 06:58:58 +0100
+Subject: [PATCH] Fix TravisCI test failure
+
+---
+ java-utils/pom_editor.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
+index eac7ab1..364a443 100644
+--- a/java-utils/pom_editor.py
++++ b/java-utils/pom_editor.py
+@@ -580,7 +580,7 @@ def pom_remove_parent(pom=None):
+     """[POM location]"""
+     try:
+         pom.replace_xml(pom.xpath_query_element("/pom:project/pom:parent"),
+-                        etree.Comment(" parent POM reference removed by maintainer --> "))
++                        etree.Comment(" parent POM reference removed by maintainer "))
+     except PomQueryNoMatch:
+         raise PomQueryNoMatch("POM doesn't specify parent.")
+ 

javapackages-4.4.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e6afc39570619b72532aabd0cb84feb892920f977444d67eb2e34755c74e1b9
-size 184360

javapackages-4.6.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62d447460d394fe7409c8f6a2e8b6448887b04668d6867586c7a0d282f3c13d8
+size 179680

javapackages-tools.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Feb 12 15:21:42 UTC 2016 - toddrme2178@gmail.com
+
+- Add create_valid_xml_comments.patch
+  python-lxml 3.5.0 introduces validation for xml comments, and 
+  one of the comments created in this package were not valid.
+  This patch fixes the problem.  It backported from upstream and
+  should be in the next release.
+  https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9fc80ec377e89d
+
+-------------------------------------------------------------------
+Mon Feb  8 20:23:42 UTC 2016 - tchvatal@suse.com
+
+- Version update to 4.6.0:
+  * various bugfixes for maven tooling
+  * introduction to gradle-local package for gradle packaging
+
 -------------------------------------------------------------------
 Wed Apr  1 08:40:57 UTC 2015 - tchvatal@suse.com
 

javapackages-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package javapackages-tools
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           javapackages-tools
-Version:        4.4.0
+Version:        4.6.0
 Release:        0
 Summary:        Macros and scripts for Java packaging support
 License:        BSD-3-Clause
@@ -30,6 +30,8 @@ Patch0:         suse-use-libdir.patch
 #PATCH-FIX-SUSE: We put macros to /etc/rpm directly so make it reflected by
 #                the install script
 Patch1:         suse-macros-install-location.patch
+#PATCH-FIX-Upstream: create_valid_xml_comments.patch -- make comments that pass python-lxml validation - https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9fc80ec377e89d
+Patch2:         create_valid_xml_comments.patch
 BuildRequires:  asciidoc
 BuildRequires:  dia
 BuildRequires:  fdupes
@@ -77,6 +79,16 @@ Requires:       javapackages-local = %{version}
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
 
+%package -n gradle-local
+Summary:        Local mode for Gradle
+Group:          Development/Languages/Java
+Requires:       %{name} = %{version}
+Requires:       javapackages-local = %{version}
+
+%description -n gradle-local
+This package implements local mode for Gradle, which allows artifact
+resolution using XMvn resolver.
+
 %package -n ivy-local
 Summary:        Local mode for Apache Ivy
 Group:          Development/Languages/Java
@@ -116,6 +128,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %setup -q -n javapackages-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --rpmconfigdir=%{_sysconfdir}/rpm/
@@ -144,6 +157,10 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
 %files -n maven-local -f files-maven
 %defattr(-,root,root,-)
 
+%files -n gradle-local -f files-gradle
+%defattr(-,root,root)
+%dir %{_datadir}/gradle-local
+
 %files -n ivy-local -f files-ivy
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/ant.d

suse-macros-install-location.patch

@@ -1,10 +1,10 @@
-Index: javapackages-4.4.0/install
+Index: javapackages-4.6.0/install
 ===================================================================
---- javapackages-4.4.0.orig/install
+--- javapackages-4.6.0.orig/install
-+++ javapackages-4.4.0/install
++++ javapackages-4.6.0/install
-@@ -126,8 +126,8 @@ inst_exec java-utils/java-wrapper "${jav
+@@ -127,8 +127,8 @@ inst_data java-utils/maven_depmap.py "${
- inst_data java-utils/maven_depmap.py "${javadir}-utils"
  inst_data java-utils/pom_editor.py "${javadir}-utils"
+ inst_data java-utils/request-artifact.py "${javadir}-utils"
  
 -inst_data target/macros.jpackage "${rpmconfigdir}/macros.d"
 -inst_data target/macros.fjava "${rpmconfigdir}/macros.d"
@@ -13,12 +13,3 @@ Index: javapackages-4.4.0/install
  
  inst_data target/build-classpath.1 "${mandir}/man1"
  inst_data target/build-jar-repository.1 "${mandir}/man1"
-@@ -174,7 +174,7 @@ link "${m2home}/configuration-rpmbuild-r
- inst_config etc/javapackages-config.json "${javaconfdir}"
- 
- exec >files-local
--inst_data target/macros.xmvn "${rpmconfigdir}/macros.d"
-+inst_data target/macros.xmvn "${rpmconfigdir}"
- 
- inst_data java-utils/mvn_alias.py "${javadir}-utils"
- inst_data java-utils/mvn_artifact.py "${javadir}-utils"