KAFKA-12593: Fix Apache License headers by vvcephei · Pull Request #10452 · apache/kafka

vvcephei · 2021-03-31T18:26:48Z

The current headers in the streams-scala module, the gradle wrapper,
and some of the ducktape tests differ from the required headers for this project.

add a header style check for scala files
apply the correct header
move the original copyright notices to the NOTICE file.

Committer Checklist (excluded from commit message)

Verify design and implementation
Verify test coverage and CI build status
Verify documentation (including upgrade notes)

vvcephei · 2021-03-31T18:47:29Z

Hey @debasishg and @seglo ,

I hope you've been well.

Since you were the original contributors of the streams-scala module #4756, I wanted to ping you to see if you're available to review some fixes for a problem we've recently become aware of in the license header.

It turns out that the license header should not have contained extra copyright notices, and I would like to remove them, but I'm unsure if I'm allowed to. I added a section to the NOTICE file to capture the historical copyright information, but this seems kind of clunky.

As the original contributors, what do you think about just dropping the notices?

Please see https://lists.apache.org/thread.html/r2df54c11c10d3d38443054998bc7dd92d34362641733c2fb7c579b50%40%3Cdev.kafka.apache.org%3E for more information.

Thanks,
-John

vvcephei · 2021-03-31T18:48:43Z

+The streams-scala (streams/streams-scala) module was donated by Lightbend and the original code was copyrighted by them:
+Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
+Copyright (C) 2017-2018 Alexis Seigneurin.


I'm not totally comfortable just dropping those notices, so I added this note here. Not sure if it's any better, though.

I think it's better to preserve attribution. Aside from what's required from Apache2 license, what goes into NOTICE is up to us so I think this is a fine location for this.

I agree. We should preserve attribution if we can. "Community first".

vvcephei · 2021-03-31T18:49:21Z

  scala {
    target 'streams/**/*.scala'
    scalafmt("$versions.scalafmt").configFile('checkstyle/.scalafmt.conf')
+    licenseHeaderFile 'checkstyle/java.header', 'package'


This will enforce nothing like this happens again by applying the same check we have for Java via checkstyle.

One correction, we still don't check python/markdown/gradle/etc. files, so don't let your guard down!

Still, we're now covered for java and scala.

vvcephei · 2021-03-31T18:49:55Z

-Kafka Streams Scala
-Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
-Copyright (C) 2017-2018 Alexis Seigneurin.


I'm pretty sure there's not supposed to be extra NOTICE files in sub-directories of the project.

It would definitely not be common/standard

vvcephei · 2021-03-31T18:50:23Z

- * Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
- * Copyright (C) 2017-2018 Alexis Seigneurin.
- *


These were the blocks that had been wrongly added to the header.

ewencp

LGTM, I think besides standardizing the Apache header it is also important to preserve information about lineage and attribution, which I think this accomplishes.

ableegoldman

Thanks for tackling this

* Standardize license headers in scala, python, and gradle files. * Relocate copyright attribution to the NOTICE. * Add a license header check to `spotless` for scala files. Reviewers: Ewen Cheslack-Postava <ewencp@apache.org>, Matthias J. Sax <mjsax@apache.org>, A. Sophie Blee-Goldman <ableegoldman@apache.org

vvcephei · 2021-04-01T15:49:14Z

Cherry-picked to 2.8, 2.7, and 2.6. I doubt anyone's going to do another 2.5 patch release.

…e-allocations-lz4 * apache-github/trunk: (243 commits) KAFKA-12590: Remove deprecated kafka.security.auth.Authorizer, SimpleAclAuthorizer and related classes in 3.0 (apache#10450) KAFKA-3968: fsync the parent directory of a segment file when the file is created (apache#10405) KAFKA-12283: disable flaky testMultipleWorkersRejoining to stabilize build (apache#10408) MINOR: remove KTable.to from the docs (apache#10464) MONOR: Remove redudant LocalLogManager (apache#10325) MINOR: support ImplicitLinkedHashCollection#sort (apache#10456) KAFKA-12587 Remove KafkaPrincipal#fromString for 3.0 (apache#10447) KAFKA-12426: Missing logic to create partition.metadata files in RaftReplicaManager (apache#10282) MINOR: Improve reproducability of raft simulation tests (apache#10422) KAFKA-12474: Handle failure to write new session keys gracefully (apache#10396) KAFKA-12593: Fix Apache License headers (apache#10452) MINOR: Fix typo in MirrorMaker v2 documentation (apache#10433) KAFKA-12600: Remove deprecated config value `default` for client config `client.dns.lookup` (apache#10458) KAFKA-12952: Remove deprecated LogConfig.Compact (apache#10451) Initial commit (apache#10454) KAFKA-12575: Eliminate Log.isLogDirOffline boolean attribute (apache#10430) KAFKA-8405; Remove deprecated `kafka-preferred-replica-election` command (apache#10443) MINOR: Fix docs for end-to-end record latency metrics (apache#10449) MINOR Replaced File with Path in LogSegmentData. (apache#10424) KAFKA-12583: Upgrade netty to 4.1.62.Final ...

seglo

@vvcephei I apologize for the delay in getting back to you. My GH notifications were being forwarded to my Lightbend email and I was on vacation for the past week. Debasish is also on leave.

The attribution in the NOTICE LGTM 👍

KAFKA-12593: Fix header in streams-scala

e8da20a

vvcephei added the streams label Mar 31, 2021

vvcephei commented Mar 31, 2021

View reviewed changes

ewencp approved these changes Mar 31, 2021

View reviewed changes

vvcephei changed the title ~~KAFKA-12593: Fix header in streams-scala~~ KAFKA-12593: Fix Apache License headers Mar 31, 2021

vvcephei force-pushed the kafka-12593-fix-copyright branch from 2ef8bba to d13ab4d Compare March 31, 2021 21:55

also correct the copyright in the python files

d13ab4d

mjsax approved these changes Mar 31, 2021

View reviewed changes

ableegoldman approved these changes Mar 31, 2021

View reviewed changes

vvcephei merged commit 4ed7f2c into apache:trunk Apr 1, 2021

seglo reviewed Apr 6, 2021

View reviewed changes

Uh oh!

Conversation

vvcephei commented Mar 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Committer Checklist (excluded from commit message)

Uh oh!

vvcephei commented Mar 31, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ewencp left a comment

Choose a reason for hiding this comment

Uh oh!

ableegoldman left a comment

Choose a reason for hiding this comment

Uh oh!

vvcephei commented Apr 1, 2021

Uh oh!

seglo left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

vvcephei commented Mar 31, 2021 •

edited

Loading