Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply normal apache header new files #109

Merged
merged 2 commits into from
Jul 13, 2023
Merged

Apply normal apache header new files #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b52cf06
Update sbt-header to apply standard Apache Header for new sources
mdedetrich Jul 13, 2023
cce3b58
Fix new sources so that they use the Apache standard header
mdedetrich Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions project/CopyrightHeader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ object CopyrightHeader extends AutoPlugin {
(headerCreate / unmanagedResourceDirectories) += baseDirectory.value / "src" / "main" / "twirl"))
})

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:
|
Expand All @@ -46,6 +46,23 @@ object 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 twirlStyleBlockComment = HeaderCommentStyle.twirlStyleBlockComment.copy(commentCreator = new CommentCreator() {
Expand All @@ -55,7 +72,8 @@ object CopyrightHeader extends AutoPlugin {
case Some(currentText) if isApacheCopyrighted(currentText) || isGenerated(currentText) =>
currentText
case Some(currentText) if isOnlyLightbendCopyrightAnnotated(currentText) =>
HeaderCommentStyle.twirlStyleBlockComment.commentCreator(text, existingText) + NewLine * 2 + currentText
HeaderCommentStyle.twirlStyleBlockComment.commentCreator(apacheFromAkkaSourceHeader,
existingText) + NewLine * 2 + currentText
case Some(currentText) =>
throw new IllegalStateException(s"Unable to detect copyright for header: [$currentText]")
case None =>
Expand Down
14 changes: 11 additions & 3 deletions project/MetaInfLicenseNoticeCopy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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._
Expand Down
14 changes: 11 additions & 3 deletions project/NoPublish.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.grpc
Expand Down