From 5d1d813bd12e62cf7f8d3b1a0cf3722da4412fce Mon Sep 17 00:00:00 2001 From: Alexandr Gorshenin Date: Tue, 6 Feb 2024 11:37:37 +0000 Subject: [PATCH 1/5] New snapshot version 2.0.7 --- jdbc-shaded/pom.xml | 2 +- jdbc/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jdbc-shaded/pom.xml b/jdbc-shaded/pom.xml index 2c70443..6b0e2b4 100644 --- a/jdbc-shaded/pom.xml +++ b/jdbc-shaded/pom.xml @@ -6,7 +6,7 @@ tech.ydb.jdbc ydb-jdbc-driver-parent - 2.0.6 + 2.0.7-SNAPSHOT ydb-jdbc-driver-shaded diff --git a/jdbc/pom.xml b/jdbc/pom.xml index bd9bee2..4607bf5 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -6,7 +6,7 @@ tech.ydb.jdbc ydb-jdbc-driver-parent - 2.0.6 + 2.0.7-SNAPSHOT ydb-jdbc-driver diff --git a/pom.xml b/pom.xml index 9706a1b..1afac32 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ tech.ydb.jdbc ydb-jdbc-driver-parent - 2.0.6 + 2.0.7-SNAPSHOT YDB JDBC Module JDBC Driver over YDB Java SDK From 979ec61822072bd0c732352ad6791bdc463fd083 Mon Sep 17 00:00:00 2001 From: Alexandr Gorshenin Date: Tue, 6 Feb 2024 11:41:33 +0000 Subject: [PATCH 2/5] Updated version of github actions --- .github/workflows/build.yaml | 19 ++++++++++--------- .github/workflows/publish.yaml | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8e192a7..8a17b07 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,10 +23,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -43,7 +43,7 @@ jobs: - name: Checkout YDB Java SDK if: env.NEED_SDK == 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ydb-platform/ydb-java-sdk ref: develop @@ -60,7 +60,7 @@ jobs: - name: Checkout YC Auth provider if: env.NEED_SDK == 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ydb-platform/ydb-java-yc ref: develop @@ -82,6 +82,7 @@ jobs: run: mvn $MAVEN_ARGS package coverage: + if: github.repository == 'ydb-platform/ydb-jdbc-driver' name: Coverage JDBC Driver runs-on: ubuntu-latest needs: build @@ -91,10 +92,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: 'temurin' @@ -111,7 +112,7 @@ jobs: - name: Checkout YDB Java SDK if: env.NEED_SDK == 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ydb-platform/ydb-java-sdk ref: develop @@ -128,7 +129,7 @@ jobs: - name: Checkout YC Auth provider if: env.NEED_SDK == 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ydb-platform/ydb-java-yc ref: develop @@ -150,4 +151,4 @@ jobs: run: mvn $MAVEN_ARGS test - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index fea5526..3b551f4 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -38,7 +38,7 @@ jobs: script: core.setFailed('Release name must be equal to project version') - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: 'temurin' @@ -67,12 +67,12 @@ jobs: gpg --list-secret-keys --keyid-format LONG - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Set up Maven Central Repository - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: 'temurin' From b9fd7bc8fff77aea6a745ebdb7d900ac67bdd1cb Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Tue, 6 Feb 2024 13:31:55 +0300 Subject: [PATCH 3/5] [JDBC]: Get grpcTransport for other API YDB server clients --- jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java b/jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java index ed7a07c..dda27ae 100644 --- a/jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java +++ b/jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java @@ -92,7 +92,14 @@ private YdbContext(YdbConfig config, GrpcTransport transport, PooledTableClient } } - + /** + * Grpc Transport for other API YDB server clients + * + * @return grpcTransport for YDB + */ + public GrpcTransport getGrpcTransport() { + return grpcTransport; + } public String getDatabase() { return grpcTransport.getDatabase(); From 422ed381a6ca4c7109d7b12b90ccf44376f92a05 Mon Sep 17 00:00:00 2001 From: Alexandr Gorshenin Date: Tue, 6 Feb 2024 11:42:58 +0000 Subject: [PATCH 4/5] Updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3306149..5e55c50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.7 ## + +* Added getter for GrpcTransport to YdbContext + ## 2.0.6 ## * Upgraded Java SDK version From 59ab12895fbf484d50bde2fee1571e7ad48ee0b2 Mon Sep 17 00:00:00 2001 From: Alexandr Gorshenin Date: Tue, 6 Feb 2024 11:45:56 +0000 Subject: [PATCH 5/5] New release version 2.0.7 --- README.md | 4 ++-- jdbc-shaded/pom.xml | 2 +- jdbc/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6e927d7..0970277 100644 --- a/README.md +++ b/README.md @@ -25,14 +25,14 @@ Specify the YDB JDBC driver in the dependencies: tech.ydb.jdbc ydb-jdbc-driver - 2.0.6 + 2.0.7 tech.ydb.jdbc ydb-jdbc-driver-shaded - 2.0.6 + 2.0.7 ``` diff --git a/jdbc-shaded/pom.xml b/jdbc-shaded/pom.xml index 6b0e2b4..9918411 100644 --- a/jdbc-shaded/pom.xml +++ b/jdbc-shaded/pom.xml @@ -6,7 +6,7 @@ tech.ydb.jdbc ydb-jdbc-driver-parent - 2.0.7-SNAPSHOT + 2.0.7 ydb-jdbc-driver-shaded diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 4607bf5..1b0c9ae 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -6,7 +6,7 @@ tech.ydb.jdbc ydb-jdbc-driver-parent - 2.0.7-SNAPSHOT + 2.0.7 ydb-jdbc-driver diff --git a/pom.xml b/pom.xml index 1afac32..8a0763d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ tech.ydb.jdbc ydb-jdbc-driver-parent - 2.0.7-SNAPSHOT + 2.0.7 YDB JDBC Module JDBC Driver over YDB Java SDK