From 4a6d04b25b211faf6498ce8ae9ee034be3566dc7 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Fri, 24 May 2024 17:41:55 +0200 Subject: Update org.apache.commons:commons-compress to 1.26.2 commons-compress 1.26.0 added commons-lang3 as a transitive dependency. Hence add it to the target platform, p2 repository and bazel build. Change-Id: Iac5ca095d3e93176e21364a66a29c5e533168e16 --- lib/BUILD | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/BUILD b/lib/BUILD index 8806217577..8918df8e2b 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -19,6 +19,16 @@ java_library( exports = ["@commons-compress//jar"], ) +java_library( + name = "commons-lang3", + visibility = [ + "//org.eclipse.jgit.archive:__pkg__", + "//org.eclipse.jgit.pgm.test:__pkg__", + "//org.eclipse.jgit.test:__pkg__", + ], + exports = ["@commons-lang3//jar"], +) + java_library( name = "commons-io", visibility = [ -- cgit v1.2.3 From 4bd76e6bc91b588b925120945669db1e2b48ab45 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 15 Feb 2025 17:46:41 +0100 Subject: [ssh, releng] Remove net.i2p.crypto.eddsa It's no longer needed; Apache MINA sshd now can work with the Bouncy Castle ed25519 implementation. Get rid of the unmaintained net.i2p bundle as dependency and drop it from the p2 repository. Also remove the hacky export of sun.security.x509 in oej.ssh.apache; it was added because of buggy test (sic!) dependency in net.i2p. In the bazel build make the Bouncy Castle libraries available to the ssh tests so that they have ed25519 even without the net.i2p library. Remove the net.i2p (eddsa) library throughout. Change-Id: I8e79afa84b8cce62ac8c3436c36fb02507af75b3 --- WORKSPACE | 6 ------ lib/BUILD | 16 ++++++---------- .../org.eclipse.jgit.repository/category.xml | 6 ------ .../org.eclipse.jgit.target/jgit-4.32.target | 4 +--- .../org.eclipse.jgit.target/jgit-4.33.target | 4 +--- .../org.eclipse.jgit.target/jgit-4.34.target | 4 +--- .../org.eclipse.jgit.target/jgit-4.35.target | 4 +--- .../org.eclipse.jgit.target/orbit/orbit-4.32.tpd | 2 -- .../org.eclipse.jgit.target/orbit/orbit-4.33.tpd | 2 -- .../org.eclipse.jgit.target/orbit/orbit-4.34.tpd | 2 -- .../org.eclipse.jgit.target/orbit/orbit-4.35.tpd | 2 -- org.eclipse.jgit.ssh.apache.test/BUILD | 4 +++- org.eclipse.jgit.ssh.apache/BUILD | 1 - org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 6 ++---- org.eclipse.jgit.ssh.apache/pom.xml | 7 ------- .../src/sun/security/x509/README.md | 3 --- org.eclipse.jgit.ssh.jsch.test/BUILD | 4 +++- 17 files changed, 18 insertions(+), 59 deletions(-) delete mode 100644 org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md (limited to 'lib') diff --git a/WORKSPACE b/WORKSPACE index dea15ed7ab..505141c472 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -72,12 +72,6 @@ maven_jar( sha1 = "e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf", ) -maven_jar( - name = "eddsa", - artifact = "net.i2p.crypto:eddsa:0.3.0", - sha1 = "1901c8d4d8bffb7d79027686cfb91e704217c3e1", -) - maven_jar( name = "jsch", artifact = "com.jcraft:jsch:0.1.55", diff --git a/lib/BUILD b/lib/BUILD index d26ccae4eb..d236b3a8ee 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -54,16 +54,6 @@ java_library( exports = ["@commons-logging//jar"], ) -java_library( - name = "eddsa", - visibility = [ - "//org.eclipse.jgit.ssh.apache:__pkg__", - "//org.eclipse.jgit.ssh.apache.test:__pkg__", - "//org.eclipse.jgit.ssh.jsch.test:__pkg__", - ], - exports = ["@eddsa//jar"], -) - java_library( name = "gson", visibility = [ @@ -218,6 +208,8 @@ java_library( visibility = [ "//org.eclipse.jgit.gpg.bc:__pkg__", "//org.eclipse.jgit.gpg.bc.test:__pkg__", + "//org.eclipse.jgit.ssh.apache.test:__pkg__", + "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], exports = ["@bcprov//jar"], @@ -228,6 +220,8 @@ java_library( visibility = [ "//org.eclipse.jgit.gpg.bc:__pkg__", "//org.eclipse.jgit.gpg.bc.test:__pkg__", + "//org.eclipse.jgit.ssh.apache.test:__pkg__", + "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], exports = ["@bcutil//jar"], @@ -237,6 +231,8 @@ java_library( name = "bcpkix", visibility = [ "//org.eclipse.jgit.gpg.bc:__pkg__", + "//org.eclipse.jgit.ssh.apache.test:__pkg__", + "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], exports = ["@bcpkix//jar"], diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index de5477203e..eef699cfa1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -123,12 +123,6 @@ - - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index d6888137cf..60baf0b7cf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,15 +1,13 @@ - + - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index b911f80b0e..1558ad68fc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,15 +1,13 @@ - + - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 09b39c4375..bc35d2c7eb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,15 +1,13 @@ - + - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 3ae26bc1dd..15cabc3d1f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,15 +1,13 @@ - + - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd index 480e96e2e8..59fcd8745a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd @@ -6,8 +6,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd index 8dca4cb681..2cfa0a8e7c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd @@ -6,8 +6,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd index 15931db8c7..d3e15bba6d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd @@ -6,8 +6,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd index 9e47c1c0d8..ec6996e427 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd @@ -6,8 +6,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] diff --git a/org.eclipse.jgit.ssh.apache.test/BUILD b/org.eclipse.jgit.ssh.apache.test/BUILD index dfc059f0a3..bf796c058e 100644 --- a/org.eclipse.jgit.ssh.apache.test/BUILD +++ b/org.eclipse.jgit.ssh.apache.test/BUILD @@ -8,7 +8,9 @@ load( ) DEPS = [ - "//lib:eddsa", + "//lib:bcpkix", + "//lib:bcprov", + "//lib:bcutil", "//lib:junit", "//lib:slf4j-api", "//lib:sshd-osgi", diff --git a/org.eclipse.jgit.ssh.apache/BUILD b/org.eclipse.jgit.ssh.apache/BUILD index fd88a8a88a..83709c35cb 100644 --- a/org.eclipse.jgit.ssh.apache/BUILD +++ b/org.eclipse.jgit.ssh.apache/BUILD @@ -12,7 +12,6 @@ java_library( resource_strip_prefix = "org.eclipse.jgit.ssh.apache/resources", resources = RESOURCES, deps = [ - "//lib:eddsa", "//lib:slf4j-api", "//lib:sshd-osgi", "//lib:sshd-sftp", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index aae7bf1b1a..71460f72cf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -36,10 +36,8 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends: org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.2.0", - sun.security.x509 -Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.15.0,2.16.0)", + org.eclipse.jgit.transport.sshd.agent;version="7.2.0" +Import-Package: org.apache.sshd.agent;version="[2.15.0,2.16.0)", org.apache.sshd.client;version="[2.15.0,2.16.0)", org.apache.sshd.client.auth;version="[2.15.0,2.16.0)", org.apache.sshd.client.auth.keyboard;version="[2.15.0,2.16.0)", diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index a002290378..8b9ff5034c 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -30,7 +30,6 @@ ${project.build.directory}/META-INF/SOURCE-MANIFEST.MF - 0.3.0 @@ -62,12 +61,6 @@ - - net.i2p.crypto - eddsa - ${eddsa-version} - - org.slf4j slf4j-api diff --git a/org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md b/org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md deleted file mode 100644 index a84ee37ffb..0000000000 --- a/org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This dummy package is used to fix the error -"Missing requirement: net.i2p.crypto.eddsa 0.3.0 requires 'java.package; sun.security.x509 0.0.0'" -raised since eddsa falsely requires this import \ No newline at end of file diff --git a/org.eclipse.jgit.ssh.jsch.test/BUILD b/org.eclipse.jgit.ssh.jsch.test/BUILD index 4a8b92518e..d4e6875ed8 100644 --- a/org.eclipse.jgit.ssh.jsch.test/BUILD +++ b/org.eclipse.jgit.ssh.jsch.test/BUILD @@ -8,7 +8,9 @@ junit_tests( srcs = glob(["tst/**/*.java"]), tags = ["jsch"], deps = [ - "//lib:eddsa", + "//lib:bcpkix", + "//lib:bcprov", + "//lib:bcutil", "//lib:jsch", "//lib:junit", "//org.eclipse.jgit:jgit", -- cgit v1.2.3