This is an automated email from the ASF dual-hosted git repository. tzulitai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-statefun.git
The following commit(s) were added to refs/heads/master by this push: new 3e7da0c [FLINK-22552] Update Flink dependency to 1.13.0 3e7da0c is described below commit 3e7da0c5bf7ebc796e5498f859767c93cf007e56 Author: Tzu-Li (Gordon) Tai <tzuli...@apache.org> AuthorDate: Tue May 18 14:15:03 2021 +0800 [FLINK-22552] Update Flink dependency to 1.13.0 This closes #234. --- pom.xml | 2 +- statefun-flink/statefun-flink-common/pom.xml | 2 +- .../flink/statefun/flink/core/functions/ReductionsTest.java | 10 ++++++++-- .../flink/launcher/StatefulFunctionsClusterEntryPoint.java | 5 +++-- tools/docker/Dockerfile | 4 +--- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 44e8360..f85922b 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ under the License. <protobuf.version>3.7.1</protobuf.version> <unixsocket.version>2.3.2</unixsocket.version> <protoc-jar-maven-plugin.version>3.11.1</protoc-jar-maven-plugin.version> - <flink.version>1.12.1</flink.version> + <flink.version>1.13.0</flink.version> <scala.binary.version>2.12</scala.binary.version> <root.dir>${rootDir}</root.dir> </properties> diff --git a/statefun-flink/statefun-flink-common/pom.xml b/statefun-flink/statefun-flink-common/pom.xml index ac96bef..fedbddb 100644 --- a/statefun-flink/statefun-flink-common/pom.xml +++ b/statefun-flink/statefun-flink-common/pom.xml @@ -49,7 +49,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-shaded-jackson</artifactId> - <version>2.10.1-12.0</version> + <version>2.12.1-13.0</version> </dependency> <!-- tests --> diff --git a/statefun-flink/statefun-flink-core/src/test/java/org/apache/flink/statefun/flink/core/functions/ReductionsTest.java b/statefun-flink/statefun-flink-core/src/test/java/org/apache/flink/statefun/flink/core/functions/ReductionsTest.java index ab2a8f7..3f84bce 100644 --- a/statefun-flink/statefun-flink-core/src/test/java/org/apache/flink/statefun/flink/core/functions/ReductionsTest.java +++ b/statefun-flink/statefun-flink-core/src/test/java/org/apache/flink/statefun/flink/core/functions/ReductionsTest.java @@ -31,6 +31,7 @@ import java.util.Set; import java.util.stream.Stream; import javax.annotation.Nonnull; import org.apache.flink.api.common.ExecutionConfig; +import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.accumulators.Accumulator; import org.apache.flink.api.common.accumulators.DoubleCounter; import org.apache.flink.api.common.accumulators.Histogram; @@ -302,6 +303,11 @@ public class ReductionsTest { public void registerUserCodeClassLoaderReleaseHookIfAbsent(String s, Runnable runnable) { throw new UnsupportedOperationException(); } + + @Override + public JobID getJobId() { + throw new UnsupportedOperationException(); + } } private static final class FakeKeyedStateBackend implements KeyedStateBackend<Object> { @@ -352,9 +358,9 @@ public class ReductionsTest { @Nonnull @Override - public <T extends HeapPriorityQueueElement & PriorityComparable & Keyed> + public <T extends HeapPriorityQueueElement & PriorityComparable<? super T> & Keyed<?>> KeyGroupedInternalPriorityQueue<T> create( - @Nonnull String stateName, @Nonnull TypeSerializer<T> byteOrderedElementSerializer) { + @Nonnull String s, @Nonnull TypeSerializer<T> typeSerializer) { throw new UnsupportedOperationException(); } diff --git a/statefun-flink/statefun-flink-launcher/src/main/java/org/apache/flink/statefun/flink/launcher/StatefulFunctionsClusterEntryPoint.java b/statefun-flink/statefun-flink-launcher/src/main/java/org/apache/flink/statefun/flink/launcher/StatefulFunctionsClusterEntryPoint.java index ae8a74b..45188fd 100644 --- a/statefun-flink/statefun-flink-launcher/src/main/java/org/apache/flink/statefun/flink/launcher/StatefulFunctionsClusterEntryPoint.java +++ b/statefun-flink/statefun-flink-launcher/src/main/java/org/apache/flink/statefun/flink/launcher/StatefulFunctionsClusterEntryPoint.java @@ -119,12 +119,13 @@ public final class StatefulFunctionsClusterEntryPoint extends JobClusterEntrypoi if (isNoExecutionModeConfigured(configuration)) { // In contrast to other places, the default for standalone job clusters is // ExecutionMode.DETACHED - configuration.setString(ClusterEntrypoint.EXECUTION_MODE, ExecutionMode.DETACHED.toString()); + configuration.setString( + ClusterEntrypoint.INTERNAL_CLUSTER_EXECUTION_MODE, ExecutionMode.DETACHED.toString()); } } private static boolean isNoExecutionModeConfigured(Configuration configuration) { - return configuration.getString(ClusterEntrypoint.EXECUTION_MODE, null) == null; + return configuration.getString(ClusterEntrypoint.INTERNAL_CLUSTER_EXECUTION_MODE, null) == null; } private static void addStatefulFunctionsConfiguration(Configuration configuration) { diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 155755d..02a0b0f 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM apache/flink:1.12.1-scala_2.12-java8 +FROM apache/flink:1.13.0-scala_2.12-java8 ENV ROLE worker ENV MASTER_HOST localhost @@ -37,8 +37,6 @@ RUN mkdir -p $STATEFUN_MODULES && \ # add filesystem plugins RUN mkdir -p $FLINK_HOME/plugins/s3-fs-presto && \ mv $FLINK_HOME/opt/flink-s3-fs-presto-*.jar $FLINK_HOME/plugins/s3-fs-presto -RUN mkdir -p $FLINK_HOME/plugins/swift-fs-hadoop && \ - mv $FLINK_HOME/opt/flink-swift-fs-hadoop-*.jar $FLINK_HOME/plugins/swift-fs-hadoop RUN mkdir -p $FLINK_HOME/plugins/oss-fs-hadoop && \ mv $FLINK_HOME/opt/flink-oss-fs-hadoop-*.jar $FLINK_HOME/plugins/oss-fs-hadoop RUN mkdir -p $FLINK_HOME/plugins/azure-fs-hadoop && \