Skip to content

Commit 1f38aa8

Browse files
kellenMichel Davit
kellen
and
Michel Davit
authored
Bump beam to 2.61, pin beam dependencies, reduce dependabot noise (#925)
* wip * wip * wip * avro * Update to beam 2.61 --------- Co-authored-by: Michel Davit <[email protected]>
1 parent addacc3 commit 1f38aa8

File tree

3 files changed

+145
-111
lines changed

3 files changed

+145
-111
lines changed

‎.github/dependabot.yml

+19
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,34 @@ updates:
1212
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
1313
- dependency-name: com.fasterxml.jackson.core:jackson-core
1414
- dependency-name: com.fasterxml.jackson.core:jackson-databind
15+
- dependency-name: com.fasterxml.jackson:jackson-bom
16+
- dependency-name: com.github.luben:zstd-jni
1517
- dependency-name: com.google.api-client:google-api-client
1618
- dependency-name: com.google.api.grpc:proto-google-iam-v1
1719
- dependency-name: com.google.apis:google-api-services-storage
20+
- dependency-name: com.google.auto.value:auto-value
21+
- dependency-name: com.google.auto.value:auto-value-annotations
1822
- dependency-name: com.google.cloud.sql:mysql-socket-factory
1923
- dependency-name: com.google.cloud.sql:postgres-socket-factory
2024
- dependency-name: com.google.cloud:libraries-bom
25+
- dependency-name: com.google.errorprone:error_prone_annotations
26+
- dependency-name: com.google.guava:guava-bom
2127
- dependency-name: com.google.http-client:google-http-client
2228
- dependency-name: com.google.http-client:google-http-client-test
2329
- dependency-name: com.google.oauth-client:google-oauth-client
2430
- dependency-name: com.google.protobuf:protobuf-java
2531
- dependency-name: com.google.protobuf:protobuf-java-util
32+
- dependency-name: commons-codec:commons-codec
33+
- dependency-name: org.apache.beam:beam-sdks-java-bom # manually bump this
34+
- dependency-name: org.apache.commons:commons-compress
35+
- dependency-name: org.apache.httpcomponents:httpcore
36+
- dependency-name: org.apache.httpcomponents:httpclient
37+
- dependency-name: org.checkerframework:checker-qual
38+
- dependency-name: org.slf4j:slf4j-api
39+
- dependency-name: org.slf4j:slf4j-jdk14
40+
- dependency-name: org.threeten:threetenbp
2641
- dependency-name: io.grpc:grpc-bom
42+
- dependency-name: io.netty:netty-bom
43+
- dependency-name: joda-time:joda-time
44+
# sync with libraries-bom
45+
- dependency-name: io.opencensus:opencensus-contrib-grpc-metrics

‎NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
DBeam
2-
Copyright 2017 Spotify AB
2+
Copyright 2024 Spotify AB

‎pom.xml

+125-110
Original file line numberDiff line numberDiff line change
@@ -100,138 +100,150 @@
100100

101101
<properties>
102102
<maven.compiler.release>8</maven.compiler.release>
103-
<auto-value.version>1.11.0</auto-value.version>
103+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
104+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
105+
106+
<!-- apache beam BOM -->
107+
<!-- https://github.com/apache/beam/blob/release-2.61.0/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy#L586 -->
108+
<beam.version>2.61.0</beam.version>
109+
<!-- versions from beam -->
110+
<auto-value.version>1.9</auto-value.version>
104111
<avro.version>1.11.3</avro.version>
105-
<bouncycastle.version>1.78.1</bouncycastle.version>
106-
<!--Ensure Beam SDK compatibility-->
107-
<!-- https://github.com/apache/beam/blob/release-2.59.0/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy#L586 -->
108-
<beam.version>2.59.0</beam.version>
112+
<checker-qual.version>3.42.0</checker-qual.version>
113+
<commons-codec.version>1.17.1</commons-codec.version>
114+
<commons-compress.version>1.26.2</commons-compress.version>
115+
<errorprone.version>2.10.0</errorprone.version>
116+
<guava.version>33.1.0-jre</guava.version>
117+
<hamcrest.version>2.1</hamcrest.version>
118+
<httpclient.version>4.5.13</httpclient.version>
119+
<httpcore.version>4.4.14</httpcore.version>
120+
<jackson.version>2.15.4</jackson.version>
121+
<joda-time.version>2.10.14</joda-time.version>
122+
<netty.version>4.1.100.Final</netty.version>
123+
<slf4j.version>1.7.30</slf4j.version>
124+
<threetenbp.version>1.6.8</threetenbp.version>
125+
<zstd-jni.version>1.5.6-3</zstd-jni.version>
126+
127+
<!-- GCP BOM -->
109128
<!-- https://github.com/googleapis/java-cloud-bom/releases -->
110129
<!-- https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/26.45.0/index.html -->
111130
<google-cloud-libraries-bom.version>26.45.0</google-cloud-libraries-bom.version>
112-
<guava.version>33.3.0-jre</guava.version>
113-
<hamcrest.version>3.0</hamcrest.version>
131+
<!-- versions from GCP bom -->
132+
<opencensus.version>0.31.1</opencensus.version>
133+
134+
<!-- other deps -->
135+
<bouncycastle.version>1.78.1</bouncycastle.version>
114136
<junit.version>4.13.2</junit.version>
115-
<jackson.version>2.17.2</jackson.version>
116137
<mysql.version>8.4.0</mysql.version>
117-
<netty.version>4.1.113.Final</netty.version>
118138
<postgresql.version>42.7.4</postgresql.version>
119-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
120-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
121-
<slf4j.version>2.0.16</slf4j.version>
122139
<socket-factory.version>1.18.0</socket-factory.version>
123140
</properties>
141+
124142
<dependencyManagement>
125143
<dependencies>
126144
<!-- overrides to resolve dependency conflicts - start-->
145+
<!-- from beam bom -->
127146
<dependency>
128-
<groupId>io.opencensus</groupId>
129-
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
130-
<version>0.31.1</version>
131-
</dependency>
132-
<dependency>
133-
<groupId>joda-time</groupId>
134-
<artifactId>joda-time</artifactId>
135-
<version>2.12.7</version>
147+
<groupId>org.apache.avro</groupId>
148+
<artifactId>avro</artifactId>
149+
<version>${avro.version}</version>
136150
</dependency>
137151
<dependency>
138-
<groupId>org.threeten</groupId>
139-
<artifactId>threetenbp</artifactId>
140-
<version>1.7.0</version>
152+
<groupId>com.fasterxml.jackson</groupId>
153+
<artifactId>jackson-bom</artifactId>
154+
<version>${jackson.version}</version>
155+
<scope>import</scope>
156+
<type>pom</type>
141157
</dependency>
142158
<dependency>
143-
<groupId>org.checkerframework</groupId>
144-
<artifactId>checker-qual</artifactId>
145-
<version>3.47.0</version>
159+
<groupId>com.github.luben</groupId>
160+
<artifactId>zstd-jni</artifactId>
161+
<version>${zstd-jni.version}</version>
146162
</dependency>
147163
<dependency>
148-
<groupId>org.apache.httpcomponents</groupId>
149-
<artifactId>httpcore</artifactId>
150-
<version>4.4.16</version>
164+
<groupId>com.google.auto.value</groupId>
165+
<artifactId>auto-value</artifactId>
166+
<version>${auto-value.version}</version>
167+
<scope>provided</scope>
151168
</dependency>
152169
<dependency>
153-
<groupId>org.apache.httpcomponents</groupId>
154-
<artifactId>httpclient</artifactId>
155-
<version>4.5.14</version>
170+
<groupId>com.google.auto.value</groupId>
171+
<artifactId>auto-value-annotations</artifactId>
172+
<version>${auto-value.version}</version>
156173
</dependency>
157174
<dependency>
158175
<groupId>com.google.errorprone</groupId>
159176
<artifactId>error_prone_annotations</artifactId>
160-
<version>2.32.0</version>
177+
<version>${errorprone.version}</version>
161178
</dependency>
162179
<dependency>
163-
<groupId>com.google.apis</groupId>
164-
<artifactId>google-api-services-storage</artifactId>
165-
<version>v1-rev20240809-2.0.0</version>
180+
<groupId>com.google.guava</groupId>
181+
<artifactId>guava-bom</artifactId>
182+
<version>${guava.version}</version>
183+
<scope>import</scope>
184+
<type>pom</type>
166185
</dependency>
167186
<dependency>
168187
<groupId>commons-codec</groupId>
169188
<artifactId>commons-codec</artifactId>
170-
<version>1.17.1</version>
189+
<version>${commons-codec.version}</version>
171190
</dependency>
172191
<dependency>
173-
<groupId>org.apache.commons</groupId>
174-
<artifactId>commons-compress</artifactId>
175-
<version>1.26.2</version>
192+
<groupId>joda-time</groupId>
193+
<artifactId>joda-time</artifactId>
194+
<version>${joda-time.version}</version>
176195
</dependency>
177196
<dependency>
178197
<groupId>org.apache.commons</groupId>
179-
<artifactId>commons-lang3</artifactId>
180-
<version>3.17.0</version>
198+
<artifactId>commons-compress</artifactId>
199+
<version>${commons-compress.version}</version>
181200
</dependency>
182201
<dependency>
183-
<groupId>net.bytebuddy</groupId>
184-
<artifactId>byte-buddy</artifactId>
185-
<version>1.15.1</version>
202+
<groupId>org.apache.httpcomponents</groupId>
203+
<artifactId>httpcore</artifactId>
204+
<version>${httpcore.version}</version>
186205
</dependency>
187-
<!-- overrides to resolve dependency conflicts - end-->
188-
<!-- overrides with vulnerability fixes - start-->
189206
<dependency>
190-
<groupId>org.xerial.snappy</groupId>
191-
<artifactId>snappy-java</artifactId>
192-
<version>1.1.10.7</version>
207+
<groupId>org.apache.httpcomponents</groupId>
208+
<artifactId>httpclient</artifactId>
209+
<version>${httpclient.version}</version>
193210
</dependency>
194211
<dependency>
195-
<groupId>org.bouncycastle</groupId>
196-
<artifactId>bcpkix-jdk18on</artifactId>
197-
<version>${bouncycastle.version}</version>
212+
<groupId>org.checkerframework</groupId>
213+
<artifactId>checker-qual</artifactId>
214+
<version>${checker-qual.version}</version>
198215
</dependency>
199216
<dependency>
200-
<groupId>org.bouncycastle</groupId>
201-
<artifactId>bcprov-jdk18on</artifactId>
202-
<version>${bouncycastle.version}</version>
217+
<groupId>org.slf4j</groupId>
218+
<artifactId>slf4j-api</artifactId>
219+
<version>${slf4j.version}</version>
203220
</dependency>
204221
<dependency>
205-
<groupId>com.google.guava</groupId>
206-
<artifactId>guava-bom</artifactId>
207-
<version>${guava.version}</version>
208-
<scope>import</scope>
209-
<type>pom</type>
222+
<groupId>org.slf4j</groupId>
223+
<artifactId>slf4j-jdk14</artifactId>
224+
<version>${slf4j.version}</version>
225+
<scope>runtime</scope>
210226
</dependency>
211-
<!-- overrides with vulnerability fixes - end-->
212227
<dependency>
213-
<groupId>com.google.apis</groupId>
214-
<artifactId>google-api-services-cloudkms</artifactId>
215-
<version>v1-rev20240314-2.0.0</version>
228+
<groupId>org.threeten</groupId>
229+
<artifactId>threetenbp</artifactId>
230+
<version>${threetenbp.version}</version>
216231
</dependency>
232+
<!-- from libraries-bom -->
217233
<dependency>
218-
<groupId>com.github.luben</groupId>
219-
<artifactId>zstd-jni</artifactId>
220-
<version>1.5.6-6</version>
234+
<groupId>io.opencensus</groupId>
235+
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
236+
<version>${opencensus.version}</version>
221237
</dependency>
238+
<!-- overrides to resolve dependency conflicts - end-->
239+
<!-- overrides with vulnerability fixes - start-->
240+
<!-- overrides with vulnerability fixes - end-->
222241
<dependency>
223-
<groupId>io.netty</groupId>
224-
<artifactId>netty-bom</artifactId>
225-
<version>${netty.version}</version>
226-
<scope>import</scope>
242+
<groupId>org.apache.beam</groupId>
243+
<artifactId>beam-sdks-java-bom</artifactId>
244+
<version>${beam.version}</version>
227245
<type>pom</type>
228-
</dependency>
229-
<dependency>
230-
<groupId>com.fasterxml.jackson</groupId>
231-
<artifactId>jackson-bom</artifactId>
232-
<version>${jackson.version}</version>
233246
<scope>import</scope>
234-
<type>pom</type>
235247
</dependency>
236248
<dependency>
237249
<groupId>com.google.cloud</groupId>
@@ -241,22 +253,16 @@
241253
<scope>import</scope>
242254
</dependency>
243255
<dependency>
244-
<groupId>org.slf4j</groupId>
245-
<artifactId>slf4j-api</artifactId>
246-
<version>${slf4j.version}</version>
247-
</dependency>
248-
<dependency>
249-
<groupId>org.slf4j</groupId>
250-
<artifactId>slf4j-jdk14</artifactId>
251-
<version>${slf4j.version}</version>
252-
<scope>runtime</scope>
256+
<groupId>io.netty</groupId>
257+
<artifactId>netty-bom</artifactId>
258+
<version>${netty.version}</version>
259+
<scope>import</scope>
260+
<type>pom</type>
253261
</dependency>
254262
<dependency>
255-
<groupId>org.apache.beam</groupId>
256-
<artifactId>beam-sdks-java-bom</artifactId>
257-
<version>${beam.version}</version>
258-
<type>pom</type>
259-
<scope>import</scope>
263+
<groupId>com.google.apis</groupId>
264+
<artifactId>google-api-services-cloudkms</artifactId>
265+
<version>v1-rev20240314-2.0.0</version>
260266
</dependency>
261267

262268
<!-- Runners -->
@@ -347,22 +353,6 @@
347353
</exclusion>
348354
</exclusions>
349355
</dependency>
350-
<dependency>
351-
<groupId>org.apache.avro</groupId>
352-
<artifactId>avro</artifactId>
353-
<version>${avro.version}</version>
354-
</dependency>
355-
<dependency>
356-
<groupId>com.google.auto.value</groupId>
357-
<artifactId>auto-value-annotations</artifactId>
358-
<version>${auto-value.version}</version>
359-
</dependency>
360-
<dependency>
361-
<groupId>com.google.auto.value</groupId>
362-
<artifactId>auto-value</artifactId>
363-
<version>${auto-value.version}</version>
364-
<scope>provided</scope>
365-
</dependency>
366356

367357
<!-- DB Deps -->
368358
<dependency>
@@ -396,7 +386,6 @@
396386
</dependency>
397387

398388
<!-- Test Deps -->
399-
400389
<dependency>
401390
<groupId>junit</groupId>
402391
<artifactId>junit</artifactId>
@@ -554,6 +543,32 @@
554543
<!-- Keep aligned with prerequisite section below. -->
555544
<version>[3.3.9,)</version>
556545
</requireMavenVersion>
546+
<requireUpperBoundDeps>
547+
<excludes>
548+
<!-- managed by beam BOM -->
549+
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
550+
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
551+
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
552+
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</exclude>
553+
<exclude>com.github.luben:zstd-jni</exclude>
554+
<exclude>com.google.auto.value:auto-value</exclude>
555+
<exclude>com.google.auto.value:auto-value-annotations</exclude>
556+
<exclude>com.google.errorprone:error_prone_annotations</exclude>
557+
<exclude>com.google.guava:guava</exclude>
558+
<exclude>commons-codec:commons-codec</exclude>
559+
<exclude>joda-time:joda-time</exclude>
560+
<exclude>org.apache.avro:avro</exclude>
561+
<exclude>org.apache.commons:commons-compress</exclude>
562+
<exclude>org.apache.httpcomponents:httpcore</exclude>
563+
<exclude>org.apache.httpcomponents:httpclient</exclude>
564+
<exclude>org.checkerframework:checker-qual</exclude>
565+
<exclude>org.slf4j:slf4j-api</exclude>
566+
<exclude>org.slf4j:slf4j-jdk14</exclude>
567+
<exclude>org.threeten:threetenbp</exclude>
568+
<!-- managed by libraries-bom -->
569+
<exclude>io.opencensus:opencensus-contrib-grpc-metrics</exclude>
570+
</excludes>
571+
</requireUpperBoundDeps>
557572
</rules>
558573
</configuration>
559574
</execution>
@@ -717,7 +732,7 @@
717732
</filter>
718733
</filters>
719734
<transformers>
720-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
735+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
721736
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
722737
<mainClass>com.spotify.dbeam.jobs.JdbcAvroJob</mainClass>
723738
</transformer>

0 commit comments

Comments
 (0)