From 69106fe309040bc24f2af4c70dfddb602963f365 Mon Sep 17 00:00:00 2001
From: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com>
Date: Wed, 28 Jul 2021 10:35:34 -0400
Subject: [PATCH] deps: define Beam version as a Maven property in pom (#714)

* deps: bump maven version and remove explicit version override for fmt and dependency plugins which are present in the base configuration

* fix: dep scoping

* Set version on old snippets to 2.29.0

2.30.0 won't work with the I/O not built with that version. Lower versions will work.

Co-authored-by: Tianzi Cai <tianzi@google.com>
---
 pubsublite-beam-io/pom.xml |  9 ++++++---
 samples/snapshot/pom.xml   |  5 +++--
 samples/snippets/pom.xml   | 15 ++++++++-------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/pubsublite-beam-io/pom.xml b/pubsublite-beam-io/pom.xml
index 73075c76e..635f58169 100644
--- a/pubsublite-beam-io/pom.xml
+++ b/pubsublite-beam-io/pom.xml
@@ -16,6 +16,9 @@
   <name>Pub/Sub Lite IO</name>
   <url>https://github.com/googleapis/java-pubsublite</url>
   <description>Beam IO for Google Cloud Pub/Sub Lite</description>
+  <properties>
+    <beam.version>2.30.0</beam.version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>com.google.cloud</groupId>
@@ -85,12 +88,12 @@
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-sdks-java-core</artifactId>
-      <version>2.29.0</version>
+      <version>${beam.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-sdks-java-extensions-protobuf</artifactId>
-      <version>2.29.0</version>
+      <version>${beam.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.flogger</groupId>
@@ -124,7 +127,7 @@
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-runners-direct-java</artifactId>
-      <version>2.29.0</version>
+      <version>${beam.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index c75616037..8929fdee2 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -38,6 +38,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <beam.version>2.30.0</beam.version>
   </properties>
 
   <dependencies>
@@ -63,7 +64,7 @@
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-model-pipeline</artifactId>
-      <version>2.29.0</version>
+      <version>${beam.version}</version>
     </dependency>
 
     <dependency>
@@ -81,7 +82,7 @@
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-runners-direct-java</artifactId>
-      <version>2.29.0</version>
+      <version>${beam.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index daf04541b..dc9fc7650 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -38,6 +38,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <beam.version>2.29.0</beam.version>
   </properties>
 
   <dependencies>
@@ -55,17 +56,17 @@
     </dependency>
     <!-- [END pubsublite_java_dependencies] -->
     <!-- [END pubsublite_install_without_bom] -->
-    
+
+    <dependency>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>beam-model-pipeline</artifactId>
+      <version>${beam.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>pubsublite-beam-io</artifactId>
       <version>0.16.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>beam-model-pipeline</artifactId>
-      <version>2.29.0</version>
-    </dependency>
 
     <dependency>
       <groupId>junit</groupId>
@@ -82,7 +83,7 @@
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-runners-direct-java</artifactId>
-      <version>2.29.0</version>
+      <version>${beam.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>