fixing merge conflicts in pom.xml

GoogleCloudPlatform · Feb 12, 2025 · 55cee1e · 55cee1e
1 parent 21e8745
commit 55cee1e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/pom.xml b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/pom.xml
@@ -39,7 +39,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Dependency properties -->
-    <beam.version>2.34.0</beam.version>
+    <beam.version>2.62.0</beam.version>
     <gson.version>2.7</gson.version>
     <hamcrest.version>2.1</hamcrest.version>
     <java.version>1.8</java.version>
@@ -638,4 +638,4 @@
     </plugins>
   </reporting>
 
-</project>
+</project>
diff --git a/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml
@@ -32,7 +32,7 @@
     <name>ElasticIndexer</name>
 
     <properties>
-        <beam.version>2.8.0</beam.version>
+        <beam.version>2.62.0</beam.version>
         <protobuf.java.version>3.6.0</protobuf.java.version>
         <guava.version>25.1-jre</guava.version>
         <hbase.version>1.1.5</hbase.version>

diff --git a/examples/dataflow-examples/java/dataflow-xmlio-to-bq/pom.xml b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/pom.xml
@@ -32,27 +32,27 @@
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-sdks-java-core</artifactId>
-      <version>2.29.0</version>
+      <version>2.62.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-runners-google-cloud-dataflow-java</artifactId>
-      <version>2.29.0</version>
+      <version>2.62.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-sdks-java-io-google-cloud-platform</artifactId>
-      <version>2.29.0</version>
+      <version>2.62.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.2.0</version>
+      <version>2.20.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.2.0</version>
+      <version>2.20.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -145,4 +145,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
+</project>