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 07:02:41 UTC
[incubator-pekko-management] 01/02: Update sbt-header to apply standard Apache Header for new sources
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-management.git
commit 33bef4ef5312163954664452dfa9e9673b373e12
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Jul 13 08:23:38 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 d721d3fb..859c9692 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -47,7 +47,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:
|
@@ -56,6 +56,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: CommentStyle = HeaderCommentStyle.cStyleBlockComment.copy(commentCreator = new CommentCreator() {
@@ -65,7 +82,8 @@ trait CopyrightHeader extends AutoPlugin {
case Some(currentText) if isValidCopyrightAnnotated(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