diff --git a/pom.xml b/pom.xml index 6bf1c7933..99806bb49 100644 --- a/pom.xml +++ b/pom.xml @@ -76,15 +76,28 @@ under the License. 1.8 1.20.0 1.0-rc6 - 3.7.1 - 2.3.2 - 3.11.1 - 1.15.2 + 3.23.2 + 2.6.2 + 3.11.4 + 1.17.1 2.12 2.12.7 1.8.0 - 2.12.4-15.0 + 2.14.2-17.0 1.7.32 + 4.1.0-1.17 + 4.1.0-1.17 + 3.14.6 + 4.1.82.Final-16.1 + 4.12 + 1.3 + 2.24.0 + 2.13.2.2 + 4.1.82.Final-16.1 + 16.1 + 1.15 + 1.2 + 1.7.36 **/*Test.* @@ -101,15 +114,20 @@ under the License. junit junit - 4.12 + ${junit.version} test org.hamcrest hamcrest-all - 1.3 + ${hamcrest-all.version} test + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + org.apache.flink + flink-shaded-netty + ${flink-shaded-netty.version} + + + + org.apache.flink + flink-core + ${flink.version} + + + + org.apache.flink + flink-table-common + ${flink.version} + + + + org.apache.flink + flink-connector-base + ${flink.version} + + + + org.apache.flink + flink-shaded-force-shading + ${flink-shaded-force-shading.version} + + + + org.apache.flink + flink-shaded-jackson + ${flink-shaded-jackson.version} + + + + commons-codec + commons-codec + ${commons-codec.version} + + + + commons-logging + commons-logging + ${commons-logging.version} + + + + org.slf4j + slf4j-api + ${slf4j-api.version} @@ -234,10 +311,12 @@ under the License. descriptor ${basedir}/target/test-classes + main java ${basedir}/target/generated-test-sources/protoc-jar + test @@ -412,4 +491,3 @@ under the License. - diff --git a/statefun-flink/statefun-flink-core/pom.xml b/statefun-flink/statefun-flink-core/pom.xml index 55e8c0061..bfe4d832b 100644 --- a/statefun-flink/statefun-flink-core/pom.xml +++ b/statefun-flink/statefun-flink-core/pom.xml @@ -30,9 +30,7 @@ under the License. statefun-flink-core - 3.14.6 target/additional-sources - 4.1.70.Final-15.0 @@ -90,6 +88,7 @@ under the License. com.kohlschutter.junixsocket junixsocket-core ${unixsocket.version} + pom diff --git a/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/StatefulFunctionsConfig.java b/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/StatefulFunctionsConfig.java index 36a14198b..a59d45a3c 100644 --- a/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/StatefulFunctionsConfig.java +++ b/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/StatefulFunctionsConfig.java @@ -265,7 +265,7 @@ public void setEmbedded(boolean embedded) { */ public StatefulFunctionsUniverseProvider getProvider(ClassLoader cl) { try { - return InstantiationUtil.deserializeObject(universeInitializerClassBytes, cl, false); + return InstantiationUtil.deserializeObject(universeInitializerClassBytes, cl); } catch (IOException | ClassNotFoundException e) { throw new IllegalStateException("Unable to initialize.", e); } diff --git a/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/StatefulFunctionsJob.java b/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/StatefulFunctionsJob.java index c86ef5814..6803ce65c 100644 --- a/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/StatefulFunctionsJob.java +++ b/statefun-flink/statefun-flink-core/src/main/java/org/apache/flink/statefun/flink/core/StatefulFunctionsJob.java @@ -23,12 +23,12 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.flink.api.java.utils.ParameterTool; import org.apache.flink.configuration.Configuration; -import org.apache.flink.runtime.execution.librarycache.FlinkUserCodeClassLoaders; import org.apache.flink.statefun.flink.core.feedback.FeedbackKey; import org.apache.flink.statefun.flink.core.message.Message; import org.apache.flink.statefun.flink.core.translation.FlinkUniverse; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.util.FlinkUserCodeClassLoader; +import org.apache.flink.util.FlinkUserCodeClassLoaders; public class StatefulFunctionsJob { 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 ad65827e2..64f33642e 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 @@ -352,10 +352,11 @@ public boolean deregisterKeySelectionListener(KeySelectionListener liste @Nonnull @Override - public IS createInternalState( + public IS createOrUpdateInternalState( @Nonnull TypeSerializer namespaceSerializer, @Nonnull StateDescriptor stateDesc, - @Nonnull StateSnapshotTransformFactory snapshotTransformFactory) { + @Nonnull StateSnapshotTransformFactory snapshotTransformFactory) + throws Exception { throw new UnsupportedOperationException(); } diff --git a/statefun-flink/statefun-flink-datastream/pom.xml b/statefun-flink/statefun-flink-datastream/pom.xml index ccb8aac8c..5afb088ce 100644 --- a/statefun-flink/statefun-flink-datastream/pom.xml +++ b/statefun-flink/statefun-flink-datastream/pom.xml @@ -51,13 +51,13 @@ under the License. statefun-flink-io ${project.version} - - org.apache.flink @@ -87,7 +87,7 @@ under the License. org.hamcrest hamcrest-all - + @@ -152,4 +152,4 @@ under the License. - \ No newline at end of file + diff --git a/statefun-flink/statefun-flink-distribution/pom.xml b/statefun-flink/statefun-flink-distribution/pom.xml index 5ea7b2eb1..6d0b22b40 100644 --- a/statefun-flink/statefun-flink-distribution/pom.xml +++ b/statefun-flink/statefun-flink-distribution/pom.xml @@ -74,7 +74,7 @@ under the License. statefun-flink-launcher ${project.version} - + org.apache.flink @@ -199,4 +199,4 @@ under the License. - \ No newline at end of file + diff --git a/statefun-flink/statefun-flink-io-bundle/pom.xml b/statefun-flink/statefun-flink-io-bundle/pom.xml index db79e96ad..490e08e03 100644 --- a/statefun-flink/statefun-flink-io-bundle/pom.xml +++ b/statefun-flink/statefun-flink-io-bundle/pom.xml @@ -90,7 +90,12 @@ under the License. org.apache.flink flink-connector-kinesis - ${flink.version} + ${flink-connector-kinesis.version} + + + org.apache.flink + flink-connector-aws-kinesis-streams + ${flink-connector-aws-kinesis-streams.version} @@ -110,4 +115,4 @@ under the License. - \ No newline at end of file + diff --git a/statefun-flink/statefun-flink-io/pom.xml b/statefun-flink/statefun-flink-io/pom.xml index b26b912ff..280f83a51 100644 --- a/statefun-flink/statefun-flink-io/pom.xml +++ b/statefun-flink/statefun-flink-io/pom.xml @@ -124,4 +124,4 @@ under the License. - \ No newline at end of file + diff --git a/statefun-shaded/statefun-protobuf-shaded/pom.xml b/statefun-shaded/statefun-protobuf-shaded/pom.xml index d97dae2a7..ec67f7e15 100644 --- a/statefun-shaded/statefun-protobuf-shaded/pom.xml +++ b/statefun-shaded/statefun-protobuf-shaded/pom.xml @@ -32,7 +32,6 @@ under the License. ${generated-sources.basedir}/shaded-protobuf-java/ - 3.7.1 @@ -107,4 +106,4 @@ under the License. - \ No newline at end of file + diff --git a/statefun-shaded/statefun-protocol-shaded/pom.xml b/statefun-shaded/statefun-protocol-shaded/pom.xml index 9ad5c9bc0..d31938eb4 100644 --- a/statefun-shaded/statefun-protocol-shaded/pom.xml +++ b/statefun-shaded/statefun-protocol-shaded/pom.xml @@ -33,7 +33,7 @@ under the License. ${generated-sources.basedir}/protocol-messages/ target/proto-sources - 3.11.1 + 3.11.4 @@ -47,6 +47,11 @@ under the License. statefun-protobuf-shaded ${project.version} + + com.google.protobuf + protobuf-java + ${protobuf.version} + @@ -130,4 +135,4 @@ under the License. - \ No newline at end of file + diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 662d034c0..62e579ad5 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.15.2-scala_2.12-java8 +FROM flink:1.17.1-scala_2.12-java11 ENV ROLE worker ENV MASTER_HOST localhost @@ -45,7 +45,7 @@ RUN mkdir -p $FLINK_HOME/plugins/azure-fs-hadoop && \ # add tcnative RUN mv $FLINK_HOME/opt/flink-shaded-netty-tcnative-dynamic-*.jar $FLINK_HOME/lib/ -# entry point +# entry point ADD docker-entry-point.sh /docker-entry-point.sh ENTRYPOINT ["/docker-entry-point.sh"]