You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/08/06 14:13:40 UTC
[incubator-pekko-connectors] branch main updated: acknowledge use of aws code (#213)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 5963645dd acknowledge use of aws code (#213)
5963645dd is described below
commit 5963645ddcfbe7b6a6fde67ec3472626449119f3
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Sun Aug 6 15:13:34 2023 +0100
acknowledge use of aws code (#213)
* acknowledge use of aws code
* Update CopyrightHeader.scala
---
LICENSE | 10 ++++++++++
NOTICE | 11 +++++++++++
build.sbt | 3 ++-
NOTICE => legal/PekkoConnectorsNotice.txt | 0
LICENSE => legal/S3License.txt | 10 ++++++++++
NOTICE => legal/S3Notice.txt | 11 +++++++++++
LICENSE => legal/StandardLicense.txt | 4 ++--
project/CopyrightHeader.scala | 1 +
project/MetaInfLicenseNoticeCopy.scala | 6 ++++++
.../org/apache/pekko/stream/connectors/s3/Utils.scala | 14 ++++++++++----
10 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/LICENSE b/LICENSE
index 20e4bd856..d09077e81 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,13 @@
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-s3 contains code aws-sdk-java <from 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.
diff --git a/NOTICE b/NOTICE
index be9af4dbd..7d12ff7a5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -9,3 +9,14 @@ Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
Apache Pekko Connectors is derived from Alpakka 4.0.x, the last version that was distributed under the
Apache License, Version 2.0 License.
+
+---------------
+
+pekko-connectors-s3 contains code aws-sdk-java <from https://github.com/aws/aws-sdk-java>.
+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.
+
+This product includes software developed by
+Amazon Technologies, Inc (http://www.amazon.com/).
diff --git a/build.sbt b/build.sbt
index 16ae3b173..730156ec7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -305,7 +305,8 @@ lazy val orientdb =
lazy val reference = internalProject("reference", Dependencies.Reference)
.dependsOn(testkit % Test)
-lazy val s3 = pekkoConnectorProject("s3", "aws.s3", Dependencies.S3)
+lazy val s3 = pekkoConnectorProject("s3", "aws.s3", Dependencies.S3,
+ MetaInfLicenseNoticeCopy.s3Settings)
lazy val pravega = pekkoConnectorProject(
"pravega",
diff --git a/NOTICE b/legal/PekkoConnectorsNotice.txt
similarity index 100%
copy from NOTICE
copy to legal/PekkoConnectorsNotice.txt
diff --git a/LICENSE b/legal/S3License.txt
similarity index 97%
copy from LICENSE
copy to legal/S3License.txt
index 20e4bd856..d09077e81 100644
--- a/LICENSE
+++ b/legal/S3License.txt
@@ -199,3 +199,13 @@
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-s3 contains code aws-sdk-java <from 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.
diff --git a/NOTICE b/legal/S3Notice.txt
similarity index 59%
copy from NOTICE
copy to legal/S3Notice.txt
index be9af4dbd..7d12ff7a5 100644
--- a/NOTICE
+++ b/legal/S3Notice.txt
@@ -9,3 +9,14 @@ Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
Apache Pekko Connectors is derived from Alpakka 4.0.x, the last version that was distributed under the
Apache License, Version 2.0 License.
+
+---------------
+
+pekko-connectors-s3 contains code aws-sdk-java <from https://github.com/aws/aws-sdk-java>.
+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.
+
+This product includes software developed by
+Amazon Technologies, Inc (http://www.amazon.com/).
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/CopyrightHeader.scala b/project/CopyrightHeader.scala
index f72e2a48d..5b53d1596 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -118,6 +118,7 @@ trait CopyrightHeader extends AutoPlugin {
private def isApacheCopyrighted(text: String): Boolean =
StringUtils.containsIgnoreCase(text, "licensed to the apache software foundation (asf)") ||
StringUtils.containsIgnoreCase(text, "www.apache.org/licenses/license-2.0") ||
+ StringUtils.contains(text, "Apache License, Version 2.0") ||
StringUtils.contains(text, "Apache-2.0")
private def isLightbendCopyrighted(text: String): Boolean =
diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala
index 019e502d7..d210ea72e 100644
--- a/project/MetaInfLicenseNoticeCopy.scala
+++ b/project/MetaInfLicenseNoticeCopy.scala
@@ -28,8 +28,14 @@ object MetaInfLicenseNoticeCopy extends AutoPlugin {
private lazy val baseDir = LocalRootProject / baseDirectory
override lazy val projectSettings = Seq(
+ apacheSonatypeLicenseFile := baseDir.value / "legal" / "StandardLicense.txt",
+ apacheSonatypeNoticeFile := baseDir.value / "legal" / "PekkoConnectorsNotice.txt",
apacheSonatypeDisclaimerFile := Some(baseDir.value / "DISCLAIMER"))
+ lazy val s3Settings = Seq(
+ apacheSonatypeLicenseFile := baseDir.value / "legal" / "S3License.txt",
+ apacheSonatypeNoticeFile := baseDir.value / "legal" / "S3Notice.txt")
+
override def trigger = allRequirements
override def requires = ApacheSonatypePlugin
diff --git a/s3/src/main/scala/org/apache/pekko/stream/connectors/s3/Utils.scala b/s3/src/main/scala/org/apache/pekko/stream/connectors/s3/Utils.scala
index 64a25e00a..a290ec1a8 100644
--- a/s3/src/main/scala/org/apache/pekko/stream/connectors/s3/Utils.scala
+++ b/s3/src/main/scala/org/apache/pekko/stream/connectors/s3/Utils.scala
@@ -1,10 +1,16 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
+ * Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
- * https://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
*
- * This file is part of the Apache Pekko project, which was derived from Akka.
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, 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.
*/
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org