Add new sources for 4.0.0 and remove old patches

.gitignore

@@ -59,3 +59,4 @@
 /javapackages-3.4.1.tar.xz
 /javapackages-3.4.2.tar.xz
 /javapackages-3.5.0.tar.xz
+/javapackages-4.0.0.tar.xz

0001-Add-support-for-installing-hpi.patch

@@ -1,85 +0,0 @@
-diff --git a/configs/configuration-20-rpmbuild-raw.xml b/configs/configuration-20-rpmbuild-raw.xml
-index eb99908..9ab7b30 100644
---- a/configs/configuration-20-rpmbuild-raw.xml
-+++ b/configs/configuration-20-rpmbuild-raw.xml
-@@ -37,6 +37,18 @@
-       </stereotypes>
-     </repository>
-     <repository>
-+      <id>jenkins-plugin</id>
-+      <type>jpp</type>
-+      <properties>
-+        <root>usr/share/jenkins/plugins</root>
-+      </properties>
-+      <stereotypes>
-+        <stereotype>
-+          <extension>hpi</extension>
-+        <stereotype>
-+      </stereotypes>
-+    </repository>
-+    <repository>
-       <id>base-jni</id>
-       <type>jpp</type>
-       <properties>
-diff --git a/configs/configuration-20-rpmbuild.xml b/configs/configuration-20-rpmbuild.xml
-index 5ecb4ba..7a7b543 100644
---- a/configs/configuration-20-rpmbuild.xml
-+++ b/configs/configuration-20-rpmbuild.xml
-@@ -49,6 +49,18 @@
-       </stereotypes>
-     </repository>
-     <repository>
-+      <id>jenkins-plugin</id>
-+      <type>jpp</type>
-+      <properties>
-+        <root>usr/share/jenkins/plugins</root>
-+      </properties>
-+      <stereotypes>
-+        <stereotype>
-+          <extension>hpi</extension>
-+        </stereotype>
-+      </stereotypes>
-+    </repository>
-+    <repository>
-       <id>base-jni</id>
-       <type>jpp</type>
-       <properties>
-diff --git a/configs/configuration-20.xml b/configs/configuration-20.xml
-index 1186b46..fa6798d 100644
---- a/configs/configuration-20.xml
-+++ b/configs/configuration-20.xml
-@@ -86,6 +86,18 @@
-       </stereotypes>
-     </repository>
-     <repository>
-+      <id>jenkins-plugin</id>
-+      <type>jpp</type>
-+      <properties>
-+        <root>usr/share/jenkins/plugins</root>
-+      </properties>
-+      <stereotypes>
-+        <stereotype>
-+          <extension>hpi</extension>
-+        </stereotype>
-+      </stereotypes>
-+    </repository>
-+    <repository>
-       <id>base-jni</id>
-       <type>jpp</type>
-       <properties>
-@@ -107,6 +119,7 @@
-           <repository>base-raw-pom</repository>
-           <repository>base-jar</repository>
-           <repository>base-jni</repository>
-+          <repository>jenkins-plugin</repository>
-         </repositories>
-       </configuration>
-     </repository>
-@@ -118,6 +131,7 @@
-           <repository>base-raw-pom</repository>
-           <repository>base-jni</repository>
-           <repository>base-jar</repository>
-+          <repository>jenkins-plugin</repository>
-         </repositories>
-       </configuration>
-     </repository>

0001-depgenerators-Switch-to-require-java-headless-instea.patch

@@ -1,26 +0,0 @@
-From 102fee5e1e7661356502ca89d6a73889b826af6b Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Wed, 29 Jan 2014 17:23:28 +0100
-Subject: [PATCH 01/15] [depgenerators] Switch to require java-headless instead
- java
-
----
- depgenerators/maven.req | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/depgenerators/maven.req b/depgenerators/maven.req
-index 5bd6c34..c161e3d 100755
---- a/depgenerators/maven.req
-+++ b/depgenerators/maven.req
-@@ -158,7 +158,7 @@ class TagBuilder:
-                             "%mvn_package {art} <package_name>\n".format(art=skipped)
-             raise Exception(skipped_msg)
- 
--        reqs = {'java': depmap.get_java_requires(),
-+        reqs = {'java-headless': depmap.get_java_requires(),
-                 'java-devel': depmap.get_java_devel_requires()}
-         for name, version in reqs.iteritems():
-             self.__process_jvm_req(name, version)
--- 
-1.8.5.3
-

0001-generate-correct-requires-on-poms.patch

@@ -1,28 +0,0 @@
-From fdeb8bb300c10bfda861d602e84d2befd429d1c4 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb@redhat.com>
-Date: Wed, 28 May 2014 08:08:42 +0200
-Subject: [PATCH] [maven.req] Generate correct requires on POMs
-
-All POM files in Rawhide should be fixed now
----
- depgenerators/maven.req | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/depgenerators/maven.req b/depgenerators/maven.req
-index 5bd6c34..eeab8d6 100755
---- a/depgenerators/maven.req
-+++ b/depgenerators/maven.req
-@@ -131,10 +131,6 @@ class TagBuilder:
-                         version=m_provided.version))
-                     break
-             else:
--                # TODO: remove when not needed
--                # do not generate requires like "a:b:pom:" yet
--                if dependency.extension == "pom":
--                    dependency.extension = ""
-                 print(dependency.get_rpm_str(dependency.version))
- 
-         if unknown_deps:
--- 
-1.9.3
-

0002-test-Fix-testsuite-for-java-headless-change.patch

@@ -1,34 +0,0 @@
-From 7cf7e60b9ce308cf7d0cbbe3da142781ce736696 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Wed, 29 Jan 2014 17:40:39 +0100
-Subject: [PATCH 02/15] [test] Fix testsuite for java-headless change
-
----
- test/maven_req_test.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/maven_req_test.py b/test/maven_req_test.py
-index 4551bb5..b99672f 100644
---- a/test/maven_req_test.py
-+++ b/test/maven_req_test.py
-@@ -26,7 +26,7 @@ class TestMavenReq(unittest.TestCase):
-     @mavenreq(["require-java/require.xml"])
-     def test_require_java(self, stdout, stderr, return_value):
-         self.assertEquals(return_value, 0, stderr)
--        self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava >= 1:1.6\n")
-+        self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava-headless >= 1:1.6\n")
- 
-     @mavenreq(["require-java-devel/require.xml"])
-     def test_require_java_devel(self, stdout, stderr, return_value):
-@@ -36,7 +36,7 @@ class TestMavenReq(unittest.TestCase):
-     @mavenreq(["require-java-both/require.xml"])
-     def test_require_java_both(self, stdout, stderr, return_value):
-         self.assertEquals(return_value, 0, stderr)
--        self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava >= 1:1.6\njava-devel >= 1:1.6\n")
-+        self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava-headless >= 1:1.6\njava-devel >= 1:1.6\n")
- 
-     @mavenreq(["require_parent/require.xml"])
-     def test_require_parent(self, stdout, stderr, return_value):
--- 
-1.8.5.3
-

0003-macros-Fix-add_maven_depmap-for-SCL-usage.patch

@@ -1,38 +0,0 @@
-From cf8978c21d0a6f0bf9a00983f123597c8bb331b6 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb@redhat.com>
-Date: Wed, 12 Feb 2014 18:24:13 +0100
-Subject: [PATCH 2/3] [macros] Fix add_maven_depmap for SCL usage
-
-Use %{pkg_name} when calling without arguments
-Let's make sure we install fragment file without prefix
----
- etc/macros.fjava | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/etc/macros.fjava b/etc/macros.fjava
-index bdfd624..e2a41e6 100644
---- a/etc/macros.fjava
-+++ b/etc/macros.fjava
-@@ -52,8 +52,8 @@
- set -e \
- # default values \
- %if %# == 0 \
--   _pompart="JPP-%{name}.pom" \
--   _jarpart="%{name}.jar" \
-+   _pompart="JPP-%{?scl:%{pkg_name}}%{!?scl:%{name}}.pom" \
-+   _jarpart="%{?scl:%{pkg_name}}%{!?scl:%{name}}.jar" \
- %else \
-    _pompart="%1" \
-    _jarpart="%2" \
-@@ -67,7 +67,7 @@ for _dir in %{_jnidir} %{_javajnidir} %{_javadir}; do \
- done \
- python -m %{javadir}-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\
-           -p "%{_prefix}" -n "%{?scl}" \\\
--          %{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
-+          %{buildroot}%{_mavendepmapfragdir}/%{?scl:%{pkg_name}}%{!?scl:%{name}}%{-f*:-%{-f*}} \\\
-           %{buildroot}%{_mavenpomdir}/$_pompart \\\
- %if %# == 2 \
-           "${_jpath}" \\\
--- 
-1.8.5.3
-

0004-macros-Fix-xmvn-install-for-SCL-usage.patch

@@ -1,26 +0,0 @@
-From 8c19c2aeaf637d39ade97c6b644ca174b3a8a8d0 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 11 Feb 2014 11:33:17 +0100
-Subject: [PATCH 3/3] [macros] Fix xmvn-install for SCL usage
-
-The passed package name was incorrect for xmvn-install
----
- etc/macros.xmvn | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/macros.xmvn b/etc/macros.xmvn
-index 5ec8123..707dac2 100644
---- a/etc/macros.xmvn
-+++ b/etc/macros.xmvn
-@@ -141,7 +141,7 @@
- # buildroot. It is intended to be placed in %install section of spec file.
- #
- %mvn_install(J:X) \
--xmvn-install %{?-X} -R .xmvn-reactor -n "${RPM_PACKAGE_NAME}" -d "%{buildroot}" \
-+xmvn-install %{?-X} -R .xmvn-reactor -n %{?scl:%{pkg_name}}%{!?scl:%{name}} -d "%{buildroot}" \
- jdir="%{-J*:%{-J*}}%{!-J*:target/site/apidocs}" \
- if [ -d "${jdir}" ]; then \
-    install -dm755 %{buildroot}%{_javadocdir}/%{name} \
--- 
-1.8.5.3
-

sources

@@ -1 +1 @@
-c3eccf51b90a81e05b10e110fee603ed  javapackages-3.5.0.tar.xz
+58eb18136de46d69e30a1787aa874c3f  javapackages-4.0.0.tar.xz