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 deleted file mode 100644 index f3362fcf9eee2e90fceee855304063015dbec08e..0000000000000000000000000000000000000000 --- a/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a6efa36a04bee412b06af2823281ff9b78827ebf Mon Sep 17 00:00:00 2001 -From: Mat Booth -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 - ---- - .../feature.xml | 24 +++---------------- - .../feature.xml | 2 ++ - 2 files changed, 5 insertions(+), 21 deletions(-) - -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 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 -@@ -24,6 +24,9 @@ - - - -+ -+ -+ - - - -@@ -55,25 +58,4 @@ - version="0.0.0" - unpack="false"/> - -- -- -- -- -- -- - -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 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,8 @@ - - - -+ -+ - - - = 2.6.0 mvn(org.apache.sshd:sshd-sftp) >= 2.6.0 +BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) >= 1.65 +BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) >= 1.65 +BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) >= 1.65 +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) mvn(org.osgi:osgi.core) +BuildRequires: mvn(org.slf4j:slf4j-api) mvn(org.slf4j:slf4j-simple) mvn(org.tukaani:xz) BuildRequires: tycho jgit = %{version} +%if %{with tests} +BuildRequires: git mvn(org.hamcrest:hamcrest-library) mvn(org.mockito:mockito-core) +%endif +Requires: bouncycastle >= 1.65 apache-sshd >= 1:2.6.0 Requires: eclipse-platform jgit = %{version} %description A pure Java implementation of the Git version control system. +%package javadoc +Summary: API documentation for %{name} +%description javadoc +%{summary}. %prep %setup -n jgit-%{gittag} -q %patch0 -p1 %patch1 -p1 rm .mvn/maven.config -for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do - grep -q dependencies $p && %pom_xpath_remove "pom:dependencies" $p -done -%pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging -%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 -popd +%pom_xpath_remove "pom:configuration/pom:annotationProcessorPaths" +%pom_xpath_remove "pom:configuration/pom:compilerArgs" +%pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core:provided +%pom_disable_module org.eclipse.jgit.coverage +%pom_disable_module org.eclipse.jgit.benchmarks +%pom_remove_plugin :jacoco-maven-plugin +%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin -r :maven-source-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin -r :japicmp-maven-plugin +sed -i -e 's/@{argLine}//' $(find -name pom.xml) +%pom_remove_plugin org.codehaus.mojo:build-helper-maven-plugin org.eclipse.jgit.pgm +%pom_remove_plugin :spring-boot-maven-plugin org.eclipse.jgit.pgm +%pom_xpath_remove "pom:plugins/pom:plugin/pom:executions/pom:execution[pom:id='create_jgit']" org.eclipse.jgit.pgm +sed -i -e 's/org\.springframework\.boot\.loader\.JarLauncher/org.eclipse.jgit.pgm.Main/' \ + org.eclipse.jgit.pgm/jgit.sh +sed -i -e '/javax\.servlet/s/4\.0\.0/5.0.0/' org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +sed -i -e '/javax\.servlet/s/3\.2\.0/5.0.0/' org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +%pom_remove_dep log4j:log4j . org.eclipse.jgit.pgm +%pom_change_dep org.slf4j:slf4j-log4j12 org.slf4j:slf4j-simple . org.eclipse.jgit.pgm +%if %{without tests} +sed -i -e '/\.test<\/module>/d' pom.xml +%endif +%mvn_package ":*.test" __noinstall + +%pom_disable_module org.eclipse.jgit.junit +%pom_disable_module org.eclipse.jgit.junit.ssh +%pom_disable_module org.eclipse.jgit.junit.http %build -pushd org.eclipse.jgit.packaging -%mvn_build -j -popd +%if %{without tests} +%mvn_build -f -- -Pjavac +%else +%mvn_build -- -Pjavac -Dmaven.test.failure.ignore=true +%endif %install -pushd org.eclipse.jgit.packaging %mvn_install -popd +install -dm 755 %{buildroot}%{_bindir} +install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit +install -dm 755 %{buildroot}%{_sysconfdir}/ant.d +cat > %{buildroot}%{_sysconfdir}/ant.d/jgit < - 5.13.0-1 +- Update to 5.13.0 + * Sat Nov 26 2022 yaoxin - 5.11.0-1 - Update to 5.11.0 diff --git a/jgit-5.11.0.202103091610-r.tar.xz b/jgit-5.11.0.202103091610-r.tar.xz deleted file mode 100644 index b5dc27102597522211b08a672fb17d64061728bc..0000000000000000000000000000000000000000 Binary files a/jgit-5.11.0.202103091610-r.tar.xz and /dev/null differ diff --git a/jgit-5.13.0.202109080827-r.tar.gz b/jgit-5.13.0.202109080827-r.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3ccaa5d511c3927eed7d1f23d7f528ab7ea07673 Binary files /dev/null and b/jgit-5.13.0.202109080827-r.tar.gz differ diff --git a/pom_for_bcpkix.patch b/pom_for_bcpkix.patch new file mode 100644 index 0000000000000000000000000000000000000000..919463ef10337b27ebdc5b5cf83f9a85d4ed3e38 --- /dev/null +++ b/pom_for_bcpkix.patch @@ -0,0 +1,27 @@ +diff -ru jgit-5.13.0.202109080827-r/org.eclipse.jgit.gpg.bc/pom.xml jgit-5.13.0.202109080827-r.new/org.eclipse.jgit.gpg.bc/pom.xml +--- jgit-5.13.0.202109080827-r/org.eclipse.jgit.gpg.bc/pom.xml 2021-09-08 20:27:06.000000000 +0800 ++++ jgit-5.13.0.202109080827-r.new/org.eclipse.jgit.gpg.bc/pom.xml 2023-06-06 11:11:02.594321250 +0800 +@@ -51,11 +51,6 @@ + + + org.bouncycastle +- bcutil-jdk15on +- +- +- +- org.bouncycastle + bcpkix-jdk15on + + +diff -ru jgit-5.13.0.202109080827-r/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java jgit-5.13.0.202109080827-r.new/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java +--- jgit-5.13.0.202109080827-r/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java 2021-09-08 20:27:06.000000000 +0800 ++++ jgit-5.13.0.202109080827-r.new/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java 2023-06-06 17:14:42.614321250 +0800 +@@ -195,7 +195,7 @@ + } + } + if (userId != null) { +- subpackets.addSignerUserID(false, userId); ++ subpackets.setSignerUserID(false, userId); + } + signatureGenerator + .setHashedSubpackets(subpackets.generate());