From 7eb1b13067599c026461987c6026f71b84556ba1 Mon Sep 17 00:00:00 2001
From: Henri Yandell <477715+hyandell@users.noreply.github.com>
Date: Fri, 14 May 2021 15:00:30 -0700
Subject: [PATCH 1/3] Merging THIRD-PARTY-LICENSES into LICENSE

---
 LICENSE | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index bc939514a..bd485dcc1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,9 @@
 AWS JDBC Driver for PostgreSQL and all Amazon modifications to PostgreSQL JDBC Driver
-Copyright Amazon.com Inc. or affiliates.
+Copyright Amazon.com Inc. or affiliates. All rights reserved.
+
+PostgreSQL JDBC Driver - https://jdbc.postgresql.org/
+Copyright (c) 1997, PostgreSQL Global Development Group
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

From 1e629dfb9bb9001a7d31461d266961af77e1bc8c Mon Sep 17 00:00:00 2001
From: Henri Yandell <477715+hyandell@users.noreply.github.com>
Date: Fri, 14 May 2021 15:00:55 -0700
Subject: [PATCH 2/3] Delete THIRD-PARTY-LICENSES

As THIRD-PARTY-LICENSES has been merged into LICENSE
---
 THIRD-PARTY-LICENSES | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 THIRD-PARTY-LICENSES

diff --git a/THIRD-PARTY-LICENSES b/THIRD-PARTY-LICENSES
deleted file mode 100644
index 82d72b1ed..000000000
--- a/THIRD-PARTY-LICENSES
+++ /dev/null
@@ -1,26 +0,0 @@
-The Amazon Web Services (AWS) JDBC Driver for PostgreSQL includes the following third-party software/licensing:
-
-** PostgreSQL JDBC Driver - https://jdbc.postgresql.org/
-Copyright (c) 1997, PostgreSQL Global Development Group
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

From db9be446ddb58b22a7b314f77835d58e250cb085 Mon Sep 17 00:00:00 2001
From: Henri Yandell <477715+hyandell@users.noreply.github.com>
Date: Tue, 18 May 2021 16:37:34 -0700
Subject: [PATCH 3/3] Explaining project structure

Per feedback on https://github.com/awslabs/aws-postgresql-jdbc/pull/35
---
 LICENSE | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index bd485dcc1..950ef7292 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,14 @@
-AWS JDBC Driver for PostgreSQL and all Amazon modifications to PostgreSQL JDBC Driver
+AWS JDBC Driver for PostgreSQL
+
+This driver is based on the existing PostgreSQL JDBC Driver:
+
+    https://jdbc.postgresql.org/
+
+The Amazon driver and all Amazon modifications are licensed under the 
+same license as the PostgreSQL JDBC Driver and are
 Copyright Amazon.com Inc. or affiliates. All rights reserved.
 
-PostgreSQL JDBC Driver - https://jdbc.postgresql.org/
+The original PostgreSQL JDBC Driver is
 Copyright (c) 1997, PostgreSQL Global Development Group
 All rights reserved.