You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bahir.apache.org by es...@apache.org on 2022/07/17 11:53:46 UTC
[bahir-flink] branch BAHIR-308 created (now 764dafb)
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a change to branch BAHIR-308
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
at 764dafb [BAHIR-308] Bump flink version to 1.15.1
This branch includes the following new commits:
new a5f2385 [BAHIR-308] Remove support for scala 2.11
new 764dafb [BAHIR-308] Bump flink version to 1.15.1
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[bahir-flink] 01/02: [BAHIR-308] Remove support for scala 2.11
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a commit to branch BAHIR-308
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit a5f2385e6513503bfe63600fa020131d60802797
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Wed Jul 6 16:42:06 2022 +0200
[BAHIR-308] Remove support for scala 2.11
---
.github/workflows/maven-ci.yml | 2 +-
.travis.yml | 1 -
dev/change-scala-version.sh | 2 +-
dev/release-build.sh | 10 ++-------
distribution/pom.xml | 6 +++---
flink-connector-activemq/pom.xml | 4 ++--
flink-connector-akka/pom.xml | 4 ++--
flink-connector-flume/pom.xml | 4 ++--
flink-connector-influxdb/pom.xml | 4 ++--
flink-connector-influxdb2/pom.xml | 4 ++--
flink-connector-kudu/pom.xml | 4 ++--
flink-connector-netty/pom.xml | 4 ++--
flink-connector-pinot/pom.xml | 4 ++--
flink-connector-redis/pom.xml | 4 ++--
flink-library-siddhi/pom.xml | 4 ++--
pom.xml | 44 +++------------------------------------
16 files changed, 30 insertions(+), 75 deletions(-)
diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
index e063fa4..cc42ad2 100644
--- a/.github/workflows/maven-ci.yml
+++ b/.github/workflows/maven-ci.yml
@@ -31,7 +31,7 @@ jobs:
matrix:
java: ['8', '11']
flink-version: ['1.14.4']
- scala-version: ['2.11', '2.12']
+ scala-version: ['2.12']
steps:
- uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
index e414766..17985fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,6 @@ jdk:
- openjdk8
env:
- - FLINK_VERSION="1.14.4" SCALA_VERSION="2.11"
- FLINK_VERSION="1.14.4" SCALA_VERSION="2.12"
before_install:
diff --git a/dev/change-scala-version.sh b/dev/change-scala-version.sh
index a467950..f76d8a5 100755
--- a/dev/change-scala-version.sh
+++ b/dev/change-scala-version.sh
@@ -18,7 +18,7 @@
set -e
-VALID_VERSIONS=( 2.11 2.12 )
+VALID_VERSIONS=( 2.12 )
usage() {
echo "Usage: $(basename $0) [-h|--help] <version>
diff --git a/dev/release-build.sh b/dev/release-build.sh
index 3c03e88..0b1a770 100755
--- a/dev/release-build.sh
+++ b/dev/release-build.sh
@@ -38,11 +38,11 @@ to the staging release location.
--release-publish --gitCommitHash="a874b73"
Publish the maven artifacts of a release to the Apache staging maven repository.
-Note that this will publish both Scala 2.11 and 2.12 artifacts.
+Note that this will publish Scala 2.12 artifacts.
--release-snapshot [--gitCommitHash="a874b73"]
Publish the maven snapshot artifacts to Apache snapshots maven repository
-Note that this will publish both Scala 2.11 and 2.12 artifacts.
+Note that this will publish Scala 2.12 artifacts.
OPTIONS
@@ -297,9 +297,6 @@ if [[ "$RELEASE_PUBLISH" == "true" ]]; then
checkout_code
cd target/bahir-flink
- #Deploy default scala 2.11
- mvn $PUBLISH_PROFILES -DaltDeploymentRepository=apache.releases.https::default::https://repository.apache.org/service/local/staging/deploy/maven2 clean package gpg:sign install:install deploy:deploy -DskipTests -Pscala-2.11 -Darguments="-DskipTests" -Dgpg.passphrase=$GPG_PASSPHRASE
-
mvn clean
#Deploy scala 2.12
@@ -329,9 +326,6 @@ if [[ "$RELEASE_SNAPSHOT" == "true" ]]; then
exit 1
fi
- #Deploy default scala 2.11
- $MVN $PUBLISH_PROFILES -DaltDeploymentRepository=apache.snapshots.https::default::https://repository.apache.org/content/repositories/snapshots clean package gpg:sign install:install deploy:deploy -DskipTests -Darguments="-DskipTests" -Pscala-2.11 -Dgpg.passphrase=$GPG_PASSPHRASE
-
#Deploy scala 2.12
./dev/change-scala-version.sh 2.12
$MVN $PUBLISH_PROFILES -DaltDeploymentRepository=apache.snapshots.https::default::https://repository.apache.org/content/repositories/snapshots clean package gpg:sign install:install deploy:deploy -DskipTests -Darguments="-DskipTests" -Pscala-2.12 -Dgpg.passphrase=$GPG_PASSPHRASE
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 14035e8..c8ac4ee 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,13 +20,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
+ <version>1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-assembly_2.11</artifactId>
+ <artifactId>bahir-flink-assembly_2.12</artifactId>
<packaging>pom</packaging>
<name>Apache Bahir - Flink Extensions Distribution</name>
<url>http://bahir.apache.org/</url>
diff --git a/flink-connector-activemq/pom.xml b/flink-connector-activemq/pom.xml
index 9522816..f70e158 100644
--- a/flink-connector-activemq/pom.xml
+++ b/flink-connector-activemq/pom.xml
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-activemq_2.11</artifactId>
+ <artifactId>flink-connector-activemq_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-activemq</name>
diff --git a/flink-connector-akka/pom.xml b/flink-connector-akka/pom.xml
index 1b1dd46..b929dce 100644
--- a/flink-connector-akka/pom.xml
+++ b/flink-connector-akka/pom.xml
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>flink-connector-akka_2.11</artifactId>
+ <artifactId>flink-connector-akka_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-akka</name>
<url>http://bahir.apache.org/</url>
diff --git a/flink-connector-flume/pom.xml b/flink-connector-flume/pom.xml
index 92f4b91..e900aac 100644
--- a/flink-connector-flume/pom.xml
+++ b/flink-connector-flume/pom.xml
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>flink-connector-flume_2.11</artifactId>
+ <artifactId>flink-connector-flume_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-flume</name>
diff --git a/flink-connector-influxdb/pom.xml b/flink-connector-influxdb/pom.xml
index af5e4b1..c272e85 100644
--- a/flink-connector-influxdb/pom.xml
+++ b/flink-connector-influxdb/pom.xml
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>flink-connector-influxdb_2.11</artifactId>
+ <artifactId>flink-connector-influxdb_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-influxdb</name>
diff --git a/flink-connector-influxdb2/pom.xml b/flink-connector-influxdb2/pom.xml
index 3458790..74c8fd1 100644
--- a/flink-connector-influxdb2/pom.xml
+++ b/flink-connector-influxdb2/pom.xml
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>flink-connector-influxdb2_2.11</artifactId>
+ <artifactId>flink-connector-influxdb2_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-influxdb2</name>
diff --git a/flink-connector-kudu/pom.xml b/flink-connector-kudu/pom.xml
index fd485d5..20b16b4 100644
--- a/flink-connector-kudu/pom.xml
+++ b/flink-connector-kudu/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>flink-connector-kudu_2.11</artifactId>
+ <artifactId>flink-connector-kudu_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-kudu</name>
diff --git a/flink-connector-netty/pom.xml b/flink-connector-netty/pom.xml
index 344477f..6f76037 100644
--- a/flink-connector-netty/pom.xml
+++ b/flink-connector-netty/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-netty_2.11</artifactId>
+ <artifactId>flink-connector-netty_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-netty</name>
diff --git a/flink-connector-pinot/pom.xml b/flink-connector-pinot/pom.xml
index 5584aed..670504a 100644
--- a/flink-connector-pinot/pom.xml
+++ b/flink-connector-pinot/pom.xml
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-pinot_2.11</artifactId>
+ <artifactId>flink-connector-pinot_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-pinot</name>
diff --git a/flink-connector-redis/pom.xml b/flink-connector-redis/pom.xml
index d7d67de..7e5b592 100644
--- a/flink-connector-redis/pom.xml
+++ b/flink-connector-redis/pom.xml
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-redis_2.11</artifactId>
+ <artifactId>flink-connector-redis_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-connector-redis</name>
diff --git a/flink-library-siddhi/pom.xml b/flink-library-siddhi/pom.xml
index 96089f9..33dca44 100644
--- a/flink-library-siddhi/pom.xml
+++ b/flink-library-siddhi/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>flink-library-siddhi_2.11</artifactId>
+ <artifactId>flink-library-siddhi_2.12</artifactId>
<packaging>jar</packaging>
<name>flink-library-siddhi</name>
diff --git a/pom.xml b/pom.xml
index fd63fd6..51b6cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<version>24</version>
</parent>
<groupId>org.apache.bahir</groupId>
- <artifactId>bahir-flink-parent_2.11</artifactId>
+ <artifactId>bahir-flink-parent_2.12</artifactId>
<version>1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Bahir for Apache Flink - Parent POM</name>
@@ -114,8 +114,8 @@
<!-- Flink version -->
<flink.version>1.14.4</flink.version>
- <scala.binary.version>2.11</scala.binary.version>
- <scala.version>2.11.12</scala.version>
+ <scala.binary.version>2.12</scala.binary.version>
+ <scala.version>2.12.8</scala.version>
<!-- General dependencies version -->
<log4j.version>2.17.1</log4j.version>
@@ -834,44 +834,6 @@
<module>distribution</module>
</modules>
</profile>
- <profile>
- <id>scala-2.11</id>
- <activation>
- <property>
- <name>scala-2.11</name>
- </property>
- </activation>
- <properties>
- <scala.version>2.11.12</scala.version>
- <scala.binary.version>2.11</scala.binary.version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <bannedDependencies>
- <excludes combine.children="append">
- <exclude>*:*_2.10</exclude>
- <exclude>*:*_2.12</exclude>
- </excludes>
- </bannedDependencies>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>scala-2.12</id>
<activation>
[bahir-flink] 02/02: [BAHIR-308] Bump flink version to 1.15.1
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a commit to branch BAHIR-308
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit 764dafb09dfc63dbed3555ddabae1e8168b3a3c0
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Sun Jul 17 13:53:13 2022 +0200
[BAHIR-308] Bump flink version to 1.15.1
---
.github/workflows/maven-ci.yml | 22 +++++++++++++++++-----
.travis.yml | 2 +-
flink-connector-activemq/pom.xml | 6 +++---
flink-connector-akka/pom.xml | 2 +-
flink-connector-flume/pom.xml | 4 ++--
flink-connector-influxdb/pom.xml | 4 ++--
flink-connector-influxdb2/pom.xml | 4 ++--
.../influxdb/InfluxDBSinkIntegrationTestCase.java | 3 ++-
flink-connector-kudu/pom.xml | 4 ++--
.../flink/connectors/kudu/table/KuduCatalog.java | 2 +-
.../kudu/table/KuduTableSourceITCase.java | 4 ++--
.../connectors/kudu/table/KuduTableSourceTest.java | 2 +-
.../connectors/kudu/table/KuduTableTestUtils.java | 4 ++--
flink-connector-netty/pom.xml | 2 +-
flink-connector-pinot/pom.xml | 4 ++--
flink-connector-redis/pom.xml | 8 ++++----
.../connectors/redis/RedisITCaseBase.java | 2 +-
flink-library-siddhi/pom.xml | 4 ++--
pom.xml | 12 ++++++------
19 files changed, 54 insertions(+), 41 deletions(-)
diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
index cc42ad2..f207a0f 100644
--- a/.github/workflows/maven-ci.yml
+++ b/.github/workflows/maven-ci.yml
@@ -30,8 +30,20 @@ jobs:
strategy:
matrix:
java: ['8', '11']
- flink-version: ['1.14.4']
+ flink-version: ['1.15.1']
scala-version: ['2.12']
+ connector: [
+ 'flink-connector-activemq',
+ 'flink-connector-akka',
+ 'flink-connector-flume',
+ 'flink-connector-influxdb',
+ 'flink-connector-influxdb2',
+ 'flink-connector-kudu',
+ 'flink-connector-netty',
+ 'flink-connector-pinot',
+ 'flink-connector-redis',
+ 'flink-library-siddhi'
+ ]
steps:
- uses: actions/checkout@v2
@@ -41,8 +53,8 @@ jobs:
java-version: ${{ matrix.java }}
distribution: 'adopt'
cache: maven
- - name: Change scala version to ${{ matrix.scala-version }}
- run: ./dev/change-scala-version.sh ${{ matrix.scala-version }}
- shell: bash
+# - name: Change scala version to ${{ matrix.scala-version }}
+# run: ./dev/change-scala-version.sh ${{ matrix.scala-version }}
+# shell: bash
- name: Build with flink ${{ matrix.flink-version }}
- run: mvn -B clean verify -Dscala-${{ matrix.scala-version }} -Dflink.version=${{ matrix.flink-version }}
+ run: mvn -B clean verify -pl ${{ matrix.connector }} -am -Dscala-${{ matrix.scala-version }} -Dflink.version=${{ matrix.flink-version }}
diff --git a/.travis.yml b/.travis.yml
index 17985fb..a853b8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ jdk:
- openjdk8
env:
- - FLINK_VERSION="1.14.4" SCALA_VERSION="2.12"
+ - FLINK_VERSION="1.15.1" SCALA_VERSION="2.12"
before_install:
- ./dev/change-scala-version.sh $SCALA_VERSION
diff --git a/flink-connector-activemq/pom.xml b/flink-connector-activemq/pom.xml
index f70e158..cde65b6 100644
--- a/flink-connector-activemq/pom.xml
+++ b/flink-connector-activemq/pom.xml
@@ -92,16 +92,16 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
diff --git a/flink-connector-akka/pom.xml b/flink-connector-akka/pom.xml
index b929dce..53da588 100644
--- a/flink-connector-akka/pom.xml
+++ b/flink-connector-akka/pom.xml
@@ -63,7 +63,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/flink-connector-flume/pom.xml b/flink-connector-flume/pom.xml
index e900aac..46f3b1a 100644
--- a/flink-connector-flume/pom.xml
+++ b/flink-connector-flume/pom.xml
@@ -51,11 +51,11 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
diff --git a/flink-connector-influxdb/pom.xml b/flink-connector-influxdb/pom.xml
index c272e85..1108cfa 100644
--- a/flink-connector-influxdb/pom.xml
+++ b/flink-connector-influxdb/pom.xml
@@ -49,11 +49,11 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils</artifactId>
</dependency>
<dependency>
<groupId>org.influxdb</groupId>
diff --git a/flink-connector-influxdb2/pom.xml b/flink-connector-influxdb2/pom.xml
index 74c8fd1..48f26df 100644
--- a/flink-connector-influxdb2/pom.xml
+++ b/flink-connector-influxdb2/pom.xml
@@ -93,12 +93,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils</artifactId>
</dependency>
<dependency>
diff --git a/flink-connector-influxdb2/src/test/java/org/apache/flink/streaming/connectors/influxdb/InfluxDBSinkIntegrationTestCase.java b/flink-connector-influxdb2/src/test/java/org/apache/flink/streaming/connectors/influxdb/InfluxDBSinkIntegrationTestCase.java
index 75671c8..d600594 100644
--- a/flink-connector-influxdb2/src/test/java/org/apache/flink/streaming/connectors/influxdb/InfluxDBSinkIntegrationTestCase.java
+++ b/flink-connector-influxdb2/src/test/java/org/apache/flink/streaming/connectors/influxdb/InfluxDBSinkIntegrationTestCase.java
@@ -33,6 +33,7 @@ import java.util.Objects;
import java.util.stream.Collectors;
import org.apache.flink.api.common.RuntimeExecutionMode;
import org.apache.flink.api.common.typeinfo.BasicTypeInfo;
+import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.connectors.influxdb.sink.InfluxDBSink;
import org.apache.flink.streaming.connectors.influxdb.util.InfluxDBContainer;
@@ -85,7 +86,7 @@ class InfluxDBSinkIntegrationTestCase extends TestLogger {
.addCheckpointDataPoint(true)
.build();
- env.addSource(new FiniteTestSource(SOURCE_DATA), BasicTypeInfo.LONG_TYPE_INFO)
+ env.addSource(new FiniteTestSource<>(SOURCE_DATA), BasicTypeInfo.LONG_TYPE_INFO)
.sinkTo(influxDBSink);
env.execute();
diff --git a/flink-connector-kudu/pom.xml b/flink-connector-kudu/pom.xml
index 20b16b4..b97969e 100644
--- a/flink-connector-kudu/pom.xml
+++ b/flink-connector-kudu/pom.xml
@@ -85,11 +85,11 @@
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
diff --git a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java
index d8343e8..7ae6384 100644
--- a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java
+++ b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java
@@ -87,7 +87,7 @@ public class KuduCatalog extends AbstractReadOnlyCatalog {
* @param kuduMasters Connection address to Kudu
*/
public KuduCatalog(String catalogName, String kuduMasters) {
- super(catalogName, EnvironmentSettings.DEFAULT_BUILTIN_DATABASE);
+ super(catalogName, "default_database");
this.kuduMasters = kuduMasters;
this.kuduClient = createClient();
}
diff --git a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceITCase.java b/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceITCase.java
index 2a043f9..7e34c77 100644
--- a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceITCase.java
+++ b/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceITCase.java
@@ -53,7 +53,7 @@ public class KuduTableSourceITCase extends KuduTestBase {
it.forEachRemaining(results::add);
assertEquals(5, results.size());
assertEquals("1001,Java for dummies,Tan Ah Teck,11.11,11", results.get(0).toString());
- tableEnv.sqlUpdate("DROP TABLE books");
+ tableEnv.executeSql("DROP TABLE books");
}
@Test
@@ -64,6 +64,6 @@ public class KuduTableSourceITCase extends KuduTestBase {
it.forEachRemaining(results::add);
assertEquals(1, results.size());
assertEquals("More Java for more dummies", results.get(0).toString());
- tableEnv.sqlUpdate("DROP TABLE books");
+ tableEnv.executeSql("DROP TABLE books");
}
}
diff --git a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceTest.java b/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceTest.java
index 43734e4..fa1707e 100644
--- a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceTest.java
+++ b/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceTest.java
@@ -68,7 +68,7 @@ public class KuduTableSourceTest extends KuduTestBase {
KuduTableInfo tableInfo = booksTableInfo("books", true);
setUpDatabase(tableInfo);
catalog = new KuduCatalog(getMasterAddress());
- ObjectPath op = new ObjectPath(EnvironmentSettings.DEFAULT_BUILTIN_DATABASE, "books");
+ ObjectPath op = new ObjectPath("default_database", "books");
try {
kuduTableSource = catalog.getKuduTableFactory().createTableSource(op, catalog.getTable(op));
} catch (TableNotExistException e) {
diff --git a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableTestUtils.java b/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableTestUtils.java
index 4eae7bf..affdd04 100644
--- a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableTestUtils.java
+++ b/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableTestUtils.java
@@ -26,14 +26,14 @@ import static org.apache.flink.table.api.config.ExecutionConfigOptions.TABLE_EXE
public class KuduTableTestUtils {
public static StreamTableEnvironment createTableEnvWithBlinkPlannerStreamingMode(StreamExecutionEnvironment env) {
- EnvironmentSettings settings = EnvironmentSettings.newInstance().useBlinkPlanner().inStreamingMode().build();
+ EnvironmentSettings settings = EnvironmentSettings.newInstance().inStreamingMode().build();
StreamTableEnvironment tableEnv = StreamTableEnvironment.create(env, settings);
tableEnv.getConfig().getConfiguration().setInteger(TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM.key(), 1);
return tableEnv;
}
public static TableEnvironment createTableEnvWithBlinkPlannerBatchMode() {
- EnvironmentSettings settings = EnvironmentSettings.newInstance().useBlinkPlanner().inBatchMode().build();
+ EnvironmentSettings settings = EnvironmentSettings.newInstance().inBatchMode().build();
TableEnvironment tableEnv = TableEnvironment.create(settings);
tableEnv.getConfig().getConfiguration().setInteger(TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM.key(), 1);
return tableEnv;
diff --git a/flink-connector-netty/pom.xml b/flink-connector-netty/pom.xml
index 6f76037..ad450e3 100644
--- a/flink-connector-netty/pom.xml
+++ b/flink-connector-netty/pom.xml
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
diff --git a/flink-connector-pinot/pom.xml b/flink-connector-pinot/pom.xml
index 670504a..3625a1b 100644
--- a/flink-connector-pinot/pom.xml
+++ b/flink-connector-pinot/pom.xml
@@ -102,7 +102,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
@@ -124,7 +124,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
diff --git a/flink-connector-redis/pom.xml b/flink-connector-redis/pom.xml
index 7e5b592..10446f5 100644
--- a/flink-connector-redis/pom.xml
+++ b/flink-connector-redis/pom.xml
@@ -60,11 +60,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
@@ -73,7 +73,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -85,7 +85,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
diff --git a/flink-connector-redis/src/test/java/org/apache/flink/streaming/connectors/redis/RedisITCaseBase.java b/flink-connector-redis/src/test/java/org/apache/flink/streaming/connectors/redis/RedisITCaseBase.java
index 2bbbcb7..ea5a722 100644
--- a/flink-connector-redis/src/test/java/org/apache/flink/streaming/connectors/redis/RedisITCaseBase.java
+++ b/flink-connector-redis/src/test/java/org/apache/flink/streaming/connectors/redis/RedisITCaseBase.java
@@ -27,7 +27,7 @@ import static org.apache.flink.util.NetUtils.getAvailablePort;
public abstract class RedisITCaseBase extends AbstractTestBase {
- public static final int REDIS_PORT = getAvailablePort();
+ public static final int REDIS_PORT = getAvailablePort().getPort();
public static final String REDIS_HOST = "127.0.0.1";
private static RedisServer redisServer;
diff --git a/flink-library-siddhi/pom.xml b/flink-library-siddhi/pom.xml
index 33dca44..3a7c86e 100644
--- a/flink-library-siddhi/pom.xml
+++ b/flink-library-siddhi/pom.xml
@@ -91,11 +91,11 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils</artifactId>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 51b6cea..47de10f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<!-- Flink version -->
- <flink.version>1.14.4</flink.version>
+ <flink.version>1.15.1</flink.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.version>2.12.8</scala.version>
@@ -139,7 +139,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
@@ -177,12 +177,12 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -199,7 +199,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
@@ -216,7 +216,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>