From fbfc6df1075dd6dcbfe8e2dadefbcf1e81af1660 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 17 Apr 2023 00:46:03 +0200 Subject: [PATCH] Update bouncycastle to 1.73 Review requests were created for maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.73 https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/7892 maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.73 https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/7893 maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.73 https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/7894 Change-Id: I389cdd7500d7d9292d7ea5eee142492dd1db7112 --- WORKSPACE | 20 +++++++++---------- .../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 +++++----- .../maven/dependencies.tpd | 8 ++++---- pom.xml | 4 ++-- 13 files changed, 66 insertions(+), 66 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 33a80e53b..56d52c542 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -265,32 +265,32 @@ maven_jar( src_sha1 = "b229198672cfb765ce7571e5e0e855e01170f881", ) -BOUNCYCASTLE_VER = "1.72" +BOUNCYCASTLE_VER = "1.73" maven_jar( name = "bcpg", - artifact = "org.bouncycastle:bcpg-jdk18on:1.72.2", - sha1 = "ef29db0e82cf1ee99ddf5d772e810c1beb2d70f1", - src_sha1 = "72936958f07df15946f4eb6cd2ae558d8d24ed1c", + artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER, + sha1 = "2838f8c35e6e716349ce780c9c88271cab32065d", + src_sha1 = "3ea8d8e88569024cb37c303384d33f12e8be1ca3", ) maven_jar( name = "bcprov", artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "d8dc62c28a3497d29c93fee3e71c00b27dff41b4", - src_sha1 = "308b5a8a89c29169390210b7b8e2b2534b27ff19", + sha1 = "4bd3de48e5153059fe3f80cbcf86ea221795ee55", + src_sha1 = "665f03dc0b10ef2fc90a11c28e48c84a3a9a7323", ) maven_jar( name = "bcutil", artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "41f19a69ada3b06fa48781120d8bebe1ba955c77", - src_sha1 = "fc16dc9eb28a2ee6cbe35ecda6ec7e050ddf3cba", + sha1 = "073a680acd04b249a6773f49200092cadb670bf0", + src_sha1 = "573ebc8e83bc846e815e68e4c624f2d0aef941b9", ) maven_jar( name = "bcpkix", artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "bb3fdb5162ccd5085e8d7e57fada4d8eaa571f5a", - src_sha1 = "6fa7015a0be76b270e911bf426abf8efd1c5e42d", + sha1 = "fd41dae0f564a93888ed5ade426281de94824717", + src_sha1 = "e11d418a87536d6f5a9537f7cb1f15a3e5c505e9", ) 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 e15d9b756..ed364f565 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 89f4fb3c5..54bd2c777 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 52839196a..5c26ff7de 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 2ddc2f51a..b520e36b0 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 c67a3b931..de01de9b1 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 636f58aa0..4cee278e6 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 cf677f79a..ff8373b90 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 5d851fa77..859d0fa54 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 db5de4284..b65b23471 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 6b57652a2..17c7a01ab 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 @@ - + @@ -86,25 +86,25 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + 1.73 jar org.bouncycastle bcprov-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcpkix-jdk18on - 1.72 + 1.73 jar org.bouncycastle bcutil-jdk18on - 1.72 + 1.73 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 9f2220fd9..877cfe0f8 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 @@ -9,21 +9,21 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.72.2" + version = "1.73" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.72" + version = "1.73" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.72" + version = "1.73" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.72" + version = "1.73" } } diff --git a/pom.xml b/pom.xml index d2004f5ef..24eff8512 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ 1.7.30 3.4.1 2.10.1 - 1.72 + 1.73 4.7.3.0 3.4.2 3.3.0 @@ -762,7 +762,7 @@ org.bouncycastle bcpg-jdk18on - 1.72.2 + ${bouncycastle-version}