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 <[email protected]> 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>
