diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0b195e80..db31d2ae 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -18,10 +18,12 @@ on: branches: - "master" - "branch-*" + - "main" pull_request: branches: - "master" - "branch-*" + - "main" jobs: run-tests: diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml index 30f75c82..a219771d 100644 --- a/.github/workflows/check-license.yml +++ b/.github/workflows/check-license.yml @@ -18,10 +18,12 @@ on: branches: - "master" - "branch-*" + - "main" pull_request: branches: - "master" - "branch-*" + - "main" jobs: check-license: diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml index d6b089d7..41d86e3e 100644 --- a/.github/workflows/deploy-website.yml +++ b/.github/workflows/deploy-website.yml @@ -17,6 +17,7 @@ on: push: branches: - "master" + - "main" paths: - "docs/**" - "mkdocs.yml" diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index b093c171..17a6dade 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -27,6 +27,7 @@ jobs: matrix: branch: - "master" + - "main" scala: [ 2.12, 2.13 ] spark: [ 3.3, 3.4, 3.5 ] steps: diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 7df06cd8..32959e78 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -19,10 +19,12 @@ on: branches: - "master" - "branch-*" + - "main" pull_request: branches: - "master" - "branch-*" + - "main" jobs: check-style: diff --git a/.github/workflows/tpcds.yml b/.github/workflows/tpcds.yml index c82c72a4..6937af2e 100644 --- a/.github/workflows/tpcds.yml +++ b/.github/workflows/tpcds.yml @@ -19,10 +19,12 @@ on: branches: - "master" - "branch-*" + - "main" pull_request: branches: - "master" - "branch-*" + - "main" jobs: run-tpcds-sf1: diff --git a/LICENSE b/LICENSE index b4473760..15fc8e39 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +Copyright 2016-2024 ClickHouse, Inc. + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -186,7 +188,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2016-2024 ClickHouse, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 8e37d653..ec1ac755 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Spark ClickHouse Connector === [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.housepower/clickhouse-spark-runtime-3.3_2.12/badge.svg)](https://search.maven.org/search?q=clickhouse-spark-runtime) -[![License](https://img.shields.io/github/license/housepower/spark-clickhouse-connector)](https://github.com/housepower/spark-clickhouse-connector/blob/master/LICENSE) +[![License](https://img.shields.io/github/license/clickhouse/spark-clickhouse-connector)](https://github.com/ClickHouse/spark-clickhouse-connector/blob/main/LICENSE) Build on Apache Spark DataSourceV2 API. @@ -29,7 +29,7 @@ Notes: | Version | Compatible Spark Versions | ClickHouse JDBC version | |---------|---------------------------|-------------------------| -| master | Spark 3.3, 3.4, 3.5 | 0.6.0 | +| main | Spark 3.3, 3.4, 3.5 | 0.6.0 | | 0.7.3 | Spark 3.3, 3.4 | 0.4.6 | | 0.6.0 | Spark 3.3 | 0.3.2-patch11 | | 0.5.0 | Spark 3.2, 3.3 | 0.3.2-patch11 | diff --git a/docs/developers/01_build_and_test.md b/docs/developers/01_build_and_test.md index 95e315d9..ed7b9bed 100644 --- a/docs/developers/01_build_and_test.md +++ b/docs/developers/01_build_and_test.md @@ -21,7 +21,7 @@ Build and Test Check out source code from GitHub ``` -git checkout https://github.com/housepower/spark-clickhouse-connector.git +git checkout https://github.com/ClickHouse/spark-clickhouse-connector.git ``` Build w/o test diff --git a/docs/developers/04_public_release.md b/docs/developers/04_public_release.md index 74a03bfc..d8c2fce8 100644 --- a/docs/developers/04_public_release.md +++ b/docs/developers/04_public_release.md @@ -26,21 +26,21 @@ Public Release ## Snapshot Release -The daily snapshot release is managed by [Publish Snapshot](https://github.com/housepower/spark-clickhouse-connector/blob/master/.github/workflows/publish-snapshot.yml) +The daily snapshot release is managed by [Publish Snapshot](https://github.com/ClickHouse/spark-clickhouse-connector/blob/main/.github/workflows/publish-snapshot.yml) workflow, it is scheduled to be deployed at midnight every day. ## Feature Release -1. Cut new branch from master branch, e.g. `branch-0.3`; +1. Cut new branch from main branch, e.g. `branch-0.3`; 2. Update version in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0-SNAPSHOT` to `0.3.0`; -3. Create new tag, e.g. `v0.3.0`, it will trigger the [Publish Release](https://github.com/housepower/spark-clickhouse-connector/blob/master/.github/workflows/publish-release.yml) +3. Create new tag, e.g. `v0.3.0`, it will trigger the [Publish Release](https://github.com/ClickHouse/spark-clickhouse-connector/blob/main/.github/workflows/publish-release.yml) workflow; 4. Verify, close, and release in [Sonatype Repository](https://oss.sonatype.org/#stagingRepositories) 5. Announce in [GitHub Release](https://github.com/housepower/spark-clickhouse-connector/releases) 6. Update version in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0` to `0.3.1-SNAPSHOT`; -7. Update version on master branch in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0-SNAPSHOT` to `0.4.0-SNAPSHOT`; -8. [Publish Docker image](https://github.com/housepower/spark-clickhouse-connector/tree/master/docker) after jars +7. Update version on main branch in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0-SNAPSHOT` to `0.4.0-SNAPSHOT`; +8. [Publish Docker image](https://github.com/ClickHouse/spark-clickhouse-connector/tree/main/docker) after jars available in Maven Central, generally it costs few minutes after step 3. ## Patch Release diff --git a/docs/index.md b/docs/index.md index 51b5f659..a59b959c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -45,7 +45,7 @@ For old versions, please refer the compatible matrix. | Version | Compatible Spark Versions | ClickHouse JDBC version | |---------|---------------------------|-------------------------| -| master | Spark 3.3, 3.4, 3.5 | 0.6.0 | +| main | Spark 3.3, 3.4, 3.5 | 0.6.0 | | 0.7.3 | Spark 3.3, 3.4 | 0.4.6 | | 0.6.0 | Spark 3.3 | 0.3.2-patch11 | | 0.5.0 | Spark 3.2, 3.3 | 0.3.2-patch11 |