From 4169e93246cb4c6b4b88e38d4f53c3b9ca69de10 Mon Sep 17 00:00:00 2001
From: Hee Tatt Ooi <hee.tatt.ooi@sap.com>
Date: Thu, 11 Jun 2020 12:52:16 +0200
Subject: [PATCH] Update 3rd party notices (#377)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Update 3rd party notices
* libs in display texts
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
Corona-Warn-App/src/main/assets/technical_de.html | 8 ++++----
Corona-Warn-App/src/main/assets/technical_en.html | 8 ++++----
THIRD-PARTY-NOTICES | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Corona-Warn-App/src/main/assets/technical_de.html b/Corona-Warn-App/src/main/assets/technical_de.html
index c912907b9..b7a68c45b 100644
--- a/Corona-Warn-App/src/main/assets/technical_de.html
+++ b/Corona-Warn-App/src/main/assets/technical_de.html
@@ -38,10 +38,6 @@
Licensor: Xtreme Labs, Pivotal Labs and Google Inc.
Website: https://robolectric.org/
License: MIT</p>
-<p>Component: RootBeer
- Licensor: Scott Alexander-Bown, Mat Rollings
- Website: https://github.com/scottyab/rootbeer
- License: Apache 2.0</p>
<p>Component: Zxing
Licensor: zxing
Website: https://github.com/zxing/zxing/
@@ -78,6 +74,10 @@
Licensor: Google
Website: https://github.com/google/protobuf-gradle-plugin
License: BSD 3-Clause</p>
+<p>Component: Conscrypt
+ Licensor: Conscrypt
+ Website: https://github.com/google/conscrypt
+ License: Apache 2.0</p>
<p>Copyright (c) 2008-2020 Zetetic LLC
All rights reserved.</p>
<p>Redistribution and use in source and binary forms, with or without
diff --git a/Corona-Warn-App/src/main/assets/technical_en.html b/Corona-Warn-App/src/main/assets/technical_en.html
index c912907b9..b7a68c45b 100644
--- a/Corona-Warn-App/src/main/assets/technical_en.html
+++ b/Corona-Warn-App/src/main/assets/technical_en.html
@@ -38,10 +38,6 @@
Licensor: Xtreme Labs, Pivotal Labs and Google Inc.
Website: https://robolectric.org/
License: MIT</p>
-<p>Component: RootBeer
- Licensor: Scott Alexander-Bown, Mat Rollings
- Website: https://github.com/scottyab/rootbeer
- License: Apache 2.0</p>
<p>Component: Zxing
Licensor: zxing
Website: https://github.com/zxing/zxing/
@@ -78,6 +74,10 @@
Licensor: Google
Website: https://github.com/google/protobuf-gradle-plugin
License: BSD 3-Clause</p>
+<p>Component: Conscrypt
+ Licensor: Conscrypt
+ Website: https://github.com/google/conscrypt
+ License: Apache 2.0</p>
<p>Copyright (c) 2008-2020 Zetetic LLC
All rights reserved.</p>
<p>Redistribution and use in source and binary forms, with or without
diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES
index bf493454e..43ece18c0 100644
--- a/THIRD-PARTY-NOTICES
+++ b/THIRD-PARTY-NOTICES
@@ -50,11 +50,6 @@ Licensor: Xtreme Labs, Pivotal Labs and Google Inc.
Website: http://robolectric.org/
License: MIT
-Component: RootBeer
-Licensor: Scott Alexander-Bown, Mat Rollings
-Website: https://github.com/scottyab/rootbeer
-License: Apache 2.0
-
Component: Zxing
Licensor: zxing
Website: https://github.com/zxing/zxing/
@@ -110,6 +105,11 @@ Licensor: Jake Wharton
Website: https://github.com/JakeWharton/timber/
License: Apache 2.0
+Component: Conscrypt
+Licensor: Conscrypt
+Website: https://github.com/google/conscrypt
+License: Apache 2.0
+
--------------------------------------------------------------------------------
Copyright (c) 2008-2020 Zetetic LLC
All rights reserved.
--
GitLab