This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch v3.0 in repository https://gitbox.apache.org/repos/asf/flink-connector-gcp-pubsub.git
The following commit(s) were added to refs/heads/v3.0 by this push: new cba42d8 [FLINK-32031] Flink GCP Connector having issues with Conscrypt library. This closes #17 cba42d8 is described below commit cba42d81fbe41fcf3687bf2bc243d912e9362ef6 Author: Jayadeep Jayaraman <53975210+jayadeep-jayara...@users.noreply.github.com> AuthorDate: Tue Jul 4 14:36:43 2023 +0530 [FLINK-32031] Flink GCP Connector having issues with Conscrypt library. This closes #17 --- .idea/vcs.xml | 28 +++++++ .../gcp/pubsub/emulator/PubsubHelper.java | 2 +- flink-connector-gcp-pubsub/pom.xml | 92 ++++++++++++++++++++-- pom.xml | 2 +- 4 files changed, 117 insertions(+), 7 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 4cd94a5..08d53b4 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -15,6 +15,34 @@ <option name="issueRegexp" value="#(\d+)" /> <option name="linkRegexp" value="https://github.com/apache/flink-connector-gcp-pubsub/pull/$1" /> </IssueNavigationLink> + <IssueNavigationLink> + <option name="issueRegexp" value="\bb/(\d+)(#\w+)?\b" /> + <option name="linkRegexp" value="https://buganizer.corp.google.com/issues/$1$2" /> + </IssueNavigationLink> + <IssueNavigationLink> + <option name="issueRegexp" value="\b(?:BUG=|FIXED=)(\d+)\b" /> + <option name="linkRegexp" value="https://buganizer.corp.google.com/issues/$1" /> + </IssueNavigationLink> + <IssueNavigationLink> + <option name="issueRegexp" value="\b(?:cl/|cr/|OCL=|DIFFBASE=|ROLLBACK_OF=)(\d+)\b" /> + <option name="linkRegexp" value="https://critique.corp.google.com/$1" /> + </IssueNavigationLink> + <IssueNavigationLink> + <option name="issueRegexp" value="\bomg/(\d+)\b" /> + <option name="linkRegexp" value="https://omg.corp.google.com/$1" /> + </IssueNavigationLink> + <IssueNavigationLink> + <option name="issueRegexp" value="\b(?:go/|goto/)([^,.<>()"\s]+(?:[.,][^,.<>()"\s]+)*)" /> + <option name="linkRegexp" value="https://goto.google.com/$1" /> + </IssueNavigationLink> + <IssueNavigationLink> + <option name="issueRegexp" value="\bcs/([^\s]+[\w$])" /> + <option name="linkRegexp" value="https://cs.corp.google.com/search/?q=$1" /> + </IssueNavigationLink> + <IssueNavigationLink> + <option name="issueRegexp" value="(LINT\.IfChange)|(LINT\.ThenChange)" /> + <option name="linkRegexp" value="https://goto.google.com/ifthisthenthatlint" /> + </IssueNavigationLink> </list> </option> </component> diff --git a/flink-connector-gcp-pubsub-e2e-tests/src/test/java/org/apache/flink/streaming/connectors/gcp/pubsub/emulator/PubsubHelper.java b/flink-connector-gcp-pubsub-e2e-tests/src/test/java/org/apache/flink/streaming/connectors/gcp/pubsub/emulator/PubsubHelper.java index 9604601..99ce120 100644 --- a/flink-connector-gcp-pubsub-e2e-tests/src/test/java/org/apache/flink/streaming/connectors/gcp/pubsub/emulator/PubsubHelper.java +++ b/flink-connector-gcp-pubsub-e2e-tests/src/test/java/org/apache/flink/streaming/connectors/gcp/pubsub/emulator/PubsubHelper.java @@ -94,7 +94,7 @@ public class PubsubHelper { LOG.info("DeleteTopic {} first delete old subscriptions.", topicName); adminClient .listTopicSubscriptions(topicName) - .iterateAllAsProjectSubscriptionName() + .iterateAll() .forEach(subscriptionAdminClient::deleteSubscription); LOG.info("DeleteTopic {}", topicName); adminClient.deleteTopic(topicName); diff --git a/flink-connector-gcp-pubsub/pom.xml b/flink-connector-gcp-pubsub/pom.xml index 7288619..9232fd5 100644 --- a/flink-connector-gcp-pubsub/pom.xml +++ b/flink-connector-gcp-pubsub/pom.xml @@ -33,11 +33,6 @@ under the License. <name>Flink : Connectors : Google PubSub</name> <packaging>jar</packaging> - - <properties> - <google-cloud-libraries-bom.version>8.1.0</google-cloud-libraries-bom.version> - </properties> - <dependencyManagement> <dependencies> <dependency> @@ -93,6 +88,93 @@ under the License. <scope>test</scope> </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-auth</artifactId> + <!-- Version is pulled from google-cloud-bom (loaded via the libraries-bom) --> + </dependency> + + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty</artifactId> + <!-- Version is pulled from google-cloud-bom (loaded via the libraries-bom) --> + </dependency> + + <!-- For dependency convergence --> + <dependency> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-core</artifactId> + <exclusions> + <exclusion> + <groupId>com.google.api</groupId> + <artifactId>gax</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- For dependency convergence --> + <dependency> + <groupId>com.google.api</groupId> + <artifactId>gax</artifactId> + <version>2.18.7</version> + <exclusions> + <exclusion> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- For dependency convergence --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>31.1-jre</version> + <exclusions> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- For dependency convergence --> + <dependency> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client</artifactId> + <version>1.42.2</version> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- For dependency convergence --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.13</version> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty-shaded</artifactId> + <!-- Version is pulled from google-cloud-bom (loaded via the libraries-bom) --> + </dependency> <!-- ArchUit test dependencies --> <dependency> diff --git a/pom.xml b/pom.xml index 714aba0..7f4ab48 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ under the License. <properties> <flink.version>1.16.0</flink.version> - + <google-cloud-libraries-bom.version>26.1.0</google-cloud-libraries-bom.version> <junit5.version>5.8.1</junit5.version> <assertj.version>3.23.1</assertj.version> <testcontainers.version>1.17.2</testcontainers.version>