Skip to content

Commit fc106a7

Browse files
authored
deps: upgrade beam to 2.43.0 (#3857)
* deps: update veneer to 2.15.1 * deps: update veneer to 2.16.0 * fix deps, beam integration, and integration migration builds * deps: upgrade beam.version to 2.42.0 * fix dependency build * update storage version * beam 2.43.0
1 parent a454aee commit fc106a7

File tree

4 files changed

+34
-14
lines changed

4 files changed

+34
-14
lines changed

bigtable-dataflow-parent/bigtable-beam-import/pom.xml

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,15 @@ limitations under the License.
9090
<groupId>org.hamcrest</groupId>
9191
<artifactId>hamcrest</artifactId>
9292
</exclusion>
93-
<exclusion>
94-
<groupId>org.hamcrest</groupId>
95-
<artifactId>hamcrest</artifactId>
96-
</exclusion>
93+
<exclusion>
94+
<groupId>org.hamcrest</groupId>
95+
<artifactId>hamcrest</artifactId>
96+
</exclusion>
97+
<exclusion>
98+
<!-- transitively brought in by bigquery dependency, use the bigtable version of autovalue instead-->
99+
<groupId>com.google.auto.value</groupId>
100+
<artifactId>auto-value</artifactId>
101+
</exclusion>
97102
</exclusions>
98103
</dependency>
99104
<dependency>
@@ -204,7 +209,7 @@ limitations under the License.
204209
<dependency>
205210
<groupId>com.google.apis</groupId>
206211
<artifactId>google-api-services-storage</artifactId>
207-
<version>v1-rev20210127-1.31.0</version>
212+
<version>v1-rev20220705-2.0.0</version>
208213
</dependency>
209214
<dependency>
210215
<groupId>com.google.code.findbugs</groupId>
@@ -235,12 +240,6 @@ limitations under the License.
235240

236241

237242
<!-- CVE Group: force update transitive deps to exclude CVEs -->
238-
<dependency>
239-
<groupId>commons-codec</groupId>
240-
<artifactId>commons-codec</artifactId>
241-
<version>1.15</version>
242-
<scope>runtime</scope>
243-
</dependency>
244243
<dependency>
245244
<groupId>org.apache.commons</groupId>
246245
<artifactId>commons-compress</artifactId>
@@ -466,6 +465,23 @@ limitations under the License.
466465
</execution>
467466
</executions>
468467
</plugin>
468+
<plugin>
469+
<groupId>org.apache.maven.plugins</groupId>
470+
<artifactId>maven-dependency-plugin</artifactId>
471+
<configuration>
472+
<ignoredUnusedDeclaredDependencies>
473+
<ignoredUnusedDeclaredDependency>com.google.cloud.bigdataoss:gcs-connector:*:*</ignoredUnusedDeclaredDependency>
474+
<!-- seems to be a bug in the dependency analyzer, removing this dep reports the reverse problem
475+
See: https://issues.apache.org/jira/browse/MDEP-679 -->
476+
<ignoredUnusedDeclaredDependency> commons-logging:commons-logging:*:*</ignoredUnusedDeclaredDependency>
477+
</ignoredUnusedDeclaredDependencies>
478+
<ignoredUsedUndeclaredDependencies>
479+
<!-- seems to be a bug in the dependency analyzer, adding this dep reports the reverse problem
480+
See: https://issues.apache.org/jira/browse/MDEP-679 -->
481+
<ignoredUsedUndeclaredDependency>org.springframework:spring-jcl:*:*</ignoredUsedUndeclaredDependency>
482+
</ignoredUsedUndeclaredDependencies>
483+
</configuration>
484+
</plugin>
469485
</plugins>
470486
</build>
471487

bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ limitations under the License.
3333
<dependency>
3434
<groupId>com.google.errorprone</groupId>
3535
<artifactId>error_prone_annotations</artifactId>
36-
<version>2.13.1</version>
36+
<version>2.14.0</version>
3737
</dependency>
3838
</dependencies>
3939
</dependencyManagement>

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ limitations under the License.
7979
<junit-vintage-engine.version>5.9.1</junit-vintage-engine.version>
8080
<hamcrest.version>1.3</hamcrest.version>
8181
<mockito.version>4.9.0</mockito.version>
82-
<!-- TODO: check if commons-codec was transitively updated to 1.13 and okhttp was updated to 2.7.5 when upgrading-->
83-
<beam.version>2.35.0</beam.version>
82+
<beam.version>2.43.0</beam.version>
8483
<!-- referred from bigtable-beam-import and bigtable-emulator -->
8584
<guava.version>31.1-jre</guava.version>
8685
<gcs-guava.version>29.0-jre</gcs-guava.version>

renovate.json5

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@
9090
"packagePatterns": ["^grpc-conscrypt.version"],
9191
"enabled": false
9292
},
93+
{
94+
// pinned to avoid internal deps conflict between beam-sdks-java-core & beam-model-pipeline
95+
"packagePatterns": ["^error_prone_annotations"],
96+
"enabled": false
97+
},
9398
{
9499
"packagePatterns": [
95100
"^org.apache.maven.plugins:maven-shade-plugin"

0 commit comments

Comments
 (0)