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 92c6e5d546023cb8d628fb28f4e67af6bb85e3c6 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 + .../apache/pekko/stream/connectors/google/jwt/JwtSprayJson.scala | 3 +++ LICENSE => legal/StandardLicense.txt | 4 ++-- project/MetaInfLicenseNoticeCopy.scala | 7 +++++++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 20e4bd856..1a6c25202 100644 --- a/LICENSE +++ b/LICENSE @@ -199,3 +199,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +--------------- + +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 47296067c..21dacb373 100644 --- a/build.sbt +++ b/build.sbt @@ -181,6 +181,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/StandardLicense.txt similarity index 99% copy from LICENSE copy to legal/StandardLicense.txt index 20e4bd856..261eeb9e9 100644 --- a/LICENSE +++ b/legal/StandardLicense.txt @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - https://www.apache.org/licenses/ + http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -192,7 +192,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - https://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala index 0061ff373..429dd02fb 100644 --- a/project/MetaInfLicenseNoticeCopy.scala +++ b/project/MetaInfLicenseNoticeCopy.scala @@ -20,8 +20,15 @@ object MetaInfLicenseNoticeCopy extends AutoPlugin { private lazy val baseDir = LocalRootProject / baseDirectory override lazy val projectSettings = Seq( + apacheSonatypeLicenseFile := baseDir.value / "legal" / "StandardLicense.txt", apacheSonatypeDisclaimerFile := Some(baseDir.value / "DISCLAIMER")) + /** + * Settings specific for pekko-connectors-google-common subproject which requires a different license file. + */ + lazy val googleCommonSettings = Seq( + apacheSonatypeLicenseFile := baseDir.value / "LICENSE") + override def trigger = allRequirements override def requires = ApacheSonatypePlugin --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
