You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/07/13 05:45:15 UTC

[incubator-pekko-connectors] branch main updated (a7e23f7a2 -> cdb0d4abd)

This is an automated email from the ASF dual-hosted git repository.

mdedetrich pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git


    from a7e23f7a2 fix some compiler warnings (#188)
     new 16fb2c17e Update sbt-header to apply standard Apache Header for new sources
     new cdb0d4abd Fix new sources so that they use the Apache standard header

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../huawei/pushkit/HmsSettingsSpec.scala           | 14 +++++++++++---
 project/CopyrightHeader.scala                      | 22 ++++++++++++++++++++--
 project/MetaInfLicenseNoticeCopy.scala             | 14 +++++++++++---
 .../pekko/stream/connectors/s3/TestUtils.scala     | 14 +++++++++++---
 .../stream/connectors/s3/scaladsl/Generators.scala | 14 +++++++++++---
 5 files changed, 64 insertions(+), 14 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org


[incubator-pekko-connectors] 02/02: Fix new sources so that they use the Apache standard header

Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git

commit cdb0d4abdedf95675163c97d8ab514eb530d569a
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Jul 13 07:21:22 2023 +0200

    Fix new sources so that they use the Apache standard header
---
 .../stream/connectors/huawei/pushkit/HmsSettingsSpec.scala | 14 +++++++++++---
 project/MetaInfLicenseNoticeCopy.scala                     | 14 +++++++++++---
 .../org/apache/pekko/stream/connectors/s3/TestUtils.scala  | 14 +++++++++++---
 .../pekko/stream/connectors/s3/scaladsl/Generators.scala   | 14 +++++++++++---
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/huawei-push-kit/src/test/scala/org/apache/pekko/stream/connectors/huawei/pushkit/HmsSettingsSpec.scala b/huawei-push-kit/src/test/scala/org/apache/pekko/stream/connectors/huawei/pushkit/HmsSettingsSpec.scala
index 1635c8220..c5bd4346d 100644
--- a/huawei-push-kit/src/test/scala/org/apache/pekko/stream/connectors/huawei/pushkit/HmsSettingsSpec.scala
+++ b/huawei-push-kit/src/test/scala/org/apache/pekko/stream/connectors/huawei/pushkit/HmsSettingsSpec.scala
@@ -1,10 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); 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
  *
- * This file is part of the Apache Pekko project, which was derived from Akka.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License 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.
  */
 
 package org.apache.pekko.stream.connectors.huawei.pushkit
diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala
index 0061ff373..019e502d7 100644
--- a/project/MetaInfLicenseNoticeCopy.scala
+++ b/project/MetaInfLicenseNoticeCopy.scala
@@ -1,10 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); 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
  *
- * This file is part of the Apache Pekko project, which was derived from Akka.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License 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.
  */
 
 import sbt.Keys._
diff --git a/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/TestUtils.scala b/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/TestUtils.scala
index 3893431b5..85fb79a05 100644
--- a/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/TestUtils.scala
+++ b/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/TestUtils.scala
@@ -1,10 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); 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
  *
- * This file is part of the Apache Pekko project, which was derived from Akka.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License 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.
  */
 
 package org.apache.pekko.stream.connectors.s3
diff --git a/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/Generators.scala b/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/Generators.scala
index dc831d5be..80ab5f257 100644
--- a/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/Generators.scala
+++ b/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/Generators.scala
@@ -1,10 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); 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
  *
- * This file is part of the Apache Pekko project, which was derived from Akka.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License 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.
  */
 
 package org.apache.pekko.stream.connectors.s3.scaladsl


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org


[incubator-pekko-connectors] 01/02: Update sbt-header to apply standard Apache Header for new sources

Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git

commit 16fb2c17e817bea69ba43f49059e6544ec0e48ab
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Jul 13 07:17:53 2023 +0200

    Update sbt-header to apply standard Apache Header for new sources
---
 project/CopyrightHeader.scala | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
index 8bc86de08..f72e2a48d 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -48,7 +48,7 @@ trait CopyrightHeader extends AutoPlugin {
         (Test / compile).value
       })
 
-  val apacheHeader: String =
+  val apacheFromAkkaSourceHeader: String =
     """Licensed to the Apache Software Foundation (ASF) under one or more
       |license agreements; and to You under the Apache License, version 2.0:
       |
@@ -57,6 +57,23 @@ trait CopyrightHeader extends AutoPlugin {
       |This file is part of the Apache Pekko project, which was derived from Akka.
       |""".stripMargin
 
+  val apacheHeader: String =
+    """Licensed to the Apache Software Foundation (ASF) under one or more
+      |contributor license agreements. See the NOTICE file distributed with
+      |this work for additional information regarding copyright ownership.
+      |The ASF licenses this file to You under the Apache License, Version 2.0
+      |(the "License"); you may not use this file except in compliance with
+      |the License. You may obtain a copy of the License at
+      |
+      |   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,
+      |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.
+      |""".stripMargin
+
   val apacheSpdxHeader: String = "SPDX-License-Identifier: Apache-2.0"
 
   val cStyleComment = HeaderCommentStyle.cStyleBlockComment.copy(commentCreator = new CommentCreator() {
@@ -66,7 +83,8 @@ trait CopyrightHeader extends AutoPlugin {
         case Some(currentText) if isApacheCopyrighted(currentText) || isGenerated(currentText) =>
           currentText
         case Some(currentText) if isOnlyLightbendCopyrightAnnotated(currentText) =>
-          HeaderCommentStyle.cStyleBlockComment.commentCreator(text, existingText) + NewLine * 2 + currentText
+          HeaderCommentStyle.cStyleBlockComment.commentCreator(apacheFromAkkaSourceHeader,
+            existingText) + NewLine * 2 + currentText
         case Some(currentText) =>
           throw new IllegalStateException(s"Unable to detect copyright for header: [$currentText]")
         case None =>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org