You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by pe...@apache.org on 2022/03/16 19:56:27 UTC
[netbeans] branch master updated: [NETBEANS-4665] - Upgrade Bouncy Castle from 1.68 to 1.70 (#2287)
This is an automated email from the ASF dual-hosted git repository.
pepness pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 8b67cc9 [NETBEANS-4665] - Upgrade Bouncy Castle from 1.68 to 1.70 (#2287)
8b67cc9 is described below
commit 8b67cc926d726b3ef8cb4fc591b84c65da5f6b4d
Author: José Contreras <pe...@apache.org>
AuthorDate: Wed Mar 16 19:56:14 2022 +0000
[NETBEANS-4665] - Upgrade Bouncy Castle from 1.68 to 1.70 (#2287)
- Upgrade bcprov, bcpg and bcpkix
- Add a new module ide/bcutil due to a refactoring in version 1.69
- Remove entry in ignored-overlaps file
---
....64-license.txt => bcpg-jdk15on-1.70-license.txt} | 2 +-
ide/bcpg/external/binaries-list | 2 +-
ide/bcpg/nbproject/project.properties | 2 +-
ide/bcpg/nbproject/project.xml | 2 +-
...8-license.txt => bcpkix-jdk15on-1.70-license.txt} | 2 +-
ide/bcpkix/external/binaries-list | 2 +-
ide/bcpkix/nbproject/project.properties | 2 +-
ide/bcpkix/nbproject/project.xml | 2 +-
...8-license.txt => bcprov-jdk15on-1.70-license.txt} | 2 +-
ide/bcprov/external/binaries-list | 2 +-
ide/bcprov/nbproject/project.properties | 2 +-
ide/bcprov/nbproject/project.xml | 2 +-
ide/{bcpg/nbproject/project.xml => bcutil/build.xml} | 20 +++-----------------
.../external/bcutil-jdk15on-1.70-license.txt} | 4 ++--
ide/{bcpkix => bcutil}/external/binaries-list | 2 +-
ide/bcutil/manifest.mf | 1 +
ide/{bcprov => bcutil}/nbproject/project.properties | 2 +-
ide/{bcprov => bcutil}/nbproject/project.xml | 6 +++---
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 2 --
nbbuild/cluster.properties | 1 +
20 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/ide/bcpg/external/bcpg-jdk15on-1.64-license.txt b/ide/bcpg/external/bcpg-jdk15on-1.70-license.txt
similarity index 98%
copy from ide/bcpg/external/bcpg-jdk15on-1.64-license.txt
copy to ide/bcpg/external/bcpg-jdk15on-1.70-license.txt
index 55adb3d..11ef79e 100644
--- a/ide/bcpg/external/bcpg-jdk15on-1.64-license.txt
+++ b/ide/bcpg/external/bcpg-jdk15on-1.70-license.txt
@@ -1,5 +1,5 @@
Name: Bouncy Castle Java OpenPGP/BCPG
-Version: 1.64
+Version: 1.70
License: MIT-bouncycastle
Origin: https://www.bouncycastle.org/latest_releases.html
Description: Legion of the Bouncy Castle Java cryptography APIs
diff --git a/ide/bcpg/external/binaries-list b/ide/bcpg/external/binaries-list
index daceb49..b826847 100644
--- a/ide/bcpg/external/binaries-list
+++ b/ide/bcpg/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-56956A8C63CCADF62E7C678571CF86F30BD84441 org.bouncycastle:bcpg-jdk15on:1.64
+062F72EC06F31A6C31A3F3355FCE0384B21126D7 org.bouncycastle:bcpg-jdk15on:1.70
diff --git a/ide/bcpg/nbproject/project.properties b/ide/bcpg/nbproject/project.properties
index 50eaedd..9306e3e 100644
--- a/ide/bcpg/nbproject/project.properties
+++ b/ide/bcpg/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/bcpg-jdk15on-1.64.jar=modules/bcpg.jar
+release.external/bcpg-jdk15on-1.70.jar=modules/bcpg.jar
is.autoload=true
diff --git a/ide/bcpg/nbproject/project.xml b/ide/bcpg/nbproject/project.xml
index 4391b2d..dbfacb9 100644
--- a/ide/bcpg/nbproject/project.xml
+++ b/ide/bcpg/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>bcpg.jar</runtime-relative-path>
- <binary-origin>external/bcpg-jdk15on-1.64.jar</binary-origin>
+ <binary-origin>external/bcpg-jdk15on-1.70.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/ide/bcpkix/external/bcpkix-jdk15on-1.68-license.txt b/ide/bcpkix/external/bcpkix-jdk15on-1.70-license.txt
similarity index 98%
rename from ide/bcpkix/external/bcpkix-jdk15on-1.68-license.txt
rename to ide/bcpkix/external/bcpkix-jdk15on-1.70-license.txt
index e54e8d2..27f8db1 100644
--- a/ide/bcpkix/external/bcpkix-jdk15on-1.68-license.txt
+++ b/ide/bcpkix/external/bcpkix-jdk15on-1.70-license.txt
@@ -1,5 +1,5 @@
Name: Bouncy Castle Java Provider
-Version: 1.68
+Version: 1.70
License: MIT-bouncycastle
Origin: https://www.bouncycastle.org/latest_releases.html
Description: Legion of the Bouncy Castle Java cryptography APIs
diff --git a/ide/bcpkix/external/binaries-list b/ide/bcpkix/external/binaries-list
index 70276a0..7daa8a1 100644
--- a/ide/bcpkix/external/binaries-list
+++ b/ide/bcpkix/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-81DA950604FF0B2652348CBD2B48FDE46CED9867 org.bouncycastle:bcpkix-jdk15on:1.68
+F81E5AF49571A9D5A109A88F239A73CE87055417 org.bouncycastle:bcpkix-jdk15on:1.70
diff --git a/ide/bcpkix/nbproject/project.properties b/ide/bcpkix/nbproject/project.properties
index 0dd90fd..3ae544b 100644
--- a/ide/bcpkix/nbproject/project.properties
+++ b/ide/bcpkix/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/bcpkix-jdk15on-1.68.jar=modules/bcpkix.jar
+release.external/bcpkix-jdk15on-1.70.jar=modules/bcpkix.jar
is.autoload=true
diff --git a/ide/bcpkix/nbproject/project.xml b/ide/bcpkix/nbproject/project.xml
index 1f19c8a..524a7ad 100644
--- a/ide/bcpkix/nbproject/project.xml
+++ b/ide/bcpkix/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>bcpkix.jar</runtime-relative-path>
- <binary-origin>external/bcpkix-jdk15on-1.68.jar</binary-origin>
+ <binary-origin>external/bcpkix-jdk15on-1.70.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/ide/bcprov/external/bcprov-jdk15on-1.68-license.txt b/ide/bcprov/external/bcprov-jdk15on-1.70-license.txt
similarity index 98%
rename from ide/bcprov/external/bcprov-jdk15on-1.68-license.txt
rename to ide/bcprov/external/bcprov-jdk15on-1.70-license.txt
index e54e8d2..27f8db1 100644
--- a/ide/bcprov/external/bcprov-jdk15on-1.68-license.txt
+++ b/ide/bcprov/external/bcprov-jdk15on-1.70-license.txt
@@ -1,5 +1,5 @@
Name: Bouncy Castle Java Provider
-Version: 1.68
+Version: 1.70
License: MIT-bouncycastle
Origin: https://www.bouncycastle.org/latest_releases.html
Description: Legion of the Bouncy Castle Java cryptography APIs
diff --git a/ide/bcprov/external/binaries-list b/ide/bcprov/external/binaries-list
index 44c1601..8e22007 100644
--- a/ide/bcprov/external/binaries-list
+++ b/ide/bcprov/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-46A080368D38B428D237A59458F9BC915222894D org.bouncycastle:bcprov-jdk15on:1.68
+4636A0D01F74ACAF28082FB62B317F1080118371 org.bouncycastle:bcprov-jdk15on:1.70
diff --git a/ide/bcprov/nbproject/project.properties b/ide/bcprov/nbproject/project.properties
index 4ead27d..3073cdf 100644
--- a/ide/bcprov/nbproject/project.properties
+++ b/ide/bcprov/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/bcprov-jdk15on-1.68.jar=modules/bcprov.jar
+release.external/bcprov-jdk15on-1.70.jar=modules/bcprov.jar
is.autoload=true
diff --git a/ide/bcprov/nbproject/project.xml b/ide/bcprov/nbproject/project.xml
index bef4bd1..3aec94c 100644
--- a/ide/bcprov/nbproject/project.xml
+++ b/ide/bcprov/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>bcprov.jar</runtime-relative-path>
- <binary-origin>external/bcprov-jdk15on-1.68.jar</binary-origin>
+ <binary-origin>external/bcprov-jdk15on-1.70.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/ide/bcpg/nbproject/project.xml b/ide/bcutil/build.xml
similarity index 59%
copy from ide/bcpg/nbproject/project.xml
copy to ide/bcutil/build.xml
index 4391b2d..5160736 100644
--- a/ide/bcpg/nbproject/project.xml
+++ b/ide/bcutil/build.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -8,28 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
http://www.apache.org/licenses/LICENSE-2.0
-
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
- <code-name-base>bcpg</code-name-base>
- <module-dependencies/>
- <public-packages/>
- <class-path-extension>
- <runtime-relative-path>bcpg.jar</runtime-relative-path>
- <binary-origin>external/bcpg-jdk15on-1.64.jar</binary-origin>
- </class-path-extension>
- </data>
- </configuration>
+<project name="ide/bcutil" default="build" basedir=".">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+ <target name="jar"/>
</project>
diff --git a/ide/bcpg/external/bcpg-jdk15on-1.64-license.txt b/ide/bcutil/external/bcutil-jdk15on-1.70-license.txt
similarity index 94%
rename from ide/bcpg/external/bcpg-jdk15on-1.64-license.txt
rename to ide/bcutil/external/bcutil-jdk15on-1.70-license.txt
index 55adb3d..a578f73 100644
--- a/ide/bcpg/external/bcpg-jdk15on-1.64-license.txt
+++ b/ide/bcutil/external/bcutil-jdk15on-1.70-license.txt
@@ -1,5 +1,5 @@
-Name: Bouncy Castle Java OpenPGP/BCPG
-Version: 1.64
+Name: Bouncy Castle ASN.1 Extension and Utility APIs
+Version: 1.70
License: MIT-bouncycastle
Origin: https://www.bouncycastle.org/latest_releases.html
Description: Legion of the Bouncy Castle Java cryptography APIs
diff --git a/ide/bcpkix/external/binaries-list b/ide/bcutil/external/binaries-list
similarity index 90%
copy from ide/bcpkix/external/binaries-list
copy to ide/bcutil/external/binaries-list
index 70276a0..f1dae6e 100644
--- a/ide/bcpkix/external/binaries-list
+++ b/ide/bcutil/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-81DA950604FF0B2652348CBD2B48FDE46CED9867 org.bouncycastle:bcpkix-jdk15on:1.68
+54280E7195A7430D7911DED93FC01E07300B9526 org.bouncycastle:bcutil-jdk15on:1.70
diff --git a/ide/bcutil/manifest.mf b/ide/bcutil/manifest.mf
new file mode 100644
index 0000000..73e163d
--- /dev/null
+++ b/ide/bcutil/manifest.mf
@@ -0,0 +1 @@
+OpenIDE-Module: bcutil
\ No newline at end of file
diff --git a/ide/bcprov/nbproject/project.properties b/ide/bcutil/nbproject/project.properties
similarity index 93%
copy from ide/bcprov/nbproject/project.properties
copy to ide/bcutil/nbproject/project.properties
index 4ead27d..54bc484 100644
--- a/ide/bcprov/nbproject/project.properties
+++ b/ide/bcutil/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/bcprov-jdk15on-1.68.jar=modules/bcprov.jar
+release.external/bcutil-jdk15on-1.70.jar=modules/bcutil.jar
is.autoload=true
diff --git a/ide/bcprov/nbproject/project.xml b/ide/bcutil/nbproject/project.xml
similarity index 87%
copy from ide/bcprov/nbproject/project.xml
copy to ide/bcutil/nbproject/project.xml
index bef4bd1..a8a3ce3 100644
--- a/ide/bcprov/nbproject/project.xml
+++ b/ide/bcutil/nbproject/project.xml
@@ -23,12 +23,12 @@
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
- <code-name-base>bcprov</code-name-base>
+ <code-name-base>bcutil</code-name-base>
<module-dependencies/>
<public-packages/>
<class-path-extension>
- <runtime-relative-path>bcprov.jar</runtime-relative-path>
- <binary-origin>external/bcprov-jdk15on-1.68.jar</binary-origin>
+ <runtime-relative-path>bcutil.jar</runtime-relative-path>
+ <binary-origin>external/bcutil-jdk15on-1.70.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 2dedaf6..14fb118 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -84,8 +84,6 @@ extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/junit-4.
extide/gradle/external/gradle-7.4-bin.zip platform/libs.testng/external/jcommander-1.78.jar
extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.io/external/commons-io-2.6.jar
extide/gradle/external/gradle-7.4-bin.zip enterprise/cloud.oracle/external/jsr305-3.0.2.jar
-extide/gradle/external/gradle-7.4-bin.zip ide/bcpkix/external/bcpkix-jdk15on-1.68.jar
-extide/gradle/external/gradle-7.4-bin.zip ide/bcprov/external/bcprov-jdk15on-1.68.jar
extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.15.jar
extide/gradle/external/gradle-7.4-bin.zip platform/libs.asm/external/asm-9.2.jar
extide/gradle/external/gradle-7.4-bin.zip platform/libs.asm/external/asm-commons-9.2.jar
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 8bb3903..ec87c97 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -319,6 +319,7 @@ nb.cluster.ide=\
bcpg,\
bcpkix,\
bcprov,\
+ bcutil,\
bugtracking,\
bugtracking.bridge,\
bugtracking.commons,\
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists