You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2025/04/28 12:04:44 UTC

(cassandra-spark-connector) branch trunk updated: Add .asf.yaml

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-spark-connector.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 6e3f3932 Add .asf.yaml
6e3f3932 is described below

commit 6e3f3932e3da9a4bd0f629d257b51721301c1040
Author: mck <mc...@apache.org>
AuthorDate: Tue Apr 22 10:38:08 2025 +0200

    Add .asf.yaml
    
     https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
    And remove a few dangling copyright headers that were missed in 39231410157c50e30ff9c232f114a0eb2d97af5f
    Also correct repo urls and trunk branch name, and GHA fixes.
    Closes https://github.com/apache/cassandra-spark-connector/pull/1378
    
     patch by Mick Semb Wever; reviewed by Doug Rohrer for CASSANALYTICS-15
---
 .asf.yml                                           | 41 ++++++++++++++++++
 ...-ticket-or-ask-questions-on-the-mailing-list.md |  5 +--
 .github/pull_request_template.md                   |  4 +-
 .github/workflows/main.yml                         | 16 ++++----
 README.md                                          | 48 +++++++++++-----------
 connector/src/it/resources/logback.xml             | 18 ++++++--
 .../spark/connector/cluster/Fixtures.scala         |  2 +-
 .../cql/ContinuousPagingScannerSpec.scala          |  6 ---
 .../spark/connector/rdd/ConnectorMetricsSpec.scala |  6 ---
 .../spark/connector/rdd/DseGraphUnionRDDSpec.scala |  6 ---
 .../spark/connector/rdd/InnerJoinSpec.scala        |  6 ---
 .../spark/connector/types/GeometricTypeSpec.scala  |  6 ---
 .../bdp/spark/ContinuousPagingScanner.scala        |  5 ---
 .../scala/com/datastax/bdp/util/MiscUtil.scala     |  5 ---
 .../com/datastax/bdp/util/ScalaJavaUtil.scala      |  5 ---
 .../connector/rdd/CassandraCoGroupedRDD.scala      |  5 ---
 .../connector/rdd/CassandraMergeJoinRDD.scala      |  5 ---
 .../spark/connector/rdd/DseGraphUnionedRDD.scala   |  6 ---
 .../spark/connector/util/MergeJoinIterator.scala   |  5 ---
 .../connector/util/MultiMergeJoinIterator.scala    |  5 ---
 .../org/apache/spark/metrics/CassandraSink.scala   |  6 ---
 .../spark/sql/cassandra/DsePredicateRules.scala    |  5 ---
 .../sql/cassandra/InClausePredicateRules.scala     |  5 ---
 .../spark/sql/cassandra/SolrPredicateRules.scala   |  5 ---
 .../sql/cassandra/TimeUUIDPredicateRules.scala     |  5 ---
 connector/src/test/resources/logback.xml           | 18 ++++++--
 .../bdp/spark/DseAuthConfFactorySpec.scala         |  6 ---
 .../bdp/spark/DseByosAuthConfFactorySpec.scala     |  6 ---
 .../connector/util/MergeJoinIteratorSpec.scala     |  6 ---
 .../sql/cassandra/InClausePredicateRulesSpec.scala |  6 ---
 doc/2_loading.md                                   |  2 +-
 doc/developers.md                                  | 27 ++++++------
 .../connector/cql/MultiplexingSchemaListener.scala |  5 ---
 .../datastax/spark/connector/util/Reflect.scala    |  6 ---
 .../LocalNodeFirstLoadBalancingPolicySpec.scala    |  6 ---
 .../cql/MultiplexingSchemaListenerTest.scala       |  5 ---
 36 files changed, 123 insertions(+), 201 deletions(-)

diff --git a/.asf.yml b/.asf.yml
new file mode 100644
index 00000000..42b408db
--- /dev/null
+++ b/.asf.yml
@@ -0,0 +1,41 @@
+# 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.
+
+notifications:
+  commits:      commits@cassandra.apache.org
+  issues:       commits@cassandra.apache.org
+  pullrequests: pr@cassandra.apache.org
+  jira_options: link worklog
+
+github:
+  description: "Apache Spark to Apache Cassandra connector"
+  homepage: https://apache.github.io/cassandra-spark-connector/
+  enabled_merge_buttons:
+    squash: false
+    merge: false
+    rebase: true
+  features:
+    wiki: false
+    issues: false
+    projects: false
+    discussions: false
+  autolink_jira:
+    - CASSANDRA
+    - CASSANALYTICS
+  protected_branches:
+    trunk:
+      required_linear_history: true
diff --git a/.github/ISSUE_TEMPLATE/please-make-a-jira-ticket-or-ask-questions-on-the-mailing-list.md b/.github/ISSUE_TEMPLATE/please-make-a-jira-ticket-or-ask-questions-on-the-mailing-list.md
index 477533f6..bc1f92bc 100644
--- a/.github/ISSUE_TEMPLATE/please-make-a-jira-ticket-or-ask-questions-on-the-mailing-list.md
+++ b/.github/ISSUE_TEMPLATE/please-make-a-jira-ticket-or-ask-questions-on-the-mailing-list.md
@@ -7,6 +7,5 @@ assignees: ''
 
 ---
 
-For issue tracking we use [JIRA](https://datastax-oss.atlassian.net/projects/SPARKC)
-Datastax managed QA at [Datastax Community](https://community.datastax.com/index.html)
-Questions can be posted to the [mailing list](https://groups.google.com/a/lists.datastax.com/forum/#!forum/spark-connector-user).
+For issue tracking we use [JIRA](https://issues.apache.org/jira/projects/CASSANALYTICS)
+Community QA at [Apache Cassandra Community](https://cassandra.apache.org/_/community.html#discussions)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6d77c838..a6a020c3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -15,7 +15,7 @@ pursue this particular fix?
 
 Example: "I removed the incorrect assertion which would throw the ThreeIntException. This exception was incorrectly added and the assertion is not actually needed."
 
-Fixes: [Put JIRA Reference HERE](https://datastax-oss.atlassian.net/projects/SPARKC)
+Fixes: [Put JIRA Reference HERE](https://issues.apache.org/jira/projects/CASSANALYTICS)
 
 # How Has This Been Tested?
 
@@ -23,6 +23,6 @@ Almost all changes and especially bug fixes will require a test to be added to e
 
 # Checklist:
 
-- [ ] I have a ticket in the [OSS JIRA](https://datastax-oss.atlassian.net/projects/SPARKC)
+- [ ] I have a ticket in the [JIRA](https://issues.apache.org/jira/projects/CASSANALYTICS)
 - [ ] I have performed a self-review of my own code
 - [ ] Locally all tests pass (make sure tests fail without your patch)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fcfc0fd4..5823f7a2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,11 +1,9 @@
 name: CI
 
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
+  # Triggers the workflow on push or pull request events but only for the trunk branch
   push:
-    branches: [ b2.5, b3.0, master]
   pull_request:
-    branches: [ b2.5, b3.0, master]
 
   workflow_dispatch:
 
@@ -16,15 +14,15 @@ jobs:
       fail-fast: false
       matrix:
         scala:  [2.12.19, 2.13.13]
-        db-version: [3.11.17, 4.0.12, 4.1.4, 5.0-beta1, dse-6.8.44]
+        db-version: [3.11.19, 4.0.17, 4.1.8, 5.0.4, dse-6.8.44]
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: ccm pip installation
-        uses: BSFishy/pip-action@v1
-        with:
-          packages: git+https://github.com/riptano/ccm.git@d74db63d75112908a77b6c80757df9343fdc3338
+      - name: Install ccm via pip
+        # if cassandra-ccm's trunk breaks this CI, please file a report,
+        #  and temporarily switch this to @cassandra-test or @<sha> where sha is the last known working ccm commit
+        run: pip install git+https://github.com/apache/cassandra-ccm.git@trunk
 
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -48,4 +46,4 @@ jobs:
         if: always()
         with:
           report_paths: '**/target/test-reports/*.xml'
-          annotate_only: true
\ No newline at end of file
+          annotate_only: true
diff --git a/README.md b/README.md
index f6b28cdc..d1ba1c7c 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,14 @@
 
 *Lightning-fast cluster computing with Apache Spark&trade; and Apache Cassandra&reg;.*
 
-[![CI](https://github.com/datastax/spark-cassandra-connector/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/datastax/spark-cassandra-connector/actions?query=branch%3Amaster)
+[![CI](https://github.com/apache/cassandra-spark-connector/actions/workflows/main.yml/badge.svg?branch=trunk)](https://github.com/apache/cassandra-spark-connector/actions?query=branch%3Atrunk)
 
 ## Quick Links
 
 | What       | Where                                                                                                                                                                                                                                                                                                               |
 | ---------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Community  | Chat with us at [Apache Cassandra](https://cassandra.apache.org/_/community.html#discussions)                                                                                                                                                                                                                       |
-| Scala Docs | Most Recent Release (3.5.1): [Connector API docs](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.5.1/connector/com/datastax/spark/connector/index.html), [Connector Driver docs](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.5.1/driver/com/datastax/spark/connector/index.html) |
+| Scala Docs | Most Recent Release (3.5.1): [Connector API docs](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.5.1/connector/com/datastax/spark/connector/index.html), [Connector Driver docs](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.5.1/driver/com/datastax/spark/connector/index.html) |
 | Latest Production Release | [3.5.1](https://search.maven.org/artifact/com.datastax.spark/spark-cassandra-connector_2.12/3.5.1/jar)                                                                                                                                                                                                              |
 
 ## News
@@ -45,17 +45,17 @@ in your Spark applications.
 The connector project has several branches, each of which map into different
 supported versions of  Spark and Cassandra. For previous releases the branch is
 named "bX.Y" where X.Y is the major+minor version; for example the "b1.6" branch
-corresponds to the 1.6 release. The "master" branch will normally contain
+corresponds to the 1.6 release. The "trunk" branch will normally contain
 development for the next connector release in progress.
 
 Currently, the following branches are actively supported: 
-3.5.x ([master](https://github.com/datastax/spark-cassandra-connector/tree/master)),
-3.4.x ([b3.4](https://github.com/datastax/spark-cassandra-connector/tree/b3.4)),
-3.3.x ([b3.2](https://github.com/datastax/spark-cassandra-connector/tree/b3.3)),
-3.2.x ([b3.2](https://github.com/datastax/spark-cassandra-connector/tree/b3.2)),
-3.1.x ([b3.1](https://github.com/datastax/spark-cassandra-connector/tree/b3.1)),
-3.0.x ([b3.0](https://github.com/datastax/spark-cassandra-connector/tree/b3.0)) and 
-2.5.x ([b2.5](https://github.com/datastax/spark-cassandra-connector/tree/b2.5)).
+3.5.x ([trunk](https://github.com/apache/cassandra-spark-connector/tree/trunk)),
+3.4.x ([b3.4](https://github.com/apache/cassandra-spark-connector/tree/b3.4)),
+3.3.x ([b3.2](https://github.com/apache/cassandra-spark-connector/tree/b3.3)),
+3.2.x ([b3.2](https://github.com/apache/cassandra-spark-connector/tree/b3.2)),
+3.1.x ([b3.1](https://github.com/apache/cassandra-spark-connector/tree/b3.1)),
+3.0.x ([b3.0](https://github.com/apache/cassandra-spark-connector/tree/b3.0)) and 
+2.5.x ([b2.5](https://github.com/apache/cassandra-spark-connector/tree/b2.5)).
 
 | Connector | Spark         | Cassandra                  | Cassandra Java Driver | Minimum Java Version | Supported Scala Versions |
 |-----------|---------------|----------------------------|-----------------------|----------------------|--------------------------|
@@ -85,32 +85,32 @@ Currently, the following branches are actively supported:
 API documentation for the Scala and Java interfaces are available online:
 
 ### 3.5.1
-* [Spark-Cassandra-Connector](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.5.1/connector/com/datastax/spark/connector/index.html)
+* [Spark-Cassandra-Connector](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.5.1/connector/com/datastax/spark/connector/index.html)
 
 ### 3.5.0
-* [Spark-Cassandra-Connector](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.5.0/connector/com/datastax/spark/connector/index.html)
+* [Spark-Cassandra-Connector](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.5.0/connector/com/datastax/spark/connector/index.html)
 
 ### 3.4.1
-* [Spark-Cassandra-Connector](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.4.1/connector/com/datastax/spark/connector/index.html)
+* [Spark-Cassandra-Connector](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.4.1/connector/com/datastax/spark/connector/index.html)
 
 ### 3.3.0
-* [Spark-Cassandra-Connector](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.3.0/connector/com/datastax/spark/connector/index.html)
+* [Spark-Cassandra-Connector](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.3.0/connector/com/datastax/spark/connector/index.html)
 
 ### 3.2.0
-* [Spark-Cassandra-Connector](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.2.0/connector/com/datastax/spark/connector/index.html)
+* [Spark-Cassandra-Connector](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.2.0/connector/com/datastax/spark/connector/index.html)
 
 ### 3.1.0
-* [Spark-Cassandra-Connector](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.1.0/connector/com/datastax/spark/connector/index.html)
+* [Spark-Cassandra-Connector](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.1.0/connector/com/datastax/spark/connector/index.html)
 
 ### 3.0.1
-* [Spark-Cassandra-Connector](https://datastax.github.io/spark-cassandra-connector/ApiDocs/3.0.1/connector/com/datastax/spark/connector/index.html)
+* [Spark-Cassandra-Connector](https://apache.github.io/cassandra-spark-connector/ApiDocs/3.0.1/connector/com/datastax/spark/connector/index.html)
 
 ### 2.5.2
-* [Spark-Cassandra-Connector](https://datastax.github.io/spark-cassandra-connector/ApiDocs/2.5.2/connector/#package)
+* [Spark-Cassandra-Connector](https://apache.github.io/cassandra-spark-connector/ApiDocs/2.5.2/connector/#package)
 
 ### 2.4.2
-* [Spark-Cassandra-Connector](http://datastax.github.io/spark-cassandra-connector/ApiDocs/2.4.2/spark-cassandra-connector/)
-* [Embedded-Cassandra](http://datastax.github.io/spark-cassandra-connector/ApiDocs/2.4.2/spark-cassandra-connector-embedded/)
+* [Spark-Cassandra-Connector](http://apache.github.io/cassandra-spark-connector/ApiDocs/2.4.2/spark-cassandra-connector/)
+* [Embedded-Cassandra](http://apache.github.io/cassandra-spark-connector/ApiDocs/2.4.2/spark-cassandra-connector-embedded/)
 
 ## Download
 
@@ -157,13 +157,13 @@ In [DS320: Analytics with Spark](https://www.youtube.com/watch?v=D6PMEQAfjeU&lis
 
 ### Reporting Bugs
 
-New issues may be reported using [JIRA](https://datastax-oss.atlassian.net/browse/SPARKC/). Please include
+New issues may be reported using [JIRA](https://issues.apache.org/jira/projects/CASSANALYTICS). Please include
 all relevant details including versions of Spark, Spark Cassandra Connector, Cassandra and/or DSE. A minimal
 reproducible case with sample code is ideal.
 
 ### Mailing List
 
-Questions and requests for help may be submitted to the [user mailing list](https://groups.google.com/a/lists.datastax.com/forum/#!forum/spark-connector-user).
+Questions and requests for help may be submitted to the [user mailing list](https://cassandra.apache.org/_/community.html#discussions).
 
 
 ## Q/A Exchange
@@ -177,13 +177,15 @@ To protect the community, all contributors are required to sign the Apache Softw
 [Tips for Developing the Spark Cassandra Connector](doc/developers.md)
 
 Checklist for contributing changes to the project:
-* Create a [SPARKC JIRA](https://datastax-oss.atlassian.net/projects/SPARKC/issues)
+* Create a [CASSANALYTICS JIRA](https://issues.apache.org/jira/projects/CASSANALYTICS)
 * Make sure that all unit tests and integration tests pass
 * Add an appropriate entry at the top of CHANGES.txt
 * If the change has any end-user impacts, also include changes to the ./doc files as needed
 * Prefix the pull request description with the JIRA number, for example: "SPARKC-123: Fix the ..."
 * Open a pull-request on GitHub and await review
 
+Old issues from before the donation to the ASF and the Apache Cassandra project can be found in this [SPARKC JIRA](https://datastax-oss.atlassian.net/projects/SPARKC/issues)
+
 ## Testing
 To run unit and integration tests:
 
diff --git a/connector/src/it/resources/logback.xml b/connector/src/it/resources/logback.xml
index 2cdda1e8..a4a89e3f 100644
--- a/connector/src/it/resources/logback.xml
+++ b/connector/src/it/resources/logback.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright DataStax, Inc.
-  ~
-  ~ Please see the included license file for details.
+  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.
   -->
 
 <configuration>
diff --git a/connector/src/it/scala/com/datastax/spark/connector/cluster/Fixtures.scala b/connector/src/it/scala/com/datastax/spark/connector/cluster/Fixtures.scala
index a66962ac..5f96c8fb 100644
--- a/connector/src/it/scala/com/datastax/spark/connector/cluster/Fixtures.scala
+++ b/connector/src/it/scala/com/datastax/spark/connector/cluster/Fixtures.scala
@@ -62,7 +62,7 @@ sealed trait Fixture extends ClusterProvider {
     System.setProperty("dse", "true")
     System.setProperty("ccm.directory", home)
     System.setProperty("ccm.version", "6.8")
-    System.setProperty("ccm.branch", "master")
+    System.setProperty("ccm.branch", "trunk")
   }
 
   private[cluster] def configs: Seq[CcmConfig]
diff --git a/connector/src/it/scala/com/datastax/spark/connector/cql/ContinuousPagingScannerSpec.scala b/connector/src/it/scala/com/datastax/spark/connector/cql/ContinuousPagingScannerSpec.scala
index b86bce67..32d555b7 100644
--- a/connector/src/it/scala/com/datastax/spark/connector/cql/ContinuousPagingScannerSpec.scala
+++ b/connector/src/it/scala/com/datastax/spark/connector/cql/ContinuousPagingScannerSpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.cql
 
 import com.datastax.bdp.spark.ContinuousPagingScanner
diff --git a/connector/src/it/scala/com/datastax/spark/connector/rdd/ConnectorMetricsSpec.scala b/connector/src/it/scala/com/datastax/spark/connector/rdd/ConnectorMetricsSpec.scala
index 414c7ce5..f6cd07a3 100644
--- a/connector/src/it/scala/com/datastax/spark/connector/rdd/ConnectorMetricsSpec.scala
+++ b/connector/src/it/scala/com/datastax/spark/connector/rdd/ConnectorMetricsSpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.rdd
 
 import java.util.concurrent.LinkedTransferQueue
diff --git a/connector/src/it/scala/com/datastax/spark/connector/rdd/DseGraphUnionRDDSpec.scala b/connector/src/it/scala/com/datastax/spark/connector/rdd/DseGraphUnionRDDSpec.scala
index 62ccadab..ffd8a84a 100644
--- a/connector/src/it/scala/com/datastax/spark/connector/rdd/DseGraphUnionRDDSpec.scala
+++ b/connector/src/it/scala/com/datastax/spark/connector/rdd/DseGraphUnionRDDSpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.rdd
 
 import java.lang.{Integer => JInteger, String => JString}
diff --git a/connector/src/it/scala/com/datastax/spark/connector/rdd/InnerJoinSpec.scala b/connector/src/it/scala/com/datastax/spark/connector/rdd/InnerJoinSpec.scala
index 16cb0dbc..a3ba225c 100644
--- a/connector/src/it/scala/com/datastax/spark/connector/rdd/InnerJoinSpec.scala
+++ b/connector/src/it/scala/com/datastax/spark/connector/rdd/InnerJoinSpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.rdd
 
 import com.datastax.oss.driver.api.core.CqlSession
diff --git a/connector/src/it/scala/com/datastax/spark/connector/types/GeometricTypeSpec.scala b/connector/src/it/scala/com/datastax/spark/connector/types/GeometricTypeSpec.scala
index e63c987a..406e6a63 100644
--- a/connector/src/it/scala/com/datastax/spark/connector/types/GeometricTypeSpec.scala
+++ b/connector/src/it/scala/com/datastax/spark/connector/types/GeometricTypeSpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.types
 
 import com.datastax.dse.driver.api.core.`type`.DseDataTypes
diff --git a/connector/src/main/scala/com/datastax/bdp/spark/ContinuousPagingScanner.scala b/connector/src/main/scala/com/datastax/bdp/spark/ContinuousPagingScanner.scala
index 07b55b38..00502e4e 100644
--- a/connector/src/main/scala/com/datastax/bdp/spark/ContinuousPagingScanner.scala
+++ b/connector/src/main/scala/com/datastax/bdp/spark/ContinuousPagingScanner.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
 package com.datastax.bdp.spark
 
 import java.io.IOException
diff --git a/connector/src/main/scala/com/datastax/bdp/util/MiscUtil.scala b/connector/src/main/scala/com/datastax/bdp/util/MiscUtil.scala
index ab04f2ec..9b05ffc8 100644
--- a/connector/src/main/scala/com/datastax/bdp/util/MiscUtil.scala
+++ b/connector/src/main/scala/com/datastax/bdp/util/MiscUtil.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
 
 package com.datastax.bdp.util
 
diff --git a/connector/src/main/scala/com/datastax/bdp/util/ScalaJavaUtil.scala b/connector/src/main/scala/com/datastax/bdp/util/ScalaJavaUtil.scala
index 26a4758a..2a1bab59 100644
--- a/connector/src/main/scala/com/datastax/bdp/util/ScalaJavaUtil.scala
+++ b/connector/src/main/scala/com/datastax/bdp/util/ScalaJavaUtil.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
 
 package com.datastax.bdp.util
 
diff --git a/connector/src/main/scala/com/datastax/spark/connector/rdd/CassandraCoGroupedRDD.scala b/connector/src/main/scala/com/datastax/spark/connector/rdd/CassandraCoGroupedRDD.scala
index 9b8afe24..91532f88 100644
--- a/connector/src/main/scala/com/datastax/spark/connector/rdd/CassandraCoGroupedRDD.scala
+++ b/connector/src/main/scala/com/datastax/spark/connector/rdd/CassandraCoGroupedRDD.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/**
-  * Copyright DataStax, Inc.
-  *
-  * Please see the included license file for details.
-  */
 package com.datastax.spark.connector.rdd
 
 import java.io.IOException
diff --git a/connector/src/main/scala/com/datastax/spark/connector/rdd/CassandraMergeJoinRDD.scala b/connector/src/main/scala/com/datastax/spark/connector/rdd/CassandraMergeJoinRDD.scala
index 59a5666b..05a24cd6 100644
--- a/connector/src/main/scala/com/datastax/spark/connector/rdd/CassandraMergeJoinRDD.scala
+++ b/connector/src/main/scala/com/datastax/spark/connector/rdd/CassandraMergeJoinRDD.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/**
-  * Copyright DataStax, Inc.
-  *
-  * Please see the included license file for details.
-  */
 package com.datastax.spark.connector.rdd
 
 import java.io.IOException
diff --git a/connector/src/main/scala/com/datastax/spark/connector/rdd/DseGraphUnionedRDD.scala b/connector/src/main/scala/com/datastax/spark/connector/rdd/DseGraphUnionedRDD.scala
index 284285bb..bd0828db 100644
--- a/connector/src/main/scala/com/datastax/spark/connector/rdd/DseGraphUnionedRDD.scala
+++ b/connector/src/main/scala/com/datastax/spark/connector/rdd/DseGraphUnionedRDD.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.rdd
 
 import java.lang.{String => JString}
diff --git a/connector/src/main/scala/com/datastax/spark/connector/util/MergeJoinIterator.scala b/connector/src/main/scala/com/datastax/spark/connector/util/MergeJoinIterator.scala
index 12a3670b..fc2e814e 100644
--- a/connector/src/main/scala/com/datastax/spark/connector/util/MergeJoinIterator.scala
+++ b/connector/src/main/scala/com/datastax/spark/connector/util/MergeJoinIterator.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/**
-  * Copyright DataStax, Inc.
-  *
-  * Please see the included license file for details.
-  */
 package com.datastax.spark.connector.util
 
 import scala.collection.mutable.ArrayBuffer
diff --git a/connector/src/main/scala/com/datastax/spark/connector/util/MultiMergeJoinIterator.scala b/connector/src/main/scala/com/datastax/spark/connector/util/MultiMergeJoinIterator.scala
index 6fb29c3f..84eb007f 100644
--- a/connector/src/main/scala/com/datastax/spark/connector/util/MultiMergeJoinIterator.scala
+++ b/connector/src/main/scala/com/datastax/spark/connector/util/MultiMergeJoinIterator.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/**
-  * Copyright DataStax, Inc.
-  *
-  * Please see the included license file for details.
-  */
 package com.datastax.spark.connector.util
 
 import scala.collection.mutable.ArrayBuffer
diff --git a/connector/src/main/scala/org/apache/spark/metrics/CassandraSink.scala b/connector/src/main/scala/org/apache/spark/metrics/CassandraSink.scala
index 7aaa103b..06e4bdd6 100644
--- a/connector/src/main/scala/org/apache/spark/metrics/CassandraSink.scala
+++ b/connector/src/main/scala/org/apache/spark/metrics/CassandraSink.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package org.apache.spark.metrics
 
 import java.util.Properties
diff --git a/connector/src/main/scala/org/apache/spark/sql/cassandra/DsePredicateRules.scala b/connector/src/main/scala/org/apache/spark/sql/cassandra/DsePredicateRules.scala
index c46f2cdb..ce7d530d 100644
--- a/connector/src/main/scala/org/apache/spark/sql/cassandra/DsePredicateRules.scala
+++ b/connector/src/main/scala/org/apache/spark/sql/cassandra/DsePredicateRules.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/**
-  * Copyright DataStax, Inc.
-  *
-  * Please see the included license file for details.
-  */
 package org.apache.spark.sql.cassandra
 
 import com.datastax.spark.connector.cql.{IndexDef, TableDef}
diff --git a/connector/src/main/scala/org/apache/spark/sql/cassandra/InClausePredicateRules.scala b/connector/src/main/scala/org/apache/spark/sql/cassandra/InClausePredicateRules.scala
index ec04e91a..20f69fbb 100644
--- a/connector/src/main/scala/org/apache/spark/sql/cassandra/InClausePredicateRules.scala
+++ b/connector/src/main/scala/org/apache/spark/sql/cassandra/InClausePredicateRules.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
 
 package org.apache.spark.sql.cassandra
 
diff --git a/connector/src/main/scala/org/apache/spark/sql/cassandra/SolrPredicateRules.scala b/connector/src/main/scala/org/apache/spark/sql/cassandra/SolrPredicateRules.scala
index 8d7fe299..9663ac59 100644
--- a/connector/src/main/scala/org/apache/spark/sql/cassandra/SolrPredicateRules.scala
+++ b/connector/src/main/scala/org/apache/spark/sql/cassandra/SolrPredicateRules.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/**
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
 package org.apache.spark.sql.cassandra
 
 import java.time.format.DateTimeFormatter
diff --git a/connector/src/main/scala/org/apache/spark/sql/cassandra/TimeUUIDPredicateRules.scala b/connector/src/main/scala/org/apache/spark/sql/cassandra/TimeUUIDPredicateRules.scala
index 2346ea2c..0a21c00d 100644
--- a/connector/src/main/scala/org/apache/spark/sql/cassandra/TimeUUIDPredicateRules.scala
+++ b/connector/src/main/scala/org/apache/spark/sql/cassandra/TimeUUIDPredicateRules.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
 
 package org.apache.spark.sql.cassandra
 
diff --git a/connector/src/test/resources/logback.xml b/connector/src/test/resources/logback.xml
index a54a45b0..91e26dd5 100644
--- a/connector/src/test/resources/logback.xml
+++ b/connector/src/test/resources/logback.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright DataStax, Inc.
-  ~
-  ~ Please see the included license file for details.
+  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.
   -->
 
 <configuration>
diff --git a/connector/src/test/scala/com/datastax/bdp/spark/DseAuthConfFactorySpec.scala b/connector/src/test/scala/com/datastax/bdp/spark/DseAuthConfFactorySpec.scala
index 18d215aa..c03becd8 100644
--- a/connector/src/test/scala/com/datastax/bdp/spark/DseAuthConfFactorySpec.scala
+++ b/connector/src/test/scala/com/datastax/bdp/spark/DseAuthConfFactorySpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.bdp.spark
 /**
 TODO:
diff --git a/connector/src/test/scala/com/datastax/bdp/spark/DseByosAuthConfFactorySpec.scala b/connector/src/test/scala/com/datastax/bdp/spark/DseByosAuthConfFactorySpec.scala
index d6ebc5f7..2c417c78 100644
--- a/connector/src/test/scala/com/datastax/bdp/spark/DseByosAuthConfFactorySpec.scala
+++ b/connector/src/test/scala/com/datastax/bdp/spark/DseByosAuthConfFactorySpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.bdp.spark
 /*
 TODO:
diff --git a/connector/src/test/scala/com/datastax/spark/connector/util/MergeJoinIteratorSpec.scala b/connector/src/test/scala/com/datastax/spark/connector/util/MergeJoinIteratorSpec.scala
index b56a32bf..c9797551 100644
--- a/connector/src/test/scala/com/datastax/spark/connector/util/MergeJoinIteratorSpec.scala
+++ b/connector/src/test/scala/com/datastax/spark/connector/util/MergeJoinIteratorSpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.util
 
 import org.scalatest.{FlatSpec, Matchers}
diff --git a/connector/src/test/scala/org/apache/spark/sql/cassandra/InClausePredicateRulesSpec.scala b/connector/src/test/scala/org/apache/spark/sql/cassandra/InClausePredicateRulesSpec.scala
index 201ea500..335f9f71 100644
--- a/connector/src/test/scala/org/apache/spark/sql/cassandra/InClausePredicateRulesSpec.scala
+++ b/connector/src/test/scala/org/apache/spark/sql/cassandra/InClausePredicateRulesSpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package org.apache.spark.sql.cassandra
 
 import com.datastax.spark.connector.cql._
diff --git a/doc/2_loading.md b/doc/2_loading.md
index a0ada601..d546827d 100644
--- a/doc/2_loading.md
+++ b/doc/2_loading.md
@@ -383,7 +383,7 @@ In addition you are able to set these parameters on a per table basis
 by using `implicit vals`. This allows a user to define a set of 
 parameters in a separate object and import them into a block of 
 code rather than repeatedly passing the same 
-[`ReadConf` object](https://github.com/datastax/spark-cassandra-connector/blob/master/spark-cassandra-connector/src/main/scala/com/datastax/spark/connector/rdd/ReadConf.scala#L7-L18).
+[`ReadConf` object](https://github.com/apache/cassandra-spark-connector/blob/trunk/connector/src/main/scala/com/datastax/spark/connector/rdd/ReadConf.scala#L26-L37).
 
 #### Example Using Implicits for Read Configuration
 ```scala
diff --git a/doc/developers.md b/doc/developers.md
index afaf1eb7..cd96742c 100644
--- a/doc/developers.md
+++ b/doc/developers.md
@@ -31,54 +31,55 @@ Cassandra and Spark nodes and are the core of our test coverage.
 
 ### Merge Path
 
-b2.5 => b3.0 => b3.1 => b3.2 => master
+b2.5 => b3.0 => b3.1 => b3.2 => b3.3 => b3.4 => trunk
 
 New features can be considered for 2.5 as long as they do not break apis.
 Once a feature is ready for b2.5, create a feature branch for b3.0 and merge
-b2.5 feature branch to b3.0 feature branch. Repeat for b3.1, b3.2 and master. 
+b2.5 feature branch to b3.0 feature branch. Repeat for b3.1, b3.2, b3.3, b3.4 and trunk. 
 
 Example for imaginary SPARKC-9999.
 
-Let's assume that `datastax` is `git@github.com:datastax/spark-cassandra-connector.git` remote 
+Let's assume that `apache` is `git@github.com:apache/cassandra-spark-connector.git` remote 
 and origin is your personal clone.
 ```shell
 $ git remote -v
-datastax	git@github.com:datastax/spark-cassandra-connector.git (fetch)
-datastax	git@github.com:datastax/spark-cassandra-connector.git (push)
+apache	git@github.com:apache/cassandra-spark-connector.git (fetch)
+apache	git@github.com:apache/cassandra-spark-connector.git (push)
 ...
 ```
 
 Here is what the work should look like.
 
 ```shell
-git fetch datastax
-git checkout -b SPARKC-9999-b2.5 datastax/b2.5
+git fetch apache
+git checkout -b SPARKC-9999-b2.5 apache/b2.5
 # do the work, commit
 git push origin SPARKC-9999-b2.5
  
 # Forward merge on the next version:
-git checkout -b SPARKC-9999-b3.0 datastax/b3.0
+git checkout -b SPARKC-9999-b3.0 apache/b3.0
 git merge SPARKC-9999-b2.5
 # Resolve conflict, if any
 # Push the new feature branch:
 git push origin SPARKC-9999-b3.0
 
 # Forward merge on the next version:
-git checkout -b SPARKC-9999-b3.1 datastax/b3.1
+git checkout -b SPARKC-9999-b3.1 apache/b3.1
 git merge SPARKC-9999-b3.0
 # Resolve conflict, if any
 # Push the new feature branch:
 git push origin SPARKC-9999-b3.1
 
-# Repeat for b3.2
+# Repeat for b3.2, b3.3, b3.4
  
 # Forward merge on the next version:
-git checkout -b SPARKC-9999-master datastax/master
+git checkout -b SPARKC-9999-trunk apache/trunk
 git merge SPARKC-9999-b3.2
 # Resolve conflict, if any
 # Push the new feature branch:
-git push origin SPARKC-9999-master
+git push origin SPARKC-9999-trunk
 ```
+Repeat for b3.3, b3.4, etc
 
 ### Sub-Projects
 
@@ -96,7 +97,7 @@ anything which could be used for any application even if Spark is not involved.
 
 
 #### test-support
-CCM Wrapper code. Much of this code is based on the Datastax Java Driver's test code. 
+CCM Wrapper code. Much of this code is based on the Apache Cassandra Java Driver's test code. 
 Includes code for spawning CCM as well as several modes for launching clusters
 while testing. Together this also defines which tests require seperate clusters to
 run and the parallelization used while running tests.
diff --git a/driver/src/main/scala/com/datastax/spark/connector/cql/MultiplexingSchemaListener.scala b/driver/src/main/scala/com/datastax/spark/connector/cql/MultiplexingSchemaListener.scala
index 67b4ba16..a653d626 100644
--- a/driver/src/main/scala/com/datastax/spark/connector/cql/MultiplexingSchemaListener.scala
+++ b/driver/src/main/scala/com/datastax/spark/connector/cql/MultiplexingSchemaListener.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
 package com.datastax.spark.connector.cql
 
 import com.datastax.oss.driver.api.core.`type`.UserDefinedType
diff --git a/driver/src/main/scala/com/datastax/spark/connector/util/Reflect.scala b/driver/src/main/scala/com/datastax/spark/connector/util/Reflect.scala
index 4d567dc4..91a1b369 100644
--- a/driver/src/main/scala/com/datastax/spark/connector/util/Reflect.scala
+++ b/driver/src/main/scala/com/datastax/spark/connector/util/Reflect.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.util
 
 import scala.reflect.runtime.universe._
diff --git a/driver/src/test/scala/com/datastax/spark/connector/cql/LocalNodeFirstLoadBalancingPolicySpec.scala b/driver/src/test/scala/com/datastax/spark/connector/cql/LocalNodeFirstLoadBalancingPolicySpec.scala
index 9da986f1..b135dd6c 100644
--- a/driver/src/test/scala/com/datastax/spark/connector/cql/LocalNodeFirstLoadBalancingPolicySpec.scala
+++ b/driver/src/test/scala/com/datastax/spark/connector/cql/LocalNodeFirstLoadBalancingPolicySpec.scala
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
-
 package com.datastax.spark.connector.cql
 
 import java.net.InetSocketAddress
diff --git a/driver/src/test/scala/com/datastax/spark/connector/cql/MultiplexingSchemaListenerTest.scala b/driver/src/test/scala/com/datastax/spark/connector/cql/MultiplexingSchemaListenerTest.scala
index 8d71ebd7..fd5bacf5 100644
--- a/driver/src/test/scala/com/datastax/spark/connector/cql/MultiplexingSchemaListenerTest.scala
+++ b/driver/src/test/scala/com/datastax/spark/connector/cql/MultiplexingSchemaListenerTest.scala
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
 package com.datastax.spark.connector.cql
 
 import com.datastax.oss.driver.api.core.`type`.UserDefinedType


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org