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-pulsar.git
commit 67d2a6ebe35d1813fa4e274c1b13e4297bc28967
Author: Martijn Visser <martijnvis...@apache.org>
AuthorDate: Thu Dec 8 10:10:54 2022 +0100
[FLINK-30336][Connector/Pulsar] Sync missing Pulsar e2e tests to external
repo
---
flink-connector-pulsar-e2e-tests/pom.xml | 80 +++++++++++++++++++++++++++-----
flink-connector-pulsar/pom.xml | 1 -
pom.xml | 2 +
3 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/flink-connector-pulsar-e2e-tests/pom.xml
b/flink-connector-pulsar-e2e-tests/pom.xml
index a5c9c7c..7a6e6ce 100644
--- a/flink-connector-pulsar-e2e-tests/pom.xml
+++ b/flink-connector-pulsar-e2e-tests/pom.xml
@@ -21,9 +21,9 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
- <version>1.16-SNAPSHOT</version>
+ <artifactId>flink-connector-pulsar-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,21 +31,15 @@ under the License.
<name>Flink : E2E Tests : Pulsar</name>
<properties>
- <pulsar.version>2.10.1</pulsar.version>
- <bouncycastle.version>1.69</bouncycastle.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
+ <japicmp.skip>true</japicmp.skip>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-end-to-end-tests-common</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-test-utils</artifactId>
- <version>${project.version}</version>
+ <version>${flink.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
@@ -63,7 +57,7 @@ under the License.
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.api.version}</version>
+ <version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -77,12 +71,74 @@ under the License.
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>run-end-to-end-tests</id>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>end-to-end-tests</id>
+
<phase>integration-test</phase>
+ <goals>
+
<goal>test</goal>
+ </goals>
+ <configuration>
+
<includes>
+
<include>**/*.*</include>
+
</includes>
+
<excludedGroups>${excludeE2E}</excludedGroups>
+
<systemPropertyVariables>
+
<moduleDir>${project.basedir}</moduleDir>
+
</systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>java11</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <properties>
+
<excludeE2E>org.apache.flink.testutils.junit.FailsOnJava11</excludeE2E>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>integration-tests</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -100,7 +156,7 @@ under the License.
<artifactItem>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-test-utils</artifactId>
-
<version>${project.version}</version>
+
<version>${flink.version}</version>
<destFileName>flink-connector-testing.jar</destFileName>
<type>jar</type>
<outputDirectory>${project.build.directory}/dependencies
diff --git a/flink-connector-pulsar/pom.xml b/flink-connector-pulsar/pom.xml
index 30c0a1b..866b07f 100644
--- a/flink-connector-pulsar/pom.xml
+++ b/flink-connector-pulsar/pom.xml
@@ -35,7 +35,6 @@ under the License.
<packaging>jar</packaging>
<properties>
- <pulsar.version>2.10.1</pulsar.version>
<protoc.version>3.21.7</protoc.version>
<!-- Test Libraries -->
diff --git a/pom.xml b/pom.xml
index 2fca0a9..47833a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,10 +45,12 @@ under the License.
<modules>
<module>flink-connector-pulsar</module>
<module>flink-sql-connector-pulsar</module>
+ <module>flink-connector-pulsar-e2e-tests</module>
</modules>
<properties>
<flink.version>1.16.0</flink.version>
+ <pulsar.version>2.10.1</pulsar.version>
<jackson-bom.version>2.13.4.20221013</jackson-bom.version>
<grpc-bom.version>1.45.1</grpc-bom.version>
