packages/eclipse-jgit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 5.11.0

Browse Source 
(cherry picked from commit 5331d3c912351b2caf4687743bec4266d7a471de)
This commit is contained in:
starlet-dx 2022-11-26 09:22:11 +08:00 committed by openeuler-sync-bot
parent c1571b3799
commit 831c1c9514
4 changed files with 20 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

254
0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
View File

@ -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 <mat.booth@redhat.com>
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 @@
<discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
</url>
+ <requires>
+ <import plugin="com.googlecode.javaewah.JavaEWAH" />
+ <import plugin="com.jcraft.jsch" />
+ <import plugin="com.jcraft.jzlib"/>
+ <import plugin="org.apache.commons.compress" />
+ <import plugin="slf4j.api" />
+ <import plugin="slf4j.simple" />
+ <import plugin="bcpg" />
+ <import plugin="bcpkix" />
+ <import plugin="bcprov" />
+ </requires>
+
<plugin
id="org.eclipse.jgit"
download-size="0"
@@ -36,75 +48,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="com.jcraft.jsch"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javaewah"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.compress"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.slf4j.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.slf4j.impl.log4j12"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.apache.log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.jcraft.jzlib"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.bouncycastle.bcpg"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.bouncycastle.bcpkix"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.bouncycastle.bcprov"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
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 @@
<requires>
<import plugin="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
+ <import plugin="org.apache.httpcomponents.httpcore"/>
+ <import plugin="org.apache.httpcomponents.httpclient"/>
</requires>
<plugin
@@ -33,18 +35,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.httpcomponents.httpcore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.httpcomponents.httpclient"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
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 @@
<requires>
<import plugin="com.jcraft.jsch"/>
<import plugin="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
+ <import plugin="org.apache.commons.logging"/>
+ <import plugin="org.apache.sshd.osgi"/>
+ <import plugin="org.apache.sshd.sftp"/>
<import plugin="org.eclipse.jgit" version="5.11.0" match="equivalent"/>
</requires>
<plugin
@@ -55,25 +58,4 @@
version="0.0.0"
unpack="false"/>
@ -182,112 +47,21 @@ index 34a0868..d6b8125 100644
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
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 @@
<requires>
<import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
+ <import plugin="com.google.gson"/>
</requires>
<plugin
@@ -40,11 +41,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="com.google.gson"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
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 @@
<import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
<import feature="org.eclipse.jgit.lfs" version="5.4.0" match="equivalent"/>
<import feature="org.eclipse.jgit.ssh.apache" version="5.4.0" match="equivalent"/>
+ <import plugin="com.googlecode.javaewah.JavaEWAH" />
+ <import plugin="org.apache.commons.compress" />
+ <import plugin="org.kohsuke.args4j"/>
</requires>
<plugin
@@ -54,25 +57,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.commons.compress"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.kohsuke.args4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javaewah"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
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 @@
<requires>
<import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
<import feature="org.eclipse.jgit" version="5.11.0" match="equivalent"/>
+ <import plugin="org.apache.sshd.osgi"/>
+ <import plugin="org.apache.sshd.sftp"/>
+ <import plugin="net.i2p.crypto.eddsa"/>
</requires>
<plugin
@@ -33,25 +36,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.apache.sshd.osgi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.sshd.sftp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="net.i2p.crypto.eddsa"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
--
2.20.1
2.28.0

8
eclipse-jgit.spec
View File

@ -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 <yaoxin30@h-partners.com> - 5.11.0-1
- Update to 5.11.0
* Mon Aug 17 2020 yanan li <liyanan032@huawei.com> - 5.4.0-1
- Package init

BIN
jgit-5.11.0.202103091610-r.tar.xz Normal file
View File

Binary file not shown.

BIN
jgit-5.4.0.201906121030-r.tar.xz
View File

Binary file not shown.