From 2867402b9dfc56d7d4cc9336b7d7a939c8ebbfa8 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 22 2018 15:55:00 +0000
Subject: Update to latest upstream release


---

diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index 1a87dfb..155ffb7 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,13 +1,13 @@
-%global gittag %{version}.201803080745-r
+%global gittag %{version}.201806211838-r
 
 # Due to circular self-dependency, one build must be done with this flag set
 # when updating to new versions. A second build without this flag ensures that
 # all symlinks are generated correctly.
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 Name:           eclipse-jgit
-Version:        4.11.0
-Release:        2%{?dist}
+Version:        5.0.1
+Release:        1%{?with_bootstrap:.boot}%{?dist}
 Summary:        Eclipse JGit
 
 License:        BSD
@@ -24,7 +24,7 @@ BuildArch: noarch
 BuildRequires:  maven-local
 BuildRequires:  mvn(args4j:args4j)
 BuildRequires:  mvn(com.google.code.gson:gson)
-BuildRequires:  mvn(com.googlecode.javaewah:JavaEWAH) >= 1.1.6
+BuildRequires:  mvn(com.googlecode.javaewah:JavaEWAH)
 BuildRequires:  mvn(com.jcraft:jsch)
 BuildRequires:  mvn(com.jcraft:jzlib)
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
@@ -32,6 +32,7 @@ BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.commons:commons-compress)
 BuildRequires:  mvn(org.apache.httpcomponents:httpclient)
+BuildRequires:  mvn(org.apache.httpcomponents:httpcore)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-clean-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-install-plugin)
@@ -44,12 +45,12 @@ BuildRequires:  mvn(org.hamcrest:hamcrest-library)
 BuildRequires:  mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
+BuildRequires:  mvn(org.tukaani:xz)
 BuildRequires:  git
 
 %if %{without bootstrap}
 # For building the eclipse features
 BuildRequires:  tycho
-BuildRequires:  eclipse-filesystem
 BuildRequires:  jgit = %{version}
 
 Requires:       eclipse-platform
@@ -68,7 +69,6 @@ Summary:        API documentation for %{name}
 
 %package -n     jgit
 Summary:        Java-based command line Git interface
-Requires:       javaewah >= 1.1.6
 
 %description -n jgit
 Command line Git tool built entirely in Java.
@@ -92,8 +92,9 @@ for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do
 done
 
 # Disable "errorprone" compiler
-%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions" pom.xml
-%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:dependencies" pom.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions/pom:execution[pom:id='compile-with-errorprone']" pom.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions/pom:execution[pom:id='default-compile']/pom:configuration" pom.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:dependencies" pom.xml
 
 # Don't need target platform or repository modules with xmvn
 %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging
@@ -138,8 +139,8 @@ popd
 
 # First invocation installs jgit so the second invocation will succeed
 # One test always fails "RacyGitTests.testRacyGitDetection" so ignore failures for now
-%mvn_build --post install:install \
-  -- -Dmaven.repo.local=$(pwd)/org.eclipse.jgit.packaging/.m2 -Dmaven.test.failure.ignore=true
+%mvn_build --post install:install -- -Pjavac \
+  -Dmaven.repo.local=$(pwd)/org.eclipse.jgit.packaging/.m2 -Dmaven.test.failure.ignore=true
 
 # Second invocation builds the eclipse features
 %if %{without bootstrap}
@@ -190,6 +191,9 @@ EOF
 %license LICENSE
 
 %changelog
+* Fri Jun 22 2018 Mat Booth <mat.booth@redhat.com> - 5.0.1-1
+- Update to latest upstream release
+
 * Wed Mar 21 2018 Alexander Kurtakov <akurtako@redhat.com> 4.11.0-2
 - Full build.
 
diff --git a/jgit-feature-deps.patch b/jgit-feature-deps.patch
index 907046a..fc6dbdb 100644
--- a/jgit-feature-deps.patch
+++ b/jgit-feature-deps.patch
@@ -82,8 +82,8 @@
 +++ ./org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml 2016-05-02 16:57:17.671700728 +0100
 @@ -33,6 +33,9 @@
     <requires>
-       <import feature="org.eclipse.jgit" version="4.11.0" match="equivalent"/>
-       <import feature="org.eclipse.jgit.lfs" version="4.11.0" match="equivalent"/>
+       <import feature="org.eclipse.jgit" version="5.0.1" match="equivalent"/>
+       <import feature="org.eclipse.jgit.lfs" version="5.0.1" match="equivalent"/>
 +      <import plugin="org.apache.commons.compress" />
 +      <import plugin="org.kohsuke.args4j" />
 +      <import plugin="javaewah" />
diff --git a/sources b/sources
index 284af90..fe71b84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jgit-v4.11.0.201803080745-r.tar.gz) = e261b2b229b511f6a2064863e6468b88fb6a75bb171dfae92f90c509d9ee43fa18407085dc664675f202520e7334251e8df5766f78f38bca0666a4343544f483
+SHA512 (jgit-v5.0.1.201806211838-r.tar.gz) = d7cd5a8bd0b417cc05a1ca9111b6289c7491e7b29f5d3f37eb80df61392e871dda1072044c268dad638d22c747ed4c47e00569ab0f5fcbd0836a97be6304766a