Skip to content

Commit

Permalink
deps: define Beam version as a Maven property in pom (#714)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
dpcollins-google and anguillanneuf committed Jul 28, 2021
1 parent a46ee38 commit 69106fe
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
9 changes: 6 additions & 3 deletions pubsublite-beam-io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions samples/snapshot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
15 changes: 8 additions & 7 deletions samples/snippets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 69106fe

Please sign in to comment.