From 68cada14a58f3c4f20ef253d3c53d1c0ee27ba8a Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sep 30 2015 08:56:27 +0000
Subject: Update to 4.1.0


---

diff --git a/.gitignore b/.gitignore
index b00876c..fd1584e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,7 @@
-/jgit-*.tar.bz2
+/jgit-*.tar.xz
 /jgit-*/
 /results_eclipse-jgit
 /noarch
 /*.src.rpm
 /.build-*.log
 /.project
-/jgit-4.0.0.201505260635-rc2.tar.xz
-/jgit-4.0.0.201506090130-r.tar.xz
-/jgit-4.0.1.201506240215-r.tar.xz
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index db7f03c..2db4443 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,8 +1,8 @@
-%global version_suffix 201506240215-r
+%global version_suffix 201509280440-r
 
 Name:           eclipse-jgit
-Version:        4.0.1
-Release:        5%{?dist}
+Version:        4.1.0
+Release:        1%{?dist}
 Summary:        Eclipse JGit
 
 License:        BSD
@@ -17,7 +17,7 @@ BuildRequires:  eclipse-filesystem
 BuildRequires:  maven-local
 BuildRequires:  maven-shade-plugin
 BuildRequires:  tycho
-BuildRequires:  args4j >= 2.0.12
+BuildRequires:  args4j
 BuildRequires:  apache-commons-compress
 BuildRequires:  xz-java >= 1.1-2
 BuildRequires:  javaewah
@@ -57,15 +57,6 @@ for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do
   grep -q dependencies $p && %pom_xpath_remove "pom:dependencies" $p
 done
 
-#those bundles don't compile with latest jetty
-%pom_disable_module org.eclipse.jgit.http.test
-%pom_disable_module org.eclipse.jgit.pgm.test
-%pom_disable_module org.eclipse.jgit.junit.http
-%pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging
-
-%pom_disable_module org.eclipse.jgit.ant.test
-%pom_disable_module org.eclipse.jgit.test
-
 # Don't need target platform or repository modules with xmvn
 %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging
 %pom_disable_module org.eclipse.jgit.repository org.eclipse.jgit.packaging
@@ -74,11 +65,13 @@ done
 # Don't build source features
 %pom_disable_module org.eclipse.jgit.source.feature org.eclipse.jgit.packaging
 %pom_disable_module org.eclipse.jgit.pgm.source.feature org.eclipse.jgit.packaging
-%pom_disable_module org.eclipse.jgit.http.apache.feature org.eclipse.jgit.packaging
 
 # Use Equinox OSGi instead of Felix
 %pom_change_dep -r org.osgi:org.osgi.core org.eclipse.osgi:org.eclipse.osgi
 
+# Remove optional dep, used only for null analysis
+%pom_remove_dep org.eclipse.jdt:org.eclipse.jdt.annotation org.eclipse.jgit
+
 # Relax version restriction for javaewah
 sed -i -e 's/0.7.9,0.8.0/0.7.9,0.9.0/g' org.eclipse.jgit/META-INF/MANIFEST.MF
 sed -i -e 's/0.7.9,0.8.0/0.7.9,0.9.0/g' org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -88,12 +81,19 @@ sed -i /org.kohsuke.args4j/s/2\\.1\\.0/3/ $(find -name MANIFEST.MF)
 # Don't attach shell script artifact
 %pom_remove_plugin org.codehaus.mojo:build-helper-maven-plugin org.eclipse.jgit.pgm
 
+# Does not build due to missing OSGi metadata in httpcomponents-client-cache
+%pom_disable_module org.eclipse.jgit.http.apache.feature org.eclipse.jgit.packaging
+
 # org.slf4j.api -> slf4j.api
 # org.slf4j.impl.log4j12 -> slf4j.log4j12
 sed -i 's/org\.slf4j\.api/slf4j\.api/
         s/org\.slf4j\.impl\.log4j12/slf4j\.log4j12/' \
 org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
 
+pushd org.eclipse.jgit.packaging
+%mvn_package "::pom::" __noinstall
+popd
+
 %build
 # Due to a current limitation of Tycho it is not possible to mix pom-first and
 # manifest-first builds in the same reactor build hence two separate invocations
@@ -136,6 +136,9 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
 %doc LICENSE README.md
 
 %changelog
+* Tue Sep 29 2015 Mat Booth <mat.booth@redhat.com> - 4.1.0-1
+- Update to 4.1.0
+
 * Mon Sep 14 2015 Roland Grunberg <rgrunber@redhat.com> - 4.0.1-5
 - Rebuild as an Eclipse p2 Droplet.
 
diff --git a/sources b/sources
index a676b7e..8c4ea97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ba90a72e79987ecc974500664b9e873  jgit-4.0.1.201506240215-r.tar.xz
+e7c29af6ac7a6c744801a9d6564fb30d  jgit-4.1.0.201509280440-r.tar.xz