From f4e7893b6c3fc7db67871ddf4a31a89cec9c2e08 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Mar 23 2015 12:30:17 +0000
Subject: Merge branch 'master' into jenkins


Conflicts:
	javapackages-tools.spec

---

diff --git a/.gitignore b/.gitignore
index 16cb761..d5ef7e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@
 /javapackages-4.3.0.tar.xz
 /javapackages-4.3.1.tar.xz
 /javapackages-4.3.2.tar.xz
+/javapackages-4.4.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index c39583e..c579a04 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,3 +1,5 @@
+%bcond_without tests
+
 %if 0%{?fedora} > 21
 %global with_python3 1
 %else
@@ -15,6 +17,8 @@ License:        BSD
 URL:            https://git.fedorahosted.org/git/javapackages.git
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
 
+Patch0:         0001-pom_editor-Write-temporary-XML-file-as-UTF-8.patch
+
 BuildArch:      noarch
 
 %if 0%{?with_python3}
@@ -30,6 +34,7 @@ BuildRequires:  python-setuptools
 BuildRequires:  python-nose
 BuildRequires:  PyXB = 1.2.4
 %endif
+BuildRequires:  make
 BuildRequires:  asciidoc
 BuildRequires:  xmlto
 BuildRequires:  scl-utils-build
@@ -98,6 +103,17 @@ Requires:       maven-surefire-provider-testng
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
 
+%package -n gradle-local
+Summary:        Local mode for Gradle
+Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-local = %{version}-%{release}
+Requires:       gradle >= 2.2.1-2
+Requires:       xmvn-connector-gradle >= 2
+
+%description -n gradle-local
+This package implements local mode fow Gradle, which allows artifact
+resolution using XMvn resolver.
+
 %package -n ivy-local
 Summary:        Local mode for Apache Ivy
 Requires:       %{name} = %{version}-%{release}
@@ -160,13 +176,6 @@ This package provides non-essential macros and scripts to support Java packaging
 %prep
 %setup -q -n javapackages-%{version}
 
-%if 0%{?with_python3}
-find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
-find ./depgenerators -name '*.req' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
-find ./depgenerators -name '*.prov' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
-%endif # with_python3
-
-
 %build
 %if 0%{?with_python3}
 %configure --pyinterpreter=%{__python3}
@@ -187,8 +196,10 @@ pushd python
 %endif
 popd
 
+%if %{with tests}
 %check
 ./check
+%endif
 
 %files -f files-common
 %doc LICENSE
@@ -197,6 +208,8 @@ popd
 
 %files -n maven-local -f files-maven
 
+%files -n gradle-local
+
 %files -n ivy-local -f files-ivy
 
 %if 0%{?with_python3}
@@ -216,8 +229,31 @@ popd
 %doc LICENSE
 
 %changelog
+* Mon Feb 16 2015 Michael Simacek <msimacek@redhat.com> - 4.4.0-2
+- Write temporary XML file as UTF-8 in pom_editor
+
+* Mon Feb 16 2015 Michal Srb <msrb@redhat.com> - 4.4.0-1
+- Update to upstream version 4.4.0
+
+* Fri Feb 13 2015 Michal Srb <msrb@redhat.com> - 4.3.2-6
+- Fix TypeError in maven_depmap (see: rhbz#1191657)
+
+* Thu Feb 12 2015 Michael Simacek <msimacek@redhat.com> - 4.3.2-5
+- Workaround for XMvn version bump (rhbz#1191657)
+
+* Fri Jan 23 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.2-4
+- Add gradle-local subpackage
+- Allow conditional builds with tests skipped
+
+* Mon Jan 19 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.2-3
+- Port to lua 5.3.0
+
+* Thu Jan 15 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.2-2
+- Replace all dashes with dots in versioned provides and requires
+
 * Mon Jan 05 2015 Michal Srb <msrb@redhat.com> - 4.3.2-1
 - Update to upstream version 4.3.2
+- Fix TypeError in mvn_artifact
 
 * Tue Dec 23 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.1-1
 - Update to upstream version 4.3.1
diff --git a/sources b/sources
index e22be2c..57a8c51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d1ef162f04e546a0c58d745f2896d3c  javapackages-4.3.2.tar.xz
+e4e84b14946df1188b526ab5d721071d  javapackages-4.4.0.tar.xz