This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 24b4b5d [NO ISSUE][*DB][LIC] Strip html tags from spongycastle license
24b4b5d is described below
commit 24b4b5d647c0f5c0dc91ff932fe0dbfb6b75cd19
Author: Michael Blow <[email protected]>
AuthorDate: Mon Nov 8 09:03:25 2021 -0500
[NO ISSUE][*DB][LIC] Strip html tags from spongycastle license
Change-Id: I2358a7c5deb2cde45aeb1d6b4ee12f2190461109
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14003
Reviewed-by: Michael Blow <[email protected]>
Reviewed-by: Till Westmann <[email protected]>
Tested-by: Michael Blow <[email protected]>
Tested-by: Jenkins <[email protected]>
Integration-Tests: Jenkins <[email protected]>
---
asterixdb/asterix-server/pom.xml | 2 +-
...t.com_rtyley_spongycastle_sc-v1.54.0.0_LICENSE.html.txt} | 13 ++++---------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index ec5b094..d3f86fe 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -326,7 +326,7 @@
</override>
<override>
<gav>com.madgag.spongycastle:core:1.54.0.0</gav>
-
<url>https://raw.githubusercontent.com/rtyley/spongycastle/sc-v1.54.0.0/LICENSE.txt</url>
+
<url>https://raw.githubusercontent.com/rtyley/spongycastle/sc-v1.54.0.0/LICENSE.html.txt</url>
</override>
<override>
<gavs>
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_rtyley_spongycastle_sc-v1.54.0.0_LICENSE.txt
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_rtyley_spongycastle_sc-v1.54.0.0_LICENSE.html.txt
similarity index 92%
rename from
asterixdb/src/main/licenses/content/raw.githubusercontent.com_rtyley_spongycastle_sc-v1.54.0.0_LICENSE.txt
rename to
asterixdb/src/main/licenses/content/raw.githubusercontent.com_rtyley_spongycastle_sc-v1.54.0.0_LICENSE.html.txt
index e3b7cec..6670b4b 100644
---
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_rtyley_spongycastle_sc-v1.54.0.0_LICENSE.txt
+++
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_rtyley_spongycastle_sc-v1.54.0.0_LICENSE.html.txt
@@ -1,22 +1,17 @@
-<html>
-<body bgcolor=#ffffff>
-
Copyright (c) 2000-2015 The Legion of the Bouncy Castle Inc.
(http://www.bouncycastle.org)
-<p>
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software
and associated documentation files (the "Software"), to deal in the Software
without restriction,
including without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do so,
subject to the following conditions:
-<p>
+
The above copyright notice and this permission notice shall be included in all
copies or substantial
portions of the Software.
-<p>
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER
-DEALINGS IN THE SOFTWARE.
-</body>
-</html>
\ No newline at end of file
+DEALINGS IN THE SOFTWARE.
\ No newline at end of file
