Merge pull request #1205 from zhicwu/master

rename default branch from master to main
ClickHouse · Jan 27, 2023 · 3b68e61 · 3b68e61
2 parents b0357a1 + d5f7d2a
commit 3b68e61
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -4,11 +4,9 @@ on:
   push:
     branches:
       - main
-      - master
   pull_request:
     branches:
       - main
-      - master
     types:
       - opened
       - synchronize

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - master
     paths-ignore:
       - "**.md"
       - "**/docs/**"

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -11,7 +11,7 @@ on:
         required: false
 
 env:
-  CHC_BRANCH: "master"
+  CHC_BRANCH: "main"
   CHC_VERSION: "0.4.1"
 
 jobs:

diff --git a/clickhouse-benchmark/pom.xml b/clickhouse-benchmark/pom.xml
@@ -14,7 +14,7 @@
 
     <name>ClickHouse Client Benchmarks</name>
     <description>Benchmarks for ClickHouse clients</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-benchmark</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-benchmark</url>
 
     <properties>
         <legacy-driver.version>0.3.1-patch</legacy-driver.version>

diff --git a/clickhouse-cli-client/pom.xml b/clickhouse-cli-client/pom.xml
@@ -12,7 +12,7 @@
 
     <name>ClickHouse Native Command-line Wrapper</name>
     <description>Wrapper of ClickHouse native command-line client</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-cli-client</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-cli-client</url>
 
     <dependencies>
         <dependency>

diff --git a/clickhouse-client/README.md b/clickhouse-client/README.md
@@ -4,7 +4,7 @@ Async Java client for ClickHouse. `clickhouse-client` is an abstract module, so
 
 ## Configuration
 
-You can pass any client option([common](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java), [http](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java), [grpc](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java), and [cli](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java)) to `ClickHouseRequest.option()` and [server setting](https://clickhouse.com/docs/en/operations/settings/) to `ClickHouseRequest.set()` before execution, for instance:
+You can pass any client option([common](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java), [http](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java), [grpc](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java), and [cli](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java)) to `ClickHouseRequest.option()` and [server setting](https://clickhouse.com/docs/en/operations/settings/) to `ClickHouseRequest.set()` before execution, for instance:
 
 ```java
 client.connect("http://localhost/system")
@@ -30,7 +30,7 @@ client.connect("http://localhost/system")
     });
 ```
 
-[Default value](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseDefaults.java) can be either configured via system property or environment variable.
+[Default value](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseDefaults.java) can be either configured via system property or environment variable.
 
 ## Quick Start
 

diff --git a/clickhouse-client/pom.xml b/clickhouse-client/pom.xml
@@ -14,7 +14,7 @@
 
     <name>ClickHouse Java Client</name>
     <description>Unified Java client for ClickHouse</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-client</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-client</url>
 
     <dependencies>
         <dependency>

diff --git a/clickhouse-data/pom.xml b/clickhouse-data/pom.xml
@@ -14,7 +14,7 @@
 
     <name>ClickHouse Data Processing Utilities</name>
     <description>Data processing utilities for ClickHouse</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-data</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-data</url>
 
     <dependencies>
         <dependency>

diff --git a/clickhouse-grpc-client/pom.xml b/clickhouse-grpc-client/pom.xml
@@ -14,7 +14,7 @@
 
     <name>ClickHouse gRPC Client</name>
     <description>gRPC client for ClickHouse</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-grpc-client</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-grpc-client</url>
 
     <dependencies>
         <dependency>

diff --git a/clickhouse-http-client/pom.xml b/clickhouse-http-client/pom.xml
@@ -14,7 +14,7 @@
 
     <name>ClickHouse HTTP Client</name>
     <description>HTTP client for ClickHouse</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-http-client</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-http-client</url>
 
     <dependencies>
         <dependency>

diff --git a/clickhouse-jdbc/README.md b/clickhouse-jdbc/README.md
@@ -45,7 +45,7 @@ Keep in mind that `clickhouse-jdbc` is synchronous, and in general it has more o
 | typeMappings             |         | Customize mapping between ClickHouse data type and Java class, which will affect result of both [getColumnType()](https://docs.oracle.com/javase/8/docs/api/java/sql/ResultSetMetaData.html#getColumnType-int-) and [getObject(Class<?>)](https://docs.oracle.com/javase/8/docs/api/java/sql/ResultSet.html#getObject-java.lang.String-java.lang.Class-). For example: `UInt128=java.lang.String,UInt256=java.lang.String` |
 | wrapperObject            | `false` | Whether [getObject()](https://docs.oracle.com/javase/8/docs/api/java/sql/ResultSet.html#getObject-int-) should return java.sql.Array / java.sql.Struct for Array / Tuple.                                                                                                                                                                                                                                                  |
 
-Note: please refer to [JDBC specific configuration](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/JdbcConfig.java) and client options([common](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java), [http](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java), [grpc](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java), and [cli](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java)) for more.
+Note: please refer to [JDBC specific configuration](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/JdbcConfig.java) and client options([common](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java), [http](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java), [grpc](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java), and [cli](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java)) for more.
 
 ## Examples
 

diff --git a/clickhouse-jdbc/pom.xml b/clickhouse-jdbc/pom.xml
@@ -14,7 +14,7 @@
 
     <name>ClickHouse JDBC Driver</name>
     <description>JDBC driver for ClickHouse</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-jdbc</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-jdbc</url>
 
     <properties>
         <httpclient.version>4.5.13</httpclient.version>

diff --git a/clickhouse-r2dbc/pom.xml b/clickhouse-r2dbc/pom.xml
@@ -15,7 +15,7 @@
 
     <name>ClickHouse R2DBC Driver</name>
     <description>R2DBC driver for ClickHouse</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-r2dbc</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-r2dbc</url>
 
     <properties>
         <hikari-cp.version>4.0.3</hikari-cp.version>

diff --git a/third-party-libraries/com.javacc/pom.xml b/third-party-libraries/com.javacc/pom.xml
@@ -12,7 +12,7 @@
 
     <name>${project.artifactId}</name>
     <description>Repackaged JavaCC for generating SQL parser</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries/com.javacc</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/third-party-libraries/com.javacc</url>
 
     <properties>
         <javacc.dir>javacc21-master</javacc.dir>

diff --git a/third-party-libraries/io.grpc/pom.xml b/third-party-libraries/io.grpc/pom.xml
@@ -13,7 +13,7 @@
 
     <name>${project.artifactId}</name>
     <description>Repackaged grpc-java for JPMS support</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries/io.grpc</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/third-party-libraries/io.grpc</url>
 
     <dependencies>
         <dependency>

diff --git a/third-party-libraries/org.roaringbitmap/pom.xml b/third-party-libraries/org.roaringbitmap/pom.xml
@@ -12,7 +12,7 @@
 
     <name>${project.artifactId}</name>
     <description>Repackaged RoaringBitmap for JPMS support</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries/org.roaringbitmap</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/third-party-libraries/org.roaringbitmap</url>
 
     <dependencies>
         <dependency>

diff --git a/third-party-libraries/pom.xml b/third-party-libraries/pom.xml
@@ -9,7 +9,7 @@
 
     <name>${project.artifactId}</name>
     <description>Repackaged third party libraries for JPMS compatibility</description>
-    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries</url>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/third-party-libraries</url>
     <inceptionYear>2022</inceptionYear>
 
     <organization>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ on: @@
       push:
         branches:
           - main
-          - master
         paths-ignore:
           - "**.md"
           - "**/docs/**"
@@ Expand Down @@