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:39:40 UTC
[incubator-pekko-grpc] branch main updated (a605bcfb -> 3692cf7c)
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-grpc.git
from a605bcfb Fix typos
new 3aae4d21 Update sbt-header to apply standard Apache Header for new sources
new 3692cf7c 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:
project/CopyrightHeader.scala | 22 ++++++++++++++++++++--
project/MetaInfLicenseNoticeCopy.scala | 14 +++++++++++---
project/NoPublish.scala | 14 +++++++++++---
3 files changed, 42 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
[incubator-pekko-grpc] 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-grpc.git
commit 3692cf7c3bcfb2a8155147bae14c118bf4564a17
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Jul 13 07:12:05 2023 +0200
Fix new sources so that they use the Apache standard header
---
project/MetaInfLicenseNoticeCopy.scala | 14 +++++++++++---
project/NoPublish.scala | 14 +++++++++++---
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala
index 36d856da..f3b19be4 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/project/NoPublish.scala b/project/NoPublish.scala
index cb128013..22b301ab 100644
--- a/project/NoPublish.scala
+++ b/project/NoPublish.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.grpc
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
[incubator-pekko-grpc] 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-grpc.git
commit 3aae4d2147a48e899f87e1de02ec08be4d8c0576
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Jul 13 07:09:02 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 30c65499..7bcb1378 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -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:
|
@@ -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() {
@@ -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 =>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org