Copyright to ASF #1682

michaelsembwever · 2023-07-13T13:48:56Z

see https://incubator.apache.org/ip-clearance/cassandra-java-driver.html

michaelsembwever · 2023-09-28T12:10:27Z

Example checks

rg -i "Copyright DataStax" (manual replacement of license header)
rg -il "DataStax Java driver" | xargs sed -i '' 's/DataStax Java driver/Java Driver/gI'

Patches for other branches:

hhughes · 2023-09-28T22:41:34Z

git show -- ':!*.java'

If you want to look at any changes which aren't to .java files

hhughes · 2023-09-28T22:49:39Z

I notice in the new license we're using Apache Cassandra - no retail mark or anything else.

There are a few places where we use various different symbles after the name if we should be tidying those up at the same time:

% grep -h -r -o -E "Apache Cassandra[^ $]+" . | sort | uniq -c
   2 Apache Cassandra&copy;
  10 Apache Cassandra&reg;
   1 Apache Cassandra&trade;.
  27 Apache Cassandra(R)
   4 Apache Cassandra(R)'s
   1 Apache Cassandra(R).
   1 Apache Cassandra(R).</description>
   3 Apache Cassandra,
   7 Apache Cassandra®
   1 Apache Cassandra®.
   1 Apache Cassandra®:
   1 Apache Cassandra®]
   1 Apache Cassandra®]:
  13 Apache CassandraⓇ

hhughes · 2023-09-28T23:03:37Z

Github review UI is unusable for me with this patch :) I'm going to add feeback as main comments

diff --git a/manual/core/non_blocking/README.md b/manual/core/non_blocking/README.md
index a40779f8e..123d9ef1a 100644
--- a/manual/core/non_blocking/README.md
+++ b/manual/core/non_blocking/README.md
@@ -11,7 +11,7 @@ such as [Vert.x] or [Reactor], along with tools for automatic detection of block
 [Reactor]: https://projectreactor.io
 [BlockHound]: https://github.com/reactor/BlockHound
 
-**In summary, when used properly, the DataStax Java driver offers non-blocking guarantees for most 
+**In summary, when used properly, the Java driver offers non-blocking guarantees for most 
 of its operations, and during most of the session lifecycle.**
 
 These guarantees and their exceptions are detailed below. A final chapter explains how to use the

~~Nit 1: you've added a trailing space to the end of this changed line.~~ sorry this is normal, not sure why git highlighted it such an angry red for me
Nit 2: Do we want to take this opportunity settle on casing of Java Driver vs Java driver? (most of those lines have been modified in this change)

hhughes · 2023-09-28T23:15:33Z

There are still a few matches for otherly cased DataStax Java Driver:

% grep -rl "DataStax Java Driver" --exclude-dir=.git 
./docs.yaml
./core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java
./README.md
./manual/cloud/README.md
./examples/pom.xml
./examples/README.md
./osgi-tests/README.md

michaelsembwever · 2023-09-29T10:28:17Z

Apache Cassandra

should be Apache Cassandra® on the first usage on any page. but this is not critical. (can be addressed later on.)

There are still a few matches for otherly cased DataStax Java Driver

on it…
Will standardise to "Java Driver" too.

michaelsembwever · 2023-09-29T12:46:59Z

All branches done.

…ndra-java-driver.html )

hhughes · 2023-09-29T19:01:40Z

diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ReplicationFactor.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ReplicationFactor.java
index f20a472d9..966372da6 100644
--- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ReplicationFactor.java
+++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ReplicationFactor.java
@@ -1,12 +1,14 @@
 package com.datastax.oss.driver.internal.core.metadata.token;
 /*
- * Copyright DataStax, Inc.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
...

Nit: the license in core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ReplicationFactor.java comes after the package declaration (this is how it was before your refactoring) - any concern?

michaelsembwever · 2023-09-29T19:22:15Z

Nit: the license in core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ReplicationFactor.java comes after the package declaration (this is how it was before your refactoring) - any concern?

no concern

hhughes · 2023-09-29T19:24:58Z

% grep -rin "DataStax driver" --exclude-dir=.git 
./mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/SingleFileCodeGenerator.java:28:      "Generated by the DataStax driver mapper, do not edit directly.\n";

Nit: one mention of DataStax driver in mapper code generator - does this need to be changed?

hhughes · 2023-09-29T19:29:48Z

Python-script for filtering out common license change hunks from the diff: license_change_diff_filter.py

hhughes

One remaining question about DataStax branding in SingleFileCodeGenerator.java, otherwise LGTM

hhughes

Re-approving this one

michaelsembwever · 2023-10-02T10:49:06Z

All merged.

michaelsembwever marked this pull request as draft July 13, 2023 13:50

michaelsembwever force-pushed the mck/asf-donation/4.x branch 2 times, most recently from 8c220ba to e705036 Compare September 28, 2023 12:10

michaelsembwever force-pushed the mck/asf-donation/4.x branch from e705036 to 1f030bc Compare September 28, 2023 14:04

michaelsembwever force-pushed the mck/asf-donation/4.x branch from 1f030bc to 85e89eb Compare September 29, 2023 10:32

michaelsembwever marked this pull request as ready for review September 29, 2023 12:47

Copyright to ASF (see https://incubator.apache.org/ip-clearance/cassa…

c7479c7

…ndra-java-driver.html )

michaelsembwever force-pushed the mck/asf-donation/4.x branch from 85e89eb to c7479c7 Compare September 29, 2023 12:50

hhughes approved these changes Sep 29, 2023

View reviewed changes

hhughes self-requested a review September 29, 2023 23:40

hhughes approved these changes Sep 29, 2023

View reviewed changes

michaelsembwever closed this Oct 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Copyright to ASF #1682

Copyright to ASF #1682

michaelsembwever commented Jul 13, 2023

michaelsembwever commented Sep 28, 2023 •

edited

Loading

hhughes commented Sep 28, 2023 •

edited

Loading

hhughes commented Sep 28, 2023 •

edited

Loading

hhughes commented Sep 28, 2023 •

edited

Loading

hhughes commented Sep 28, 2023

michaelsembwever commented Sep 29, 2023

michaelsembwever commented Sep 29, 2023

hhughes commented Sep 29, 2023

michaelsembwever commented Sep 29, 2023

hhughes commented Sep 29, 2023 •

edited

Loading

hhughes commented Sep 29, 2023

hhughes left a comment

hhughes left a comment

michaelsembwever commented Oct 2, 2023

Copyright to ASF #1682

Copyright to ASF #1682

Conversation

michaelsembwever commented Jul 13, 2023

michaelsembwever commented Sep 28, 2023 • edited Loading

hhughes commented Sep 28, 2023 • edited Loading

hhughes commented Sep 28, 2023 • edited Loading

hhughes commented Sep 28, 2023 • edited Loading

hhughes commented Sep 28, 2023

michaelsembwever commented Sep 29, 2023

michaelsembwever commented Sep 29, 2023

hhughes commented Sep 29, 2023

michaelsembwever commented Sep 29, 2023

hhughes commented Sep 29, 2023 • edited Loading

hhughes commented Sep 29, 2023

hhughes left a comment

Choose a reason for hiding this comment

hhughes left a comment

Choose a reason for hiding this comment

michaelsembwever commented Oct 2, 2023

michaelsembwever commented Sep 28, 2023 •

edited

Loading

hhughes commented Sep 28, 2023 •

edited

Loading

hhughes commented Sep 28, 2023 •

edited

Loading

hhughes commented Sep 28, 2023 •

edited

Loading

hhughes commented Sep 29, 2023 •

edited

Loading