You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2022/03/24 08:15:06 UTC
[zeppelin] branch master updated: Revert "bouncycastle 1.68 (#4316)"
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 49b2e59 Revert "bouncycastle 1.68 (#4316)"
49b2e59 is described below
commit 49b2e59625f54e29d787e94c8483980a90952014
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Thu Mar 24 16:14:50 2022 +0800
Revert "bouncycastle 1.68 (#4316)"
This reverts commit 75452443e2c05c67211adeb0d39061ee74442212.
---
pom.xml | 2 +-
zeppelin-distribution/src/bin_license/LICENSE | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0254165..b4857d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
<commons.collections.version>3.2.2</commons.collections.version>
<commons.cli.version>1.4</commons.cli.version>
<shiro.version>1.7.0</shiro.version>
- <bouncycastle.version>1.68</bouncycastle.version>
+ <bouncycastle.version>1.60</bouncycastle.version>
<maven.version>3.6.3</maven.version>
<dropwizard.version>4.1.14</dropwizard.version>
<micrometer.version>1.6.0</micrometer.version>
diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE
index 6b7f84e..583b8c0 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -293,7 +293,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
(The MIT License) headroom.js 0.9.3 (https://github.com/WickyNilliams/headroom.js) - https://github.com/WickyNilliams/headroom.js/blob/master/LICENSE
(The MIT License) angular-viewport-watch 0.135 (https://github.com/wix/angular-viewport-watch) - https://github.com/wix/angular-viewport-watch/blob/master/LICENSE
(The MIT License) ansi-up 2.0.2 (https://github.com/drudru/ansi_up) - https://github.com/drudru/ansi_up#license
- (The MIT License) bcpkix-jdk15on 1.68 (org.bouncycastle:bcpkix-jdk15on:1.60 https://github.com/bcgit/bc-java) - https://github.com/bcgit/bc-java/blob/master/LICENSE.html
+ (The MIT License) bcpkix-jdk15on 1.60 (org.bouncycastle:bcpkix-jdk15on:1.60 https://github.com/bcgit/bc-java) - https://github.com/bcgit/bc-java/blob/master/LICENSE.html
(The MIT License) influxdb-client-java 1.4.0 (com.influxdb:influxdb-client-java:1.4.0 https://github.com/influxdata/influxdb-client-java) - https://github.com/influxdata/influxdb-client-java/blob/master/LICENSE
========================================================================