Skip to content

Commit ae682fc

Browse files
authored
Merge pull request #3135 from ClickHouse/09/16/26/remove_old_r2dbc_api
[repo] Removed R2DBC 0.9.1 SPI from build.
2 parents a7fd189 + d58c368 commit ae682fc

6 files changed

Lines changed: 4 additions & 163 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,10 @@ jobs:
372372
needs: test-jdbc-driver
373373
strategy:
374374
matrix:
375-
clickhouse: ["25.8", "26.3", "latest"]
375+
clickhouse: ["25.8", "26.3", "26.8", "latest"]
376376
# grpc is not fully supported, and http_client and apache_http_client do not work in CI environment(due to limited threads?)
377377
protocol: ["http"]
378-
r2dbc: ["1.0.0.RELEASE", "0.9.1.RELEASE"]
378+
r2dbc: ["1.0.0.RELEASE"]
379379
fail-fast: false
380380
timeout-minutes: 10
381381
name: R2DBC ${{ matrix.r2dbc }} + CH ${{ matrix.clickhouse }} (${{ matrix.protocol }})

‎.github/workflows/nightly.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,6 @@ jobs:
8181
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
8282
nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
8383
nexus_password: ${{ secrets.SONATYPE_TOKEN }}
84-
- name: Release R2DBC 0.9.1 Snapshot
85-
uses: samuelmeuli/action-maven-publish@v1
86-
with:
87-
directory: clickhouse-r2dbc
88-
maven_profiles: release
89-
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }}
90-
server_id: central
91-
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
92-
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
93-
nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
94-
nexus_password: ${{ secrets.SONATYPE_TOKEN }}
9584
# Mirror Tableau TDVT after publish (non-blocking).
9685
tdvt:
9786
name: "Tableau TDVT"

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ jobs:
6262
MAVEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN }}
6363
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
6464
run: mvn -q --batch-mode -P release -DclickhouseVersion=${{ env.CH_VERSION }} clean deploy
65-
- name: Release R2DBC 0.9.1
66-
working-directory: clickhouse-r2dbc
67-
env:
68-
MAVEN_USERNAME: ${{ secrets.SONATYPE_TOKEN_USER }}
69-
MAVEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN }}
70-
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
71-
run: mvn -q --batch-mode -P release -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }} clean deploy
7265
- name: Create Pre-release on Github
7366
env:
7467
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
the previous size can restore it by setting both options to 804800.
2525
(https://github.com/ClickHouse/clickhouse-java/issues/3121)
2626

27+
- **[r2dbc]** Pre `1.0.0` is not supported anymore because R2DBC API reached stable `1.0.0` version.
28+
2729
### New Features
2830

2931
- **[migration-helpers]** Added `migration-helpers` module containing `ConfigurationMigrationHelper` and

‎clickhouse-r2dbc/pom.xml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -127,31 +127,6 @@
127127
</plugins>
128128
</build>
129129
</profile>
130-
<profile>
131-
<id>r2dbc-0.9.1</id>
132-
<activation>
133-
<property>
134-
<name>r2dbc-spi.version</name>
135-
<value>0.9.1.RELEASE</value>
136-
</property>
137-
</activation>
138-
<properties>
139-
<release_suffix>_0.9.1</release_suffix>
140-
</properties>
141-
<build>
142-
<plugins>
143-
<plugin>
144-
<groupId>org.apache.maven.plugins</groupId>
145-
<artifactId>maven-compiler-plugin</artifactId>
146-
<configuration>
147-
<excludes>
148-
<exclude>**/com/clickhouse/r2dbc/ClickHouseResult.java</exclude>
149-
</excludes>
150-
</configuration>
151-
</plugin>
152-
</plugins>
153-
</build>
154-
</profile>
155130
</profiles>
156131

157132
<build>

‎clickhouse-r2dbc/src/main/java/com/clickhouse/r2dbc/ClickHouseResult091.java‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

0 commit comments

Comments
 (0)