You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by pr...@apache.org on 2019/06/14 05:47:40 UTC
[zeppelin] branch master updated: ZEPPELIN-4193 Upgrade Bouncy
Castle bcpkix-jdk15on to 1.60
This is an automated email from the ASF dual-hosted git repository.
prabhjyotsingh 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 475f0f7 ZEPPELIN-4193 Upgrade Bouncy Castle bcpkix-jdk15on to 1.60
475f0f7 is described below
commit 475f0f752599d324ea42c37ce80af43caad3be8c
Author: Renjith Kamath <rk...@apache.org>
AuthorDate: Thu Jun 13 11:46:09 2019 +0530
ZEPPELIN-4193 Upgrade Bouncy Castle bcpkix-jdk15on to 1.60
Upgrade Bouncy Castle bcpkix-jdk15on to 1.60
Improvement
--
[ZEPPELIN-4193](https://issues.apache.org/jira/browse/ZEPPELIN-4193)
Should pass CI
* Does the licenses files need update? Yes
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Renjith Kamath <rk...@apache.org>
Closes #3382 from r-kamath/ZEPPELIN-4193 and squashes the following commits:
29c9df434 [Renjith Kamath] update license
1d4dc281c [Renjith Kamath] ZEPPELIN-4193 Upgrade Bouncy Castle bcpkix-jdk15on to 1.60
Change-Id: I61711b10cd722fcd8f21efd2384fd38e0de85b5d
---
zeppelin-distribution/src/bin_license/LICENSE | 2 +-
zeppelin-interpreter/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE
index 59103f0..1911e6d 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -275,7 +275,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.52 (org.bouncycastle:bcpkix-jdk15on:1.52 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
========================================================================
BSD-style licenses
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index 903a7ee..0a6d92d 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -182,7 +182,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.52</version>
+ <version>1.60</version>
</dependency>
<dependency>