diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala index 0d4f11ac..f7aab115 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 = HeaderCommentStyle.cStyleBlockComment.copy(commentCreator = new CommentCreator() { @@ -65,7 +82,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 =>