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-persistence-jdbc.git
The following commit(s) were added to refs/heads/main by this push:
new 5a4b9f1 Update sbt-header to apply standard Apache Header for new
sources
5a4b9f1 is described below
commit 5a4b9f17e8c07c244a9b515de069cdba767b5dfd
Author: Matthew de Detrich <[email protected]>
AuthorDate: Thu Jul 13 07:26:25 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 329d932..642b5bb 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -49,7 +49,7 @@ trait CopyrightHeader extends AutoPlugin {
(Test / compile).value
})
- def 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:
|
@@ -58,6 +58,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() {
@@ -67,7 +84,8 @@ trait CopyrightHeader extends AutoPlugin {
case Some(currentText) if isValidCopyrightAnnotated(currentText) =>
currentText
case Some(currentText) if isLightbendCopyrighted(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: [email protected]
For additional commands, e-mail: [email protected]
