From f42e43689f5c6050f2cbf41fde5af992384e2743 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sep 17 2019 09:33:45 +0000 Subject: Update to latest upstream release --- diff --git a/0002-Ensure-all-packages-are-exported.patch b/0002-Ensure-all-packages-are-exported.patch deleted file mode 100644 index 7fd1416..0000000 --- a/0002-Ensure-all-packages-are-exported.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 77a7644525c260098740a6670bf389b3957b746a Mon Sep 17 00:00:00 2001 -From: Matthias Sohn -Date: Sun, 16 Jun 2019 02:30:10 +0200 -Subject: [PATCH 2/2] Ensure all packages are exported - -This wasn't the case for the bundles -- org.eclipse.jgit.ant -- org.eclipse.jgit.archive - -Change-Id: Ibefcc82174fe23a9c1afb765099957414ac3556b -Signed-off-by: Matthias Sohn --- - org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 4 ++-- - org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) ---- - org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 4 ++-- - org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -index bb61635..7b24bf6 100644 ---- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -@@ -9,5 +9,5 @@ Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.4.0,5.5.0)" - Bundle-Localization: plugin - Bundle-Vendor: %Provider-Name --Export-Package: org.eclipse.jgit.ant.tasks;version="5.4.0"; -- uses:="org.apache.tools.ant.types,org.apache.tools.ant" -+Export-Package: org.eclipse.jgit.ant, -+ org.eclipse.jgit.ant.tasks;version="5.4.0";uses:="org.apache.tools.ant.types,org.apache.tools.ant" -diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -index 1fa5e8c..0eabf1f 100644 ---- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -@@ -25,4 +25,5 @@ Export-Package: org.eclipse.jgit.archive;version="5.4.0"; - uses:="org.eclipse.jgit.lib, - org.eclipse.jgit.api, - org.apache.commons.compress.archivers, -- org.osgi.framework" -+ org.osgi.framework", -+ org.eclipse.jgit.archive.internal;x-internal:=true --- -2.20.1 - diff --git a/0003-Remove-dependency-on-javax.xml.bind-package.patch b/0003-Remove-dependency-on-javax.xml.bind-package.patch deleted file mode 100644 index f9672cc..0000000 --- a/0003-Remove-dependency-on-javax.xml.bind-package.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 0d1cc8f8d3adb99f75fce180d857077ada3a19ee Mon Sep 17 00:00:00 2001 -From: David Ostrovsky -Date: Mon, 17 Jun 2019 23:28:52 +0200 -Subject: [PATCH 3/3] Remove dependency on javax.xml.bind package - -Replace javax.xml.bind.DatatypeConverter, that is not available any -more in Java 11 and later with Hex utility from non optional Bouncy -Castle library. - -Bug: 540790 -Change-Id: I9903c00ecc1a434e9795b8ba9267f02628fdc0e9 -Signed-off-by: David Ostrovsky ---- - BUILD | 7 ------- - org.eclipse.jgit/BUILD | 4 ---- - .../src/org/eclipse/jgit/transport/WalkEncryption.java | 7 +++---- - 3 files changed, 3 insertions(+), 15 deletions(-) - -diff --git a/BUILD b/BUILD -index 5fea669..be6dd76 100644 ---- a/BUILD -+++ b/BUILD -@@ -1,12 +1,5 @@ - package(default_visibility = ["//visibility:public"]) - --config_setting( -- name = "jdk9", -- values = { -- "java_toolchain": "@bazel_tools//tools/jdk:toolchain_jdk9", -- }, --) -- - genrule( - name = "all", - testonly = 1, -diff --git a/org.eclipse.jgit/BUILD b/org.eclipse.jgit/BUILD -index b67bfac..814ecec 100644 ---- a/org.eclipse.jgit/BUILD -+++ b/org.eclipse.jgit/BUILD -@@ -14,10 +14,6 @@ RESOURCES = glob(["resources/**"]) - java_library( - name = "jgit", - srcs = SRCS, -- javacopts = select({ -- "//:jdk9": ["--add-modules=java.xml.bind"], -- "//conditions:default": [], -- }), - resource_strip_prefix = "org.eclipse.jgit/resources", - resources = RESOURCES, - deps = [ -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -index b4248ee..7a973af 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -@@ -66,8 +66,8 @@ - import javax.crypto.spec.PBEKeySpec; - import javax.crypto.spec.PBEParameterSpec; - import javax.crypto.spec.SecretKeySpec; --import javax.xml.bind.DatatypeConverter; - -+import org.bouncycastle.util.encoders.Hex; - import org.eclipse.jgit.internal.JGitText; - import org.eclipse.jgit.util.Base64; - -@@ -301,7 +301,7 @@ InputStream decrypt(InputStream in) throws IOException { - String DEFAULT_KEY_ALGO = JetS3tV2.ALGORITHM; - String DEFAULT_KEY_SIZE = Integer.toString(JetS3tV2.KEY_SIZE); - String DEFAULT_KEY_ITER = Integer.toString(JetS3tV2.ITERATIONS); -- String DEFAULT_KEY_SALT = DatatypeConverter.printHexBinary(JetS3tV2.SALT); -+ String DEFAULT_KEY_SALT = Hex.toHexString(JetS3tV2.SALT); - - String EMPTY = ""; //$NON-NLS-1$ - -@@ -377,8 +377,7 @@ static GeneralSecurityException securityError(String message) { - - final byte[] salt; - try { -- salt = DatatypeConverter -- .parseHexBinary(keySalt.replaceAll(REGEX_WS, EMPTY)); -+ salt = Hex.decode(keySalt.replaceAll(REGEX_WS, EMPTY)); - } catch (Exception e) { - throw securityError(X_KEY_SALT + EMPTY + keySalt); - } --- -2.20.1 - diff --git a/jgit.spec b/jgit.spec index d2c5c7b..37a4c28 100644 --- a/jgit.spec +++ b/jgit.spec @@ -1,12 +1,12 @@ -%global gittag 5.4.0.201906121030-r +%global gittag 5.5.0.201909110433-r # Allow building without tests # (can build with much smaller dep-tree in that case) %bcond_without tests Name: jgit -Version: 5.4.0 -Release: 6%{?dist} +Version: 5.5.0 +Release: 1%{?dist} Summary: A pure java implementation of git # We don't ship the EPL-licensed Eclipse features in this package @@ -17,12 +17,6 @@ Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}. # Set the correct classpath for the command line tools Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch -# Upstream: https://git.eclipse.org/c/jgit/jgit.git/commit/?id=64de63ed417269bd8265079d05d6776e6a83d0fc -Patch1: 0002-Ensure-all-packages-are-exported.patch - -# Upstream: https://git.eclipse.org/c/jgit/jgit.git/commit/?id=7607465006aa226684a903b4b147982fe220428d -Patch2: 0003-Remove-dependency-on-javax.xml.bind-package.patch - BuildArch: noarch BuildRequires: maven-local @@ -41,9 +35,9 @@ BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.sshd:sshd-osgi) >= 2.2.0 BuildRequires: mvn(org.apache.sshd:sshd-sftp) >= 2.2.0 -BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) >= 1.61 -BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) >= 1.61 -BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) >= 1.61 +BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) >= 1.63 +BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) >= 1.63 +BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) >= 1.63 BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) BuildRequires: mvn(org.osgi:osgi.core) @@ -58,7 +52,7 @@ BuildRequires: mvn(org.mockito:mockito-core) %endif # Runtime requirements -Requires: bouncycastle >= 1.61 +Requires: bouncycastle >= 1.63 Requires: apache-sshd >= 1:2.2.0 %description @@ -74,8 +68,6 @@ Summary: API documentation for %{name} %prep %setup -n jgit-%{gittag} -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 # Disable multithreaded build rm .mvn/maven.config @@ -151,6 +143,9 @@ EOF %license LICENSE %changelog +* Tue Sep 17 2019 Mat Booth - 5.5.0-1 +- Update to latest upstream release + * Thu Jul 25 2019 Mat Booth - 5.4.0-6 - Make dep on OSGi 'provided' in scope