diff --git a/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch b/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch index 539494e6211420e9965815afa028b2f08b10f366..f3362fcf9eee2e90fceee855304063015dbec08e 100644 --- a/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch +++ b/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch @@ -1,163 +1,28 @@ -From 85226840dbe9f5547dd2778734415d6283c90258 Mon Sep 17 00:00:00 2001 +From a6efa36a04bee412b06af2823281ff9b78827ebf Mon Sep 17 00:00:00 2001 From: Mat Booth -Date: Fri, 7 Dec 2018 10:17:02 +0000 -Subject: [PATCH 2/3] Don't embed versions of third-party libs, use feature +Date: Fri, 29 Jan 2021 18:35:25 +0000 +Subject: [PATCH 2/2] Don't embed versions of third-party libs, use feature requirements instead --- - .../org.eclipse.jgit.feature/feature.xml | 83 +++---------------- - .../feature.xml | 16 +--- - .../feature.xml | 24 +----- - .../org.eclipse.jgit.lfs.feature/feature.xml | 8 +- - .../org.eclipse.jgit.pgm.feature/feature.xml | 24 +----- - .../feature.xml | 24 +----- - 6 files changed, 24 insertions(+), 155 deletions(-) + .../feature.xml | 24 +++---------------- + .../feature.xml | 2 ++ + 2 files changed, 5 insertions(+), 21 deletions(-) -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml -index d213b7b..1783bb1 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml -@@ -22,6 +22,18 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml -index f45fb19..1f70cc1 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml -@@ -24,6 +24,8 @@ - - - -+ -+ - - - - -- -- -- -- - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml -index 34a0868..d6b8125 100644 +index 92d171f..ca1f6de 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml -@@ -25,6 +25,9 @@ +@@ -24,6 +24,9 @@ + - + + + + - @@ -182,112 +47,21 @@ index 34a0868..d6b8125 100644 - install-size="0" - version="0.0.0" - unpack="false"/> -- - -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml -index 8213753..3c5598b 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml -@@ -24,6 +24,7 @@ - - - -+ - - - - -- -- - -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml -index f6c9cfc..82caaa8 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml -@@ -38,6 +38,9 @@ - - - -+ -+ -+ - - - - -- -- -- -- -- - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml -index f4dded6..9d92cb2 100644 +index 48660d5..843896f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml -@@ -24,6 +24,9 @@ +@@ -24,6 +24,8 @@ - + + + -+ - -- -- -- -- -- -- - -- -2.20.1 +2.28.0 diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index 53b242b688bf98391797e1d730a1517f28c6f4d1..7a38a07f8d3ade4cc9189d311ab5134178864c49 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -1,6 +1,6 @@ -%global gittag 5.4.0.201906121030-r +%global gittag 5.11.0.202103091610-r Name: eclipse-jgit -Version: 5.4.0 +Version: 5.11.0 Release: 1 Summary: Eclipse JGit License: BSD @@ -27,6 +27,7 @@ done %pom_disable_module org.eclipse.jgit.repository org.eclipse.jgit.packaging %pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin/pom:configuration/pom:target" org.eclipse.jgit.packaging/pom.xml %pom_disable_module org.eclipse.jgit.source.feature org.eclipse.jgit.packaging +%pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging %pom_remove_plugin :maven-enforcer-plugin org.eclipse.jgit.packaging pushd org.eclipse.jgit.packaging %mvn_package "::pom::" __noinstall @@ -47,5 +48,8 @@ popd %doc README.md %changelog +* Sat Nov 26 2022 yaoxin - 5.11.0-1 +- Update to 5.11.0 + * Mon Aug 17 2020 yanan li - 5.4.0-1 - Package init diff --git a/jgit-5.11.0.202103091610-r.tar.xz b/jgit-5.11.0.202103091610-r.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..b5dc27102597522211b08a672fb17d64061728bc Binary files /dev/null and b/jgit-5.11.0.202103091610-r.tar.xz differ diff --git a/jgit-5.4.0.201906121030-r.tar.xz b/jgit-5.4.0.201906121030-r.tar.xz deleted file mode 100644 index 7aadcb5e932eae790f1c976727c3ae520d265e05..0000000000000000000000000000000000000000 Binary files a/jgit-5.4.0.201906121030-r.tar.xz and /dev/null differ