summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.ssh.apache
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2023-10-13 10:15:08 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2023-10-13 21:24:11 +0200
commit0b5d4c3aadb3157a78250b0b5b01160f6b550fb5 (patch)
treefde3724f414c78c11733cdd77629b41e0df2d051 /org.eclipse.jgit.ssh.apache
parentdc27dbd2fef79a43f2e44ee1264777da9fbeaabb (diff)
downloadjgit-0b5d4c3aadb3157a78250b0b5b01160f6b550fb5.tar.gz
jgit-0b5d4c3aadb3157a78250b0b5b01160f6b550fb5.zip
Use net.i2p.crypto.eddsa 0.3.0 from new Orbit build
consuming it directly from Maven Central. The bundle net.i2p.crypto.eddsa 0.3.0 contains bad OSGi metadata, earlier it was repackaged in Orbit tweaking its mandatory dependency to sun.security.x509 to an optional dependency. This project seems to be orphaned, probably because Java 15 added support for eddsa with JEP339 [1]. This repackaged bundle is no longer available after Orbit was renovated [2] to consume the vast majority of bundles directly from Maven Central without repacking them. Hence we have to workaround this (probably false) mandatory dependency. For that export an empty dummy package "sun.security.x509" to satisfy OSGi. [1] https://openjdk.org/jeps/339 [2] https://github.com/eclipse-orbit/orbit-simrel/issues/15 Change-Id: I2267e15823ebce6cf1d448e1e16a129f703e0f80
Diffstat (limited to 'org.eclipse.jgit.ssh.apache')
-rw-r--r--org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md3
2 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index e7f817bf45..4316e31a9e 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -34,7 +34,8 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.8.0";x-inter
org.eclipse.jgit.util,
org.apache.sshd.client.session,
org.apache.sshd.client.keyverifier",
- org.eclipse.jgit.transport.sshd.agent;version="6.8.0"
+ org.eclipse.jgit.transport.sshd.agent;version="6.8.0",
+ sun.security.x509
Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
org.apache.sshd.agent;version="[2.10.0,2.11.0)",
org.apache.sshd.client;version="[2.10.0,2.11.0)",
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
new file mode 100644
index 0000000000..a84ee37ffb
--- /dev/null
+++ b/org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md
@@ -0,0 +1,3 @@
+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