Skip to content

Commit 200c098

Browse files
committed
Merge branch 'master' into yaml-example-gen
2 parents 4f930e6 + a1b6a2a commit 200c098

File tree

70 files changed

+2801
-637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2801
-637
lines changed

.github/workflows/go_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ jobs:
6464
go vet --copylocks=false --unsafeptr=false ./...
6565
- name: Run Staticcheck
6666
run: |
67-
go install "honnef.co/go/tools/cmd/staticcheck@2024.1.1"
67+
go install "honnef.co/go/tools/cmd/staticcheck@2025.1.1"
6868
cd sdks/go/pkg/beam
6969
$(go env GOPATH)/bin/staticcheck ./...

.github/workflows/python_dependency_tests.yml

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
steps:
3535
- name: Checkout code
3636
uses: actions/checkout@v4
37+
- name: Install libsnappy-dev
38+
run: sudo apt-get update && sudo apt-get install -y libsnappy-dev
3739
- name: Install python
3840
uses: actions/setup-python@v5
3941
with:

.test-infra/jenkins/metrics_report/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
# https://github.com/aws/aws-sam-cli/issues/3661
2121
markupsafe==2.0.1
2222
influxdb==5.3.0
23-
Jinja2==3.1.4
23+
Jinja2==3.1.6
2424
prettytable==0.7.2

dev-support/docker/Dockerfile

-5
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ ENV LANG en_US.UTF-8
5959
ENV LANGUAGE en_US:en
6060
ENV LC_ALL en_US.UTF-8
6161

62-
###
63-
# Set Python3.6 as default
64-
###
65-
RUN alias python=python3.6
66-
6762
###
6863
# Install grpcio-tools mypy-protobuf for `python3 sdks/python/setup.py sdist` to work
6964
###

dev-support/docker/pkglist

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ vim
2929
locales
3030
wget
3131
time
32-
openjdk-8-jdk
32+
openjdk-11-jdk
3333
python3-setuptools
3434
python3-pip
3535
python3.9
@@ -46,7 +46,6 @@ python3.11-distutils
4646
python3.11-venv
4747
python3.12
4848
python3.12-dev
49-
python3.12-distutils
5049
python3.12-venv
5150
tox
5251
docker.io

it/clickhouse/build.gradle

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* License); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an AS IS BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
plugins {
20+
id 'org.apache.beam.module'
21+
}
22+
applyJavaNature(
23+
automaticModuleName: 'org.apache.beam.it.clickhouse',
24+
exportJavadoc: false,
25+
)
26+
27+
description = "Apache Beam :: IT :: ClickHouse"
28+
ext.summary = "Integration test utilities for ClickHouse."
29+
30+
def clickhouse_jdbc_version = "0.6.4"
31+
32+
dependencies {
33+
implementation project(path: ":it:common")
34+
implementation project(path: ":it:testcontainers")
35+
testImplementation platform('org.junit:junit-bom:5.10.0')
36+
implementation library.java.slf4j_api
37+
testImplementation 'org.junit.jupiter:junit-jupiter'
38+
implementation library.java.testcontainers_base
39+
implementation library.java.testcontainers_clickhouse
40+
implementation "com.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version:all"
41+
42+
testImplementation(library.java.truth)
43+
testImplementation 'junit:junit:4.13.2'
44+
45+
testImplementation library.java.guava
46+
permitUsedUndeclared library.java.guava
47+
testImplementation library.java.mockito_inline
48+
testImplementation library.java.commons_lang3
49+
testRuntimeOnly library.java.slf4j_simple
50+
51+
permitUnusedDeclared "com.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version:all"
52+
53+
}

0 commit comments

Comments
 (0)