Skip to content

Commit

Permalink
Merge pull request #4342 from bamaer/4314
Browse files Browse the repository at this point in the history
initial beam upgrade, ITs WiP. #4314
  • Loading branch information
hansva authored Sep 23, 2024
2 parents 4fb9647 + bdc806c commit d0cb0de
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bin
routes.yml
*.tgf
.vscode
.swp
*.swp

rebel.xml
rebel-remote.xml
Expand Down Expand Up @@ -57,4 +57,4 @@ integration-tests/json/output
integration-tests/mdi/files/excelwriter-mdi-test.xlsx
integration-tests/spreadsheet/files/sample-file-append.xlsx

assemblies/debug/audit
assemblies/debug/audit
9 changes: 7 additions & 2 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,20 @@
<google-cloud-storage.version>2.15.0</google-cloud-storage.version>
<google-http-client.version>1.42.3</google-http-client.version>
<google-oauth-client.version>1.34.1</google-oauth-client.version>
<!--check Beam BOM to find matching version https://repo1.maven.org/maven2/org/apache/beam/beam-runners-google-cloud-dataflow-java/xxx/beam-runners-google-cloud-dataflow-java-xxx.pom
Replace exclusions beam-vendor-guava-xxx-jre-->
<grpc.version>1.60.1</grpc.version>
<gson.version>2.10</gson.version>
<guava.version>32.1.2-jre</guava.version>
<!--check Beam BOM to find matching version https://repo1.maven.org/maven2/org/apache/beam/beam-runners-google-cloud-dataflow-java/xxx/beam-runners-google-cloud-dataflow-java-xxx.pom
Replace exclusions beam-vendor-guava-xxx-jre-->
<guava.version>33.1.0-jre</guava.version>
<hive.version>2.3.9</hive.version>
<httpccore.version>4.4.15</httpccore.version>
<httpclient.version>4.5.13</httpclient.version>
<httpclient5.version>5.3.1</httpclient5.version>
<jackcess.version>4.0.4</jackcess.version>
<jackson.version>2.15.0</jackson.version>
<!--check Beam BOM to find matching version https://repo1.maven.org/maven2/org/apache/beam/beam-runners-google-cloud-dataflow-java/xxx/beam-runners-google-cloud-dataflow-java-xxx.pom -->
<jackson.version>2.15.4</jackson.version>
<jakarta-mail.version>2.0.1</jakarta-mail.version>
<jakarta.version>3.1.0</jakarta.version>
<javassist.version>3.28.0-GA</javassist.version>
Expand Down
18 changes: 9 additions & 9 deletions plugins/engines/beam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -235,7 +235,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -329,7 +329,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
Expand Down Expand Up @@ -387,7 +387,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -443,7 +443,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -609,7 +609,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -721,7 +721,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -771,7 +771,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -805,7 +805,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.beam</groupId>
<artifactId>beam-vendor-guava-32_1_2-jre</artifactId>
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ public abstract class BeamPipelineEngine extends Variables

static MetricResults EMPTY_METRIC_RESULTS =
new DefaultMetricResults(
Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
Collections.emptyList(),
Collections.emptyList(),
Collections.emptyList(),
Collections.emptyList());

/**
* Constant specifying a filename containing XML to inject into a ZIP file created during resource
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</distributionManagement>

<properties>
<apache-beam.version>2.56.0</apache-beam.version>
<apache-beam.version>2.59.0</apache-beam.version>
<assembly_appendId>false</assembly_appendId>
<assembly_package-phase>package</assembly_package-phase>
<attach-sources-phase>verify</attach-sources-phase>
Expand Down

0 comments on commit d0cb0de

Please sign in to comment.