From 7ee003cb3fb9fe0d68d9d84a45fc9f1f5267dfb1 Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Fri, 12 Feb 2021 15:52:19 -0800 Subject: [PATCH 1/3] license.yaml fixes for code introduced related to AWS RDS token based password provider in PR #9518 --- licenses.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/licenses.yaml b/licenses.yaml index 15ef2014e328..183a4468c602 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -148,7 +148,7 @@ source_paths: --- name: AWS RDS SDK for Java -license_category: source +license_category: binary module: extensions/druid-aws-rds-extensions license_name: Apache License version 2.0 version: 1.11.884 @@ -157,6 +157,15 @@ libraries: --- +name: Code adopted from org.apache.commons.dbcp2.BasicDataSource +license_category: source +module: server +license_name: Apache License version 2.0 +source_paths: + - server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java + +--- + name: LDAP string encoding function from OWASP ESAPI license_category: source module: extensions/druid-basic-security From 0a7c91ff0ee35ab4cc3ce096116745a7b6550ade Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Tue, 16 Feb 2021 14:06:57 -0800 Subject: [PATCH 2/3] add notice for commons-dbcp in license file --- licenses.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/licenses.yaml b/licenses.yaml index 183a4468c602..6f25d24bada0 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -163,6 +163,12 @@ module: server license_name: Apache License version 2.0 source_paths: - server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java +notice: | + Apache Commons DBCP + Copyright 2001-2020 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (https://www.apache.org/). --- From 0074ac92902ff7394335e0699013a041ad813efd Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Fri, 5 Mar 2021 08:36:49 -0800 Subject: [PATCH 3/3] add version and update NOTICE file --- NOTICE | 8 ++++++++ licenses.yaml | 1 + 2 files changed, 9 insertions(+) diff --git a/NOTICE b/NOTICE index b9087b99e90b..7761a54db9f0 100644 --- a/NOTICE +++ b/NOTICE @@ -86,6 +86,14 @@ Copyright 2011-2017 Metamarkets Group Inc. extendedset Copyright 2012 Metamarkets Group Inc. +================= Apache Commons DBCP2 2.0.1 ================= + +Apache Commons DBCP +Copyright 2001-2020 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/). + ------------------------------------------------------------------------------- This library contains a modified version of Alessandro Colantonio's CONCISE diff --git a/licenses.yaml b/licenses.yaml index 6f25d24bada0..9bf7ca121f84 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -161,6 +161,7 @@ name: Code adopted from org.apache.commons.dbcp2.BasicDataSource license_category: source module: server license_name: Apache License version 2.0 +version: 2.0.1 source_paths: - server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java notice: |