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-pulsar.git
commit 704ef1f5a93c19107fb8a8cb51f843ce07256fb5 Author: Yufan Sheng <yu...@streamnative.io> AuthorDate: Wed Feb 9 13:00:53 2022 +0800 [FLINK-24246][connector/pulsar] Bump PulsarClient version to latest 2.9.1 1. Bump the pulsar-client-all version in pom file. 2. Exclude useless dependencies for pulsar-client-all. 3. Bump the Pulsar docker version. 4. Change the dependencies to pass the tests. 5. Drop PulsarTransactionUtils and fix compile issues in tests. 6. Add bouncycastle to Pulsar e2e tests. --- flink-connector-pulsar-e2e-tests/pom.xml | 43 +++++++++++++++++++++- .../FlinkContainerWithPulsarEnvironment.java | 5 +++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/flink-connector-pulsar-e2e-tests/pom.xml b/flink-connector-pulsar-e2e-tests/pom.xml index e7caf8b..7c87ec7 100644 --- a/flink-connector-pulsar-e2e-tests/pom.xml +++ b/flink-connector-pulsar-e2e-tests/pom.xml @@ -31,7 +31,8 @@ under the License. <name>Flink : E2E Tests : Pulsar</name> <properties> - <pulsar.version>2.8.0</pulsar.version> + <pulsar.version>2.9.1</pulsar.version> + <bouncycastle.version>1.69</bouncycastle.version> </properties> <dependencies> @@ -105,6 +106,46 @@ under the License. <type>jar</type> <outputDirectory>${project.build.directory}/dependencies</outputDirectory> </artifactItem> + <dependency> + <groupId>org.apache.pulsar</groupId> + <artifactId>bouncy-castle-bc</artifactId> + <version>${pulsar.version}</version> + <destFileName>bouncy-castle-bc.jar</destFileName> + <type>jar</type> + <outputDirectory>${project.build.directory}/dependencies</outputDirectory> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + <destFileName>bcpkix-jdk15on.jar</destFileName> + <type>jar</type> + <outputDirectory>${project.build.directory}/dependencies</outputDirectory> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + <destFileName>bcprov-jdk15on.jar</destFileName> + <type>jar</type> + <outputDirectory>${project.build.directory}/dependencies</outputDirectory> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + <destFileName>bcutil-jdk15on.jar</destFileName> + <type>jar</type> + <outputDirectory>${project.build.directory}/dependencies</outputDirectory> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-ext-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + <destFileName>bcprov-ext-jdk15on.jar</destFileName> + <type>jar</type> + <outputDirectory>${project.build.directory}/dependencies</outputDirectory> + </dependency> <artifactItem> <groupId>org.slf4j</groupId> <artifactId>jul-to-slf4j</artifactId> diff --git a/flink-connector-pulsar-e2e-tests/src/test/java/org/apache/flink/tests/util/pulsar/common/FlinkContainerWithPulsarEnvironment.java b/flink-connector-pulsar-e2e-tests/src/test/java/org/apache/flink/tests/util/pulsar/common/FlinkContainerWithPulsarEnvironment.java index 52957fc..ccfe277 100644 --- a/flink-connector-pulsar-e2e-tests/src/test/java/org/apache/flink/tests/util/pulsar/common/FlinkContainerWithPulsarEnvironment.java +++ b/flink-connector-pulsar-e2e-tests/src/test/java/org/apache/flink/tests/util/pulsar/common/FlinkContainerWithPulsarEnvironment.java @@ -37,6 +37,11 @@ public class FlinkContainerWithPulsarEnvironment extends FlinkContainerTestEnvir resourcePath("pulsar-client-all.jar"), resourcePath("pulsar-client-api.jar"), resourcePath("pulsar-admin-api.jar"), + resourcePath("bouncy-castle-bc.jar"), + resourcePath("bcpkix-jdk15on.jar"), + resourcePath("bcprov-jdk15on.jar"), + resourcePath("bcutil-jdk15on.jar"), + resourcePath("bcprov-ext-jdk15on.jar"), resourcePath("jul-to-slf4j.jar")); }