From 4b544d32fa0631f8b58bf702341e846ddbf00831 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Wed, 10 Apr 2024 20:53:33 +0200 Subject: [PATCH] Revert "[releng] Bump Bouncy Castle to 1.78" This reverts commit 718d121bb38860e66f6e34a4045aa6d5d9490e8a. Bouncy Castle 1.78 has broken OSGi metadata: the package imports in MANIFEST.MF are missing. See also [1] and [2]. [1] https://github.com/bcgit/bc-java/issues/1621 [2] https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1968#issuecomment-2048151288 Change-Id: Iedec921215dabe0b63fb0dd7f6a4b28c18f854a0 Signed-off-by: Thomas Wolf --- WORKSPACE | 18 +++++++++--------- .../org.eclipse.jgit.repository/category.xml | 16 ++++++++-------- .../org.eclipse.jgit.target/jgit-4.17.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.18.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.19.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.20.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.21.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.22.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.23.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.24.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.25.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.26.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.27.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.28.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.29.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.30.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.31.target | 10 +++++----- .../maven/dependencies.tpd | 8 ++++---- pom.xml | 2 +- 19 files changed, 97 insertions(+), 97 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 1600bf623e..21ebc72093 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -273,32 +273,32 @@ maven_jar( src_sha1 = "b012c053d25d902cc64a5c4432a8eedab3241d94", ) -BOUNCYCASTLE_VER = "1.78" +BOUNCYCASTLE_VER = "1.77" maven_jar( name = "bcpg", artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "1df003dd229911855d9c8f4b59a7bd184b3d267d", - src_sha1 = "a6476b91e59d792a22e06c6572b9571394c8c522", + sha1 = "bb0be51e8b378baae6e0d86f5282cd3887066539", + src_sha1 = "33ff3269cede7165dac44033a3b150cc9f9f11cf", ) maven_jar( name = "bcprov", artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "619aafb92dc0b4c6cc4cf86c487ca48ee2d67a8e", - src_sha1 = "9a946b9414436df23a5c3fd360b0bc21ff0153de", + sha1 = "2cc971b6c20949c1ff98d1a4bc741ee848a09523", + src_sha1 = "14ea9a3d759261358c6a1f59490ded125b5273a6", ) maven_jar( name = "bcutil", artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "81c1f5e06f206be5dad137d563609dbe66c81d31", - src_sha1 = "768a52ac0142d65369e226cfc23c47981be95524", + sha1 = "de3eaef351545fe8562cf29ddff4a403a45b49b7", + src_sha1 = "6f8f56ab009e7a3204817a0d45ed9638f5e30116", ) maven_jar( name = "bcpkix", artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "dd61bcdb87678451dd42d42e267979bd4b4451a1", - src_sha1 = "03014d3e874da12c9672dda72f0dbef6c527a8f0", + sha1 = "ed953791ba0229747dd0fd9911e3d76a462acfd3", + src_sha1 = "fdff397d5de0306db014f0a17e91717150db2768", ) 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 4f34fe01a6..e0c790ad90 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -177,28 +177,28 @@ - + - + - + - + - + - + - + - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index 3c7344bc6c..cf278d8d41 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 19641c5c93..c7fdb830dd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index 0269cb9660..b3f4165412 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index 4bdf521d6f..55b6281408 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index f8499ab879..45136a7aaa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 3ec5cef66e..7fe3b68085 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 39aeb66665..e0786fd4eb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index a6b4bbf171..4656b56676 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index 0632dbdb82..efa79b3246 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index e9888ee5e3..a432bbbe12 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index ddb1646718..4b912382d9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index aa1199ef79..7dc8dd82fd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 1a940621e7..d86ea2826d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 2a414d16bb..afd4d320bc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 99ee8b1e94..d95197a43e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.78 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.78 + 1.77 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index d67b95f2ed..8347389018 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -64,22 +64,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.78" + version = "1.77" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.78" + version = "1.77" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.78" + version = "1.77" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.78" + version = "1.77" } } diff --git a/pom.xml b/pom.xml index 1a1d35c8a1..0d035f8067 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 1.7.36 3.6.3 2.10.1 - 1.78 + 1.77 4.8.3.1 3.5.1 3.3.2 -- 2.39.5