You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@pekko.apache.org by "mdedetrich (via GitHub)" <gi...@apache.org> on 2023/07/07 06:46:32 UTC
[GitHub] [incubator-pekko] mdedetrich opened a new pull request, #474: Apply standard Apache Header for new files
mdedetrich opened a new pull request, #474:
URL: https://github.com/apache/incubator-pekko/pull/474
Currently if you create a new source file (typically the case if you add new functionality into Pekko) it applies this header
```scala
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* license agreements; and to You under the Apache License, version 2.0:
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
```
which is not the header that should be applied, instead you should rather be applying this header
```scala
/*
* 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.
*/
```
Note that the functionality of adding our bespoke "Apache from Akka source" header if it detects a Lightbend/EPFL by itself still applies (you can verify this locally by opening an existing source file, removing the "Apache from Akka source" and then running `sbt headerCreateAll`)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] mdedetrich commented on pull request #474: Apply standard Apache Header for new files
Posted by "mdedetrich (via GitHub)" <gi...@apache.org>.
mdedetrich commented on PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474#issuecomment-1624967947
> the impl is fine - if copying to other pekko repos, we might not want to change any files copied from this repo to those other repos in the past (like the AddMetaInfLicense scala file) - those files should match what we have in this repo.
Not sure what you mean here but what I meant is that I want to apply the same types of changes, i.e. update `project/CopyrightHeader.scala` so that it applies the standard ASF header not the bespoke one and also fix any existing new sources (i.e. not Akka based) to use the standard ASF header (which should include AddMetaInfLicense because this is something we created, it did not exist in Akka).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] pjfanning commented on pull request #474: Apply standard Apache Header for new files
Posted by "pjfanning (via GitHub)" <gi...@apache.org>.
pjfanning commented on PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474#issuecomment-1624974508
If we get RC3 released and we then find out that we need to leave the headers as is, then any files that we have to leave as is and that were copied to other repos should be left as is in those other repos too.
I don't want to get RC3 blocked by getting this answered today.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] mdedetrich merged pull request #474: Apply standard Apache Header for new files
Posted by "mdedetrich (via GitHub)" <gi...@apache.org>.
mdedetrich merged PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] pjfanning commented on pull request #474: Apply standard Apache Header for new files
Posted by "pjfanning (via GitHub)" <gi...@apache.org>.
pjfanning commented on PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474#issuecomment-1624959656
the impl is fine - if copying to other pekko repos, we might not want to change any files copied from this repo to those other repos in the past (like the AddMetaInfLicense scala file) - those files should match what we have in this repo.
My view is get the release done and then find out if we can change the headers here. All in all, we should know some time next week so it shouldn't delay getting the other repos fixed up by much.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] He-Pin commented on a diff in pull request #474: Apply standard Apache Header for new files
Posted by "He-Pin (via GitHub)" <gi...@apache.org>.
He-Pin commented on code in PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474#discussion_r1255348155
##########
project/LicenseReport.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
Review Comment:
https?
##########
project/CopyrightHeader.scala:
##########
@@ -61,6 +61,23 @@ trait CopyrightHeader extends AutoPlugin {
|This file is part of the Apache Pekko project, which was derived from Akka.
|""".stripMargin
+ def 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
Review Comment:
not https?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] mdedetrich commented on pull request #474: Apply standard Apache Header for new files
Posted by "mdedetrich (via GitHub)" <gi...@apache.org>.
mdedetrich commented on PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474#issuecomment-1624936604
> Can we delay merging this? If the RC3 passes, we may not want to change license headers on any existing files.
@pjfanning Sure, are you happy with the implementation though? (I want to apply the same changes to other Pekko modules).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] mdedetrich commented on a diff in pull request #474: Apply standard Apache Header for new files
Posted by "mdedetrich (via GitHub)" <gi...@apache.org>.
mdedetrich commented on code in PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474#discussion_r1255349026
##########
project/LicenseReport.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
Review Comment:
I would rather not changes this, this is the standard Apache header copied without changes. Anyways it redirects when you visit it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] mdedetrich commented on a diff in pull request #474: Apply standard Apache Header for new files
Posted by "mdedetrich (via GitHub)" <gi...@apache.org>.
mdedetrich commented on code in PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474#discussion_r1255349026
##########
project/LicenseReport.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
Review Comment:
I would rather not changes this, this is the standard Apache header copied without changes.
##########
project/CopyrightHeader.scala:
##########
@@ -61,6 +61,23 @@ trait CopyrightHeader extends AutoPlugin {
|This file is part of the Apache Pekko project, which was derived from Akka.
|""".stripMargin
+ def 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
Review Comment:
See https://github.com/apache/incubator-pekko/pull/474#discussion_r1255349026
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org
[GitHub] [incubator-pekko] mdedetrich commented on pull request #474: Apply standard Apache Header for new files
Posted by "mdedetrich (via GitHub)" <gi...@apache.org>.
mdedetrich commented on PR #474:
URL: https://github.com/apache/incubator-pekko/pull/474#issuecomment-1624975919
Understood, thanks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@pekko.apache.org
For additional commands, e-mail: notifications-help@pekko.apache.org