2.0 release

.github/workflows/build.yml

@@ -23,25 +23,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Setup Dependencies
-        env:
-          DEBIAN_FRONTEND: noninteractive
-          CH_REPO: deb [trusted=yes] https://repo.clickhouse.tech/deb/stable/ main/
-          CH_CONF_DIR: /etc/clickhouse-server/config.d
-        run: |
-          sudo apt-get update -y -qq
-          sudo apt-get install -y -qq --no-install-recommends ca-certificates dpkg fakeroot rpm
-          echo $CH_REPO | sudo tee -a /etc/apt/sources.list
-          sudo apt-get update -y -qq
-          sudo apt-get install -y -qq clickhouse-server
-          sudo mkdir -p $CH_CONF_DIR
-          sudo touch $CH_CONF_DIR/test.xml
-          echo "<yandex><jdbc_bridge><host>127.0.0.1</host><port>9019</port></jdbc_bridge></yandex>" | sudo tee -a $CH_CONF_DIR/test.xml
-          sudo /usr/sbin/clickhouse-server --config=/etc/clickhouse-server/config.xml &
       - uses: actions/checkout@v2
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
       - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots -Prelease verify
+        run: mvn --batch-mode --update-snapshots verify

.github/workflows/release.yml

@@ -26,14 +26,23 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+      - name: Install Java and Maven
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-      - name: Build with Maven
-        run: mvn -Dmaven.test.skip=true -Drevision=${{ github.event.inputs.major }}.${{ github.event.inputs.minor }}.${{ github.event.inputs.patch }} --batch-mode -Prelease package
-      - uses: "marvinpinto/action-automatic-releases@latest"
+      - name: Release Maven package
+        uses: samuelmeuli/action-maven-publish@v1
+        with:
+          maven_profiles: release
+          maven_args: -Drevision=${{ github.event.inputs.major }}.${{ github.event.inputs.minor }}.${{ github.event.inputs.patch }} --batch-mode
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          nexus_username: ${{ secrets.SONATYPE_USER }}
+          nexus_password: ${{ secrets.SONATYPE_PASSWD }}
+      - name: Create Pre-release on Github
+        uses: "zhicwu/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "v${{ github.event.inputs.major }}.${{ github.event.inputs.minor }}.${{ github.event.inputs.patch }}"

Dockerfile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2020, Zhichun Wu
+# Copyright (C) 2019-2021, Zhichun Wu
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -27,7 +27,7 @@ LABEL maintainer="[email protected]"
 
 # Environment variables
 ENV JDBC_BRIDGE_HOME=/app JDBC_BRIDGE_VERSION=${revision} \
-	JDBC_BRIDGE_REL_URL=https://github.com/${repository}/releases/download/v${revision}/
+	JDBC_BRIDGE_REL_URL=https://github.com/${repository}/releases/download/v${revision}
 
 # Labels
 LABEL app_name="ClickHouse JDBC Bridge" app_version="$JDBC_BRIDGE_VERSION"
@@ -57,6 +57,3 @@ EXPOSE 9019
 VOLUME ["${JDBC_BRIDGE_HOME}/drivers", "${JDBC_BRIDGE_HOME}/extensions", "${JDBC_BRIDGE_HOME}/logs", "${JDBC_BRIDGE_HOME}/scripts"]
 
 CMD "./docker-entrypoint.sh"
-
-HEALTHCHECK --start-period=5m --interval=30s --timeout=5s \
-	CMD curl --connect-timeout 3 --no-keepalive -f http://localhost:9019/ping || exit 1

NOTICE

@@ -1,5 +1,5 @@
 clickhouse-jdbc-bridge
-Copyright 2019-2020, Zhichun Wu.
+Copyright 2019-2021, Zhichun Wu.
 
 This project includes software developed by Zhichun Wu.
 https://github.com/zhicwu
@@ -18,18 +18,26 @@ specific language governing permissions and limitations
 under the License.
 
 This project includes:
+  Apache Commons Compress under Apache License, Version 2.0
   Apache Log4j under The Apache Software License, Version 2.0
   Caffeine cache under Apache License, Version 2.0
   Checker Qual under The MIT License
   ClickHouse JDBC Bridge under Apache License, Version 2.0
   dnsjava under BSD-2-Clause
+  docker-java-api under The Apache Software License, Version 2.0
+  docker-java-transport under The Apache Software License, Version 2.0
+  docker-java-transport-zerodep under The Apache Software License, Version 2.0
+  Duct Tape under MIT
   error-prone annotations under Apache 2.0
+  Hamcrest Core under New BSD License
   HdrHistogram under Public Domain, per Creative Commons CC0 or BSD-2-Clause
   HikariCP under The Apache Software License, Version 2.0
   Jackson-annotations under The Apache Software License, Version 2.0
   Jackson-core under The Apache Software License, Version 2.0
   jackson-databind under The Apache Software License, Version 2.0
+  Java Native Access under LGPL, version 2.1 or Apache License v2.0
   jcommander under Apache 2.0
+  JUnit under Eclipse Public License 1.0
   LatencyUtils under Public Domain, per Creative Commons CC0
   micrometer-core under The Apache Software License, Version 2.0
   micrometer-registry-prometheus under The Apache Software License, Version 2.0
@@ -49,7 +57,7 @@ This project includes:
   Prometheus Java Simpleclient Common under The Apache Software License, Version 2.0
   SLF4J API Module under MIT License
   SLF4J LOG4J-12 Binding under MIT License
-  SQLite JDBC under The Apache Software License, Version 2.0
+  Testcontainers Core under MIT
   testng under Apache 2.0
   Vert.x Bridge Common under The Apache Software License, Version 2.0 or Eclipse Public License - v 1.0
   Vert.x Core under The Apache Software License, Version 2.0 or Eclipse Public License - v 2.0
@@ -59,4 +67,5 @@ This project includes:
   vertx-web under The Apache Software License, Version 2.0 or Eclipse Public License - v 2.0
   vertx-web-client under The Apache Software License, Version 2.0 or Eclipse Public License - v 1.0
   vertx-web-common under The Apache Software License, Version 2.0 or Eclipse Public License - v 1.0
+  Visible Assertions under MIT