This is an automated email from the ASF dual-hosted git repository. fanningpj pushed a commit to branch scala3 in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
commit 28744d84f3cfbc7a23c734aa036bd3be97a1c654 Author: PJ Fanning <[email protected]> AuthorDate: Mon Jun 26 19:20:36 2023 +0100 acknowledge use of jwt-scala code (#181) --- LICENSE | 7 +++++ build.sbt | 1 + .../connectors/google/jwt/JwtSprayJson.scala | 3 ++ LICENSE => legal/GoogleCommonLicense.txt | 34 +++------------------- project/MetaInfLicenseNoticeCopy.scala | 3 ++ 5 files changed, 18 insertions(+), 30 deletions(-) diff --git a/LICENSE b/LICENSE index dff33d762..e8e5b8a10 100644 --- a/LICENSE +++ b/LICENSE @@ -232,3 +232,10 @@ This code was released under an Apache 2.0 license. AWS SDK for Java Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. + +--------------- + +pekko-connectors-google-common contains `org.apache.pekko.stream.connectors.google.jwt.JwtSprayJson.scala` +which is copied from jwt-scala <https://github.com/jwt-scala/jwt-scala>. +The original code was released under the Apache 2.0 license. +Copyright 2021 JWT-Scala Contributors. diff --git a/build.sbt b/build.sbt index a6b815c93..71a978158 100644 --- a/build.sbt +++ b/build.sbt @@ -194,6 +194,7 @@ lazy val googleCommon = pekkoConnectorProject( "google-common", "google.common", Dependencies.GoogleCommon, + MetaInfLicenseNoticeCopy.googleCommonSettings, Test / fork := true) lazy val googleCloudBigQuery = pekkoConnectorProject( diff --git a/google-common/src/main/scala/org/apache/pekko/stream/connectors/google/jwt/JwtSprayJson.scala b/google-common/src/main/scala/org/apache/pekko/stream/connectors/google/jwt/JwtSprayJson.scala index 854d84f81..d10fff1ca 100644 --- a/google-common/src/main/scala/org/apache/pekko/stream/connectors/google/jwt/JwtSprayJson.scala +++ b/google-common/src/main/scala/org/apache/pekko/stream/connectors/google/jwt/JwtSprayJson.scala @@ -18,6 +18,9 @@ import spray.json._ /** * Implementation of `JwtCore` using `JsObject` from spray-json. + * + * This is a copy of Apache licensed (version 2.0) code from + * https://github.com/jwt-scala/jwt-scala/blob/224f16124ea49a1cc5144a647e3767de4267ee7c/json/spray-json/src/main/scala/JwtSprayJson.scala */ @InternalApi private[google] trait JwtSprayJsonParser[H, C] extends JwtJsonCommon[JsObject, H, C] { diff --git a/LICENSE b/legal/GoogleCommonLicense.txt similarity index 90% copy from LICENSE copy to legal/GoogleCommonLicense.txt index dff33d762..1a6c25202 100644 --- a/LICENSE +++ b/legal/GoogleCommonLicense.txt @@ -202,33 +202,7 @@ --------------- -pekko-mqtt-streaming contains code from paho.mqtt.java <https://github.com/eclipse/paho.mqtt.java>. -This code was released under a dual license: -Eclipse Public License version 2.0 and Eclipse Distribution License. -We choose to use the code under the Eclipse Distribution License. - - - mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/impl/RequestState.scala - -Eclipse Public License - v 2.0 - -This program and the accompanying materials -are made available under the terms of the Eclipse Public License v2.0 -and Eclipse Distribution License v1.0 which accompany this distribution. - -The Eclipse Public License is available at - https://www.eclipse.org/legal/epl-2.0/ -and the Eclipse Distribution License is available at - https://www.eclipse.org/org/documents/edl-v10.php - -For an explanation of what dual-licensing means to you, see: -https://www.eclipse.org/legal/eplfaq.php#DUALLIC - ---------------- - -pekko-connectors-s3 contains code from aws-sdk-java <https://github.com/aws/aws-sdk-java>. -This code was released under an Apache 2.0 license. - - - s3/src/main/scala/org/apache/pekko/stream/connectors/s3/Utils.scala - -AWS SDK for Java -Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. +pekko-connectors-google-common contains `org.apache.pekko.stream.connectors.google.jwt.JwtSprayJson.scala` +which is copied from jwt-scala <https://github.com/jwt-scala/jwt-scala>. +The original code was released under the Apache 2.0 license. +Copyright 2021 JWT-Scala Contributors. diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala index f2f7d7138..dafe920d8 100644 --- a/project/MetaInfLicenseNoticeCopy.scala +++ b/project/MetaInfLicenseNoticeCopy.scala @@ -39,6 +39,9 @@ object MetaInfLicenseNoticeCopy extends AutoPlugin { apacheSonatypeLicenseFile := baseDir.value / "legal" / "S3License.txt", apacheSonatypeNoticeFile := baseDir.value / "legal" / "S3Notice.txt") + lazy val googleCommonSettings = Seq( + apacheSonatypeLicenseFile := baseDir.value / "legal" / "GoogleCommonLicense.txt") + override def trigger = allRequirements override def requires = ApacheSonatypePlugin --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
