This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-gcp-pubsub.git
commit 7d8090b72ffb75727d877534d670a52e3eaa039b Author: Martijn Visser <martijnvis...@apache.org> AuthorDate: Wed Feb 1 19:34:12 2023 +0100 [FLINK-30872][Connector/Google PubSub] Move GCP example to GCP connector repository --- flink-connector-gcp-pubsub/pom.xml | 17 ----------------- flink-examples-streaming-gcp-pubsub/pom.xml | 16 ++++++++++------ pom.xml | 11 +++++++++++ 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/flink-connector-gcp-pubsub/pom.xml b/flink-connector-gcp-pubsub/pom.xml index 7288619..1bd75b5 100644 --- a/flink-connector-gcp-pubsub/pom.xml +++ b/flink-connector-gcp-pubsub/pom.xml @@ -34,23 +34,6 @@ under the License. <packaging>jar</packaging> - <properties> - <google-cloud-libraries-bom.version>8.1.0</google-cloud-libraries-bom.version> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <!-- This is the way we get a consistent set of versions of the Google tools --> - <groupId>com.google.cloud</groupId> - <artifactId>libraries-bom</artifactId> - <version>${google-cloud-libraries-bom.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.flink</groupId> diff --git a/flink-examples-streaming-gcp-pubsub/pom.xml b/flink-examples-streaming-gcp-pubsub/pom.xml index 8720ed9..d66e489 100644 --- a/flink-examples-streaming-gcp-pubsub/pom.xml +++ b/flink-examples-streaming-gcp-pubsub/pom.xml @@ -22,15 +22,19 @@ under the License. <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>flink-examples-build-helper</artifactId> <groupId>org.apache.flink</groupId> - <version>1.17-SNAPSHOT</version> + <artifactId>flink-connector-gcp-pubsub-parent</artifactId> + <version>3.0-SNAPSHOT</version> </parent> - <artifactId>flink-examples-streaming-gcp-pubsub_${scala.binary.version}</artifactId> - <name>Flink : Examples : Build Helper : Streaming Google PubSub</name> + <artifactId>flink-examples-streaming-gcp-pubsub</artifactId> + <name>Flink : Examples : Streaming Google PubSub</name> <packaging>jar</packaging> + <properties> + <japicmp.skip>true</japicmp.skip> + </properties> + <dependencies> <dependency> <groupId>org.apache.flink</groupId> @@ -39,8 +43,8 @@ under the License. </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples-streaming_${scala.binary.version}</artifactId> - <version>${project.version}</version> + <artifactId>flink-streaming-java</artifactId> + <version>${flink.version}</version> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 5ca7403..5addf92 100644 --- a/pom.xml +++ b/pom.xml @@ -45,10 +45,12 @@ under the License. <modules> <module>flink-connector-gcp-pubsub</module> <module>flink-connector-gcp-pubsub-e2e-tests</module> + <module>flink-examples-streaming-gcp-pubsub</module> </modules> <properties> <flink.version>1.16.0</flink.version> + <google-cloud-libraries-bom.version>8.1.0</google-cloud-libraries-bom.version> <junit5.version>5.8.1</junit5.version> <assertj.version>3.23.1</assertj.version> @@ -321,6 +323,15 @@ under the License. <version>2.6</version> </dependency> + <dependency> + <!-- This is the way we get a consistent set of versions of the Google tools --> + <groupId>com.google.cloud</groupId> + <artifactId>libraries-bom</artifactId> + <version>${google-cloud-libraries-bom.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement>