Skip to content

Commit 9c6780f

Browse files
chernserchernser
committed
fixed typo. added skiping spotless in CI
1 parent a48a12a commit 9c6780f

File tree

6 files changed

+18
-21
lines changed

6 files changed

+18
-21
lines changed

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
21
5757
cache: "maven"
5858
- name: Build and install libraries
59-
run: mvn --batch-mode --no-transfer-progress --show-version --strict-checksums --threads 2 -Dmaven.wagon.rto=30000 -Dj8 -DskipITs install
59+
run: mvn --batch-mode --no-transfer-progress --show-version --strict-checksums --threads 2 -Dmaven.wagon.rto=30000 -Dj8 -DskipITs -Dspotless.skip=true install
6060
- name: Copy Artifacts to Build dir
6161
run: |
6262
mkdir clickhouse-jdbc-artifacts
@@ -135,7 +135,7 @@ jobs:
135135
java-version: "21"
136136
github-token: ${{ secrets.GITHUB_TOKEN }}
137137
- name: Build native image
138-
run: mvn --batch-mode --no-transfer-progress -Pnative -Dj8 -DskipTests install
138+
run: mvn --batch-mode --no-transfer-progress -Pnative -Dj8 -DskipTests -Dspotless.skip=true install
139139
- name: Test native image
140140
run: ./clickhouse-jdbc/target/clickhouse-jdbc-bin
141141
- name: Compress binary
@@ -194,10 +194,10 @@ jobs:
194194
</toolchains>
195195
EOF
196196
- name: Build and install libraries
197-
run: mvn --batch-mode --no-transfer-progress --show-version --strict-checksums --threads 2 -Dmaven.wagon.rto=30000 -Dj8 -DskipTests=true -Dmaven.javadoc.skip=true install
197+
run: mvn --batch-mode --no-transfer-progress --show-version --strict-checksums --threads 2 -Dmaven.wagon.rto=30000 -Dj8 -DskipTests=true -Dmaven.javadoc.skip=true -Dspotless.skip=true install
198198
- name: Test Java client
199199
run: |
200-
mvn --also-make --batch-mode --no-transfer-progress --projects ${{ matrix.project }} -DclickhouseVersion=${{ matrix.clickhouse }} -Dmaven.javadoc.skip=true verify
200+
mvn --also-make --batch-mode --no-transfer-progress --projects ${{ matrix.project }} -DclickhouseVersion=${{ matrix.clickhouse }} -Dmaven.javadoc.skip=true -Dspotless.skip=true verify
201201
- name: Upload test results
202202
uses: actions/upload-artifact@v4
203203
if: failure()
@@ -257,14 +257,14 @@ jobs:
257257
</toolchains>
258258
EOF
259259
- name: Install Java client
260-
run: mvn --also-make --batch-mode --no-transfer-progress -DskipTests=true -Dmaven.javadoc.skip=true install
260+
run: mvn --also-make --batch-mode --no-transfer-progress -DskipTests=true -Dmaven.javadoc.skip=true -Dspotless.skip=true install
261261
- name: Test http client
262262
env:
263263
CLICKHOUSE_CLOUD_HOST: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_HOST_SMT }}
264264
CLICKHOUSE_CLOUD_PASSWORD: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_PASSWORD_SMT }}
265265
CLIENT_JWT: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_JWT_DESERT_VM_43 }}
266266
run: |
267-
mvn --batch-mode --no-transfer-progress --projects ${{ matrix.project }} -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=http -Dmaven.javadoc.skip=true verify
267+
mvn --batch-mode --no-transfer-progress --projects ${{ matrix.project }} -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=http -Dmaven.javadoc.skip=true -Dspotless.skip=true verify
268268
- name: Upload test results
269269
uses: actions/upload-artifact@v4
270270
if: failure()
@@ -321,13 +321,13 @@ jobs:
321321
</toolchains>
322322
EOF
323323
- name: Install Java client
324-
run: mvn --also-make --batch-mode --no-transfer-progress --projects clickhouse-http-client,client-v2 -DskipTests=true -Dmaven.javadoc.skip=true install
324+
run: mvn --also-make --batch-mode --no-transfer-progress --projects clickhouse-http-client,client-v2 -DskipTests=true -Dmaven.javadoc.skip=true -Dspotless.skip=true install
325325
- name: Test JDBC driver
326326
env:
327327
CLICKHOUSE_CLOUD_HOST: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_HOST_SMT }}
328328
CLICKHOUSE_CLOUD_PASSWORD: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_PASSWORD_SMT }}
329329
run: |
330-
mvn --batch-mode --no-transfer-progress --projects clickhouse-jdbc,jdbc-v2 -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} -Dmaven.javadoc.skip=true verify
330+
mvn --batch-mode --no-transfer-progress --projects clickhouse-jdbc,jdbc-v2 -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} -Dmaven.javadoc.skip=true -Dspotless.skip=true verify
331331
- name: Upload test results
332332
uses: actions/upload-artifact@v4
333333
if: failure()
@@ -384,11 +384,11 @@ jobs:
384384
</toolchains>
385385
EOF
386386
- name: Install Java client
387-
run: mvn --also-make --no-transfer-progress --batch-mode --projects clickhouse-jdbc -DskipTests=true -Dmaven.javadoc.skip=true install
387+
run: mvn --also-make --no-transfer-progress --batch-mode --projects clickhouse-jdbc -DskipTests=true -Dmaven.javadoc.skip=true -Dspotless.skip=true install
388388
- name: Test R2DBC ${{ matrix.r2dbc }}
389389
run: |
390390
mvn --batch-mode --no-transfer-progress --projects clickhouse-r2dbc -DclickhouseVersion=${{ matrix.clickhouse }} \
391-
-D'r2dbc-spi.version=${{ matrix.r2dbc }}' -Dprotocol=${{ matrix.protocol }} -Dmaven.javadoc.skip=true verify
391+
-D'r2dbc-spi.version=${{ matrix.r2dbc }}' -Dprotocol=${{ matrix.protocol }} -Dmaven.javadoc.skip=true -Dspotless.skip=true verify
392392
- name: Upload test results
393393
uses: actions/upload-artifact@v4
394394
if: failure()

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ jobs:
5959
EOF
6060
- name: Update Configuration
6161
run: |
62-
# find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ env.CHC_VERSION }}-SNAPSHOT|g' \
63-
# -e 's|^\( <version>\).*\(</version>\)$|\1${{ env.CHC_VERSION }}-SNAPSHOT\2|' \
64-
# -e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
6562
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
6663
- name: Release Snapshot
6764
uses: samuelmeuli/action-maven-publish@v1
@@ -78,7 +75,7 @@ jobs:
7875
with:
7976
directory: clickhouse-r2dbc
8077
maven_profiles: release
81-
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }}
78+
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }} -Dspotless.skip=true
8279
server_id: central
8380
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
8481
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
with:
6666
directory: clickhouse-r2dbc
6767
maven_profiles: release
68-
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }}
68+
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }} -Dspotless.skip=true
6969
server_id: central
7070
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
7171
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}

‎.github/workflows/test_head.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
architecture: x64
3939
- name: Test Java client
4040
run: |
41-
mvn --also-make --batch-mode --no-transfer-progress --projects ${{ matrix.project }} -DclickhouseVersion=$CH_VERSION -Dmaven.javadoc.skip=true clean install
41+
mvn --also-make --batch-mode --no-transfer-progress --projects ${{ matrix.project }} -DclickhouseVersion=$CH_VERSION -Dmaven.javadoc.skip=true -Dspotless.skip=true clean install
4242
- name: Upload test results
4343
uses: actions/upload-artifact@v4
4444
if: failure()
@@ -68,7 +68,7 @@ jobs:
6868
architecture: x64
6969
- name: Build
7070
run: |
71-
mvn --also-make --batch-mode --no-transfer-progress -DclickhouseVersion=$CH_VERSION -Dmaven.javadoc.skip=true -DskipTests=true clean install
71+
mvn --also-make --batch-mode --no-transfer-progress -DclickhouseVersion=$CH_VERSION -Dmaven.javadoc.skip=true -DskipTests=true -Dspotless.skip=true clean install
7272
- name: Test R2DBC ${{ matrix.r2dbc }}
7373
run: |
7474
mvn --batch-mode --no-transfer-progress --projects clickhouse-r2dbc -DclickhouseVersion=$CH_VERSION \

‎jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ public boolean isIgnoreUnsupportedRequests() {
6262
private static final Set<String> DRIVER_PROP_KEYS;
6363
static {
6464

65-
ImmutableSet.Builder<String> driverPropertiesMapBuidler = ImmutableSet.builder();
65+
ImmutableSet.Builder<String> driverPropertiesMapBuilder = ImmutableSet.builder();
6666
for (DriverProperties prop : DriverProperties.values()) {
67-
driverPropertiesMapBuidler.add(prop.getKey());
67+
driverPropertiesMapBuilder.add(prop.getKey());
6868
}
6969

70-
DRIVER_PROP_KEYS = driverPropertiesMapBuidler.build();
70+
DRIVER_PROP_KEYS = driverPropertiesMapBuilder.build();
7171
}
7272

7373
/**

‎jdbc-v2/src/test/java/com/clickhouse/jdbc/DriverTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void testUnknownSettings() throws Exception {
189189
properties.put(DriverProperties.SCHEMA_TERM.getKey(), "catalog");
190190
try (Connection connection = getJdbcConnection(properties);
191191
Statement stmt = connection.createStatement()) {
192-
//
192+
// Verifies that creating a connection and statement with SECURE_CONNECTION and SCHEMA_TERM properties does not throw any exceptions.
193193
}
194194
}
195195

0 commit comments

Comments
 (0)