diff --git a/pom.xml b/pom.xml
index 1b9935c4c..3d32dbd7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,17 +75,18 @@ under the License.
UTF-8
1.8
1.20.0
- 1.0-rc6
+ 1.1.1
3.7.1
2.3.2
3.11.1
- 1.16.2
+ 1.20.1
2.12
2.12.7
1.8.0
- 2.12.4-15.0
- 1.7.32
+ 2.18.2-20.0
+ 1.7.36
**/*Test.*
+ 1.19.3
@@ -113,24 +114,264 @@ under the License.
com.esotericsoftware.kryo
kryo
2.24.0
+
+ flink-runtime:1.17.1 depends on flink-shaded-force-shading:16.1
+ org.apache.flink:flink-connector-kinesis:4.1.0-1.17 depends on flink-shaded-force-shading:16.0
+ -->
+
+ org.apache.flink
+ flink-shaded-force-shading
+ 16.1
+
+
+ org.apache.flink
+ flink-streaming-java
+ ${flink.version}
+
+
+ org.apache.flink
+ flink-core
+
+
+ org.apache.flink
+ flink-runtime
+
+
+ org.apache.flink
+ flink-java
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+
+ org.apache.flink
+ flink-core
+ ${flink.version}
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
+
+
+
+ org.apache.flink
+ flink-core
+ test-jar
+ ${flink.version}
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
+
+ org.apache.flink
+ flink-shaded-jackson
+
+
+
+
+ org.apache.flink
+ flink-runtime
+ ${flink.version}
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
+
+ org.apache.flink
+ flink-shaded-jackson
+
+
+
+
+ org.apache.flink
+ flink-java
+ ${flink.version}
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.14.0
+
+
+ org.apache.commons
+ commons-text
+ 1.12.0
+
+
+ org.apache.flink
+ flink-shaded-jackson
+ 2.18.2-20.0
+
+
+
+ org.apache.flink
+ flink-connector-kinesis
+ 5.0.0-1.20
+
+
+ org.apache.flink
+ flink-connector-base
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+ org.apache.flink
+ flink-test-utils-junit
+ ${flink.version}
+ test
+
+
+
+ org.testcontainers
+ testcontainers
+
+
+
+
+ org.testcontainers
+ testcontainers
+ ${testcontainers.version}
+
+
+ org.apache.commons
+ commons-compress
+
+
+ com.github.docker-java
+ docker-java-api
+
+
+ org.slf4j
+ slf4j-api
+
+
+ com.kohlschutter.junixsocket
+ junixsocket-common
+
+
+
+ net.java.dev.jna
+ jna
+
+
+
+
+ org.apache.commons
+ commons-compress
+ 1.26.0
+
+
+ com.github.docker-java
+ docker-java-api
+ 3.3.3
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ org.slf4j
+ slf4j-api
+
+
+
com.fasterxml.jackson.core
- jackson-databind
- 2.13.4.2
+ jackson-annotations
+ 2.15.2
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.36
+
+
+ net.java.dev.jna
+ jna
+ 5.5.0
+
+
+ com.kohlschutter.junixsocket
+ junixsocket-common
+ ${unixsocket.version}
+
+
+
+ org.apache.flink
+ flink-connector-kafka
+ 3.4.0-1.20
+
+
+ com.google.guava
+ guava
+
+
+ org.xerial.snappy
+ snappy-java
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+
+ com.google.guava
+ guava
+ 32.1.3-jre
+
+
+ org.xerial.snappy
+ snappy-java
+ 1.1.10.4
+
+
+
+ commons-codec
+ commons-codec
+ 1.18.0
diff --git a/statefun-e2e-tests/pom.xml b/statefun-e2e-tests/pom.xml
index 94d6c11de..4d7eb0885 100644
--- a/statefun-e2e-tests/pom.xml
+++ b/statefun-e2e-tests/pom.xml
@@ -29,7 +29,7 @@ under the License.
pom
- 1.15.2
+ 1.19.3
diff --git a/statefun-e2e-tests/statefun-e2e-tests-common/pom.xml b/statefun-e2e-tests/statefun-e2e-tests-common/pom.xml
index e5faee54c..01665e8a6 100644
--- a/statefun-e2e-tests/statefun-e2e-tests-common/pom.xml
+++ b/statefun-e2e-tests/statefun-e2e-tests-common/pom.xml
@@ -52,41 +52,26 @@ under the License.
org.testcontainers
testcontainers
- ${testcontainers.version}
-
-
- org.slf4j
- slf4j-api
-
-
- org.apache.commons
- commons-compress
-
-
- com.kohlschutter.junixsocket
- junixsocket-common
-
-
-
- net.java.dev.jna
- jna
-
-
-
+
+ com.github.docker-java
+ docker-java-api
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ org.slf4j
+ slf4j-api
+
net.java.dev.jna
jna
- 5.5.0
-
com.kohlschutter.junixsocket
junixsocket-common
- ${unixsocket.version}
@@ -120,5 +105,11 @@ under the License.
junit
compile
+
+
+
+ commons-codec
+ commons-codec
+
diff --git a/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml b/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml
index 223fa5bd0..aa5a100e7 100644
--- a/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml
+++ b/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml
@@ -38,12 +38,6 @@ under the License.
org.apache.flink
statefun-e2e-tests-common
${project.version}
-
-
- com.fasterxml.jackson.core
- jackson-annotations
-
-
@@ -69,8 +63,8 @@ under the License.
org.slf4j
- slf4j-log4j12
- ${slf4j-log4j12.version}
+ slf4j-reload4j
+ ${slf4j.version}
log4j
diff --git a/statefun-e2e-tests/statefun-smoke-e2e-driver/pom.xml b/statefun-e2e-tests/statefun-smoke-e2e-driver/pom.xml
index ce530d3b1..fc434f7c5 100644
--- a/statefun-e2e-tests/statefun-smoke-e2e-driver/pom.xml
+++ b/statefun-e2e-tests/statefun-smoke-e2e-driver/pom.xml
@@ -73,32 +73,14 @@ under the License.
org.apache.flink
flink-streaming-java
- ${flink.version}
-
-
-
- org.slf4j
- slf4j-api
-
-
+
+
+ org.slf4j
+ slf4j-api
org.apache.flink
flink-core
- ${flink.version}
-
-
-
- org.slf4j
- slf4j-api
-
-
diff --git a/statefun-e2e-tests/statefun-smoke-e2e-embedded/pom.xml b/statefun-e2e-tests/statefun-smoke-e2e-embedded/pom.xml
index 95a1b2137..5da170094 100644
--- a/statefun-e2e-tests/statefun-smoke-e2e-embedded/pom.xml
+++ b/statefun-e2e-tests/statefun-smoke-e2e-embedded/pom.xml
@@ -35,10 +35,6 @@ under the License.
test
-
- com.fasterxml.jackson.core
- jackson-annotations
-
com.google.code.findbugs
jsr305
diff --git a/statefun-flink/pom.xml b/statefun-flink/pom.xml
index 409fcba9b..522b663c6 100644
--- a/statefun-flink/pom.xml
+++ b/statefun-flink/pom.xml
@@ -52,43 +52,6 @@ under the License.
-
- org.apache.flink
- flink-streaming-java
- ${flink.version}
-
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- org.apache.flink
- flink-connector-kafka
- ${flink.version}
-
-
-
- org.xerial.snappy
- snappy-java
-
-
-
- org.slf4j
- slf4j-api
-
-
-
org.apache.flink
flink-metrics-dropwizard
@@ -132,12 +95,12 @@ under the License.
org.slf4j
slf4j-api
- 1.7.7
+ ${slf4j.version}
org.slf4j
- slf4j-log4j12
- 1.7.7
+ slf4j-reload4j
+ ${slf4j.version}
log4j
diff --git a/statefun-flink/statefun-flink-common/pom.xml b/statefun-flink/statefun-flink-common/pom.xml
index 42037eacd..938783845 100644
--- a/statefun-flink/statefun-flink-common/pom.xml
+++ b/statefun-flink/statefun-flink-common/pom.xml
@@ -44,7 +44,14 @@ under the License.
org.apache.flink
flink-core
- ${flink.version}
+
+
+ org.apache.commons
+ commons-text
+
+
+ org.apache.commons
+ commons-lang3
@@ -69,16 +76,34 @@ under the License.
org.apache.flink
flink-core
- ${flink.version}
test-jar
test
org.apache.flink
flink-test-utils-junit
- ${flink.version}
test
+
+ org.testcontainers
+ testcontainers
+
+
+ org.apache.commons
+ commons-compress
+
+
+ com.github.docker-java
+ docker-java-api
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ org.slf4j
+ slf4j-api
+
com.google.jimfs
jimfs
diff --git a/statefun-flink/statefun-flink-core/pom.xml b/statefun-flink/statefun-flink-core/pom.xml
index 55e8c0061..78af1c733 100644
--- a/statefun-flink/statefun-flink-core/pom.xml
+++ b/statefun-flink/statefun-flink-core/pom.xml
@@ -32,7 +32,7 @@ under the License.
3.14.6
target/additional-sources
- 4.1.70.Final-15.0
+ 4.1.91.Final-17.0
@@ -110,10 +110,17 @@ under the License.
org.apache.flink
flink-core
- ${flink.version}
test-jar
test
+
+ org.apache.commons
+ commons-text
+
+
+ org.apache.commons
+ commons-lang3
+
org.apache.flink
flink-test-utils-junit
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/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 9c36db70c..24e0f6182 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
@@ -27,6 +27,8 @@
import javax.annotation.Nonnull;
import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.common.JobID;
+import org.apache.flink.api.common.JobInfo;
+import org.apache.flink.api.common.TaskInfo;
import org.apache.flink.api.common.accumulators.*;
import org.apache.flink.api.common.accumulators.Histogram;
import org.apache.flink.api.common.cache.DistributedCache;
@@ -34,6 +36,7 @@
import org.apache.flink.api.common.functions.BroadcastVariableInitializer;
import org.apache.flink.api.common.functions.RuntimeContext;
import org.apache.flink.api.common.state.*;
+import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.metrics.*;
@@ -41,7 +44,7 @@
import org.apache.flink.runtime.state.*;
import org.apache.flink.runtime.state.heap.HeapPriorityQueueElement;
import org.apache.flink.runtime.state.internal.InternalListState;
-import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.MoreExecutors;
+import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.MoreExecutors;
import org.apache.flink.statefun.flink.core.StatefulFunctionsUniverse;
import org.apache.flink.statefun.flink.core.TestUtils;
import org.apache.flink.statefun.flink.core.backpressure.ThresholdBackPressureValve;
@@ -53,6 +56,7 @@
import org.apache.flink.streaming.api.operators.Triggerable;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.runtime.streamrecord.LatencyMarker;
+import org.apache.flink.streaming.runtime.streamrecord.RecordAttributes;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus;
import org.apache.flink.util.OutputTag;
@@ -154,11 +158,36 @@ public void clear() {}
};
}
+ @Override
+ public JobInfo getJobInfo() {
+ return null;
+ }
+
+ @Override
+ public TaskInfo getTaskInfo() {
+ return null;
+ }
+
@Override
public ExecutionConfig getExecutionConfig() {
return new ExecutionConfig();
}
+ @Override
+ public TypeSerializer createSerializer(TypeInformation typeInformation) {
+ return null;
+ }
+
+ @Override
+ public Map getGlobalJobParameters() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public boolean isObjectReuseEnabled() {
+ return false;
+ }
+
// everything below this line would throw UnspportedOperationException()
@Override
@@ -557,6 +586,9 @@ public void collect(OutputTag outputTag, StreamRecord record) {}
@Override
public void emitLatencyMarker(LatencyMarker latencyMarker) {}
+ @Override
+ public void emitRecordAttributes(RecordAttributes recordAttributes) {}
+
@Override
public void collect(StreamRecord record) {}
diff --git a/statefun-flink/statefun-flink-distribution/pom.xml b/statefun-flink/statefun-flink-distribution/pom.xml
index 5ea7b2eb1..6c4b71037 100644
--- a/statefun-flink/statefun-flink-distribution/pom.xml
+++ b/statefun-flink/statefun-flink-distribution/pom.xml
@@ -33,13 +33,11 @@ under the License.
org.slf4j
- slf4j-log4j12
- ${slf4j-log4j12.version}
+ slf4j-reload4j
log4j
log4j
- 1.2.17
com.google.protobuf
@@ -86,25 +84,21 @@ under the License.
org.apache.flink
flink-core
- ${flink.version}
provided
org.apache.flink
flink-java
- ${flink.version}
provided
org.apache.flink
flink-streaming-java
- ${flink.version}
provided
org.apache.flink
flink-runtime
- ${flink.version}
provided
@@ -119,6 +113,14 @@ under the License.
${flink.version}
provided
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
@@ -199,4 +201,4 @@ under the License.
-
\ No newline at end of file
+
diff --git a/statefun-flink/statefun-flink-harness/pom.xml b/statefun-flink/statefun-flink-harness/pom.xml
index 2e6c692e4..3b96e0267 100644
--- a/statefun-flink/statefun-flink-harness/pom.xml
+++ b/statefun-flink/statefun-flink-harness/pom.xml
@@ -38,7 +38,26 @@ under the License.
org.apache.flink
flink-streaming-java
- ${flink.version}
+
+
+ org.apache.flink
+ flink-core
+
+
+ org.apache.flink
+ flink-runtime
+
+
+ org.apache.flink
+ flink-java
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
@@ -72,4 +91,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..d1e93c3a5 100644
--- a/statefun-flink/statefun-flink-io-bundle/pom.xml
+++ b/statefun-flink/statefun-flink-io-bundle/pom.xml
@@ -83,14 +83,23 @@ under the License.
org.apache.flink
flink-connector-kafka
- ${flink.version}
-
+
+ com.google.guava
+ guava
+
+
+ org.xerial.snappy
+ snappy-java
+
org.apache.flink
flink-connector-kinesis
- ${flink.version}
+
+
+ org.apache.commons
+ commons-lang3
@@ -110,4 +119,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..179900ea7 100644
--- a/statefun-flink/statefun-flink-io/pom.xml
+++ b/statefun-flink/statefun-flink-io/pom.xml
@@ -52,7 +52,26 @@ under the License.
org.apache.flink
flink-streaming-java
- ${flink.version}
+
+
+ org.apache.flink
+ flink-core
+
+
+ org.apache.flink
+ flink-runtime
+
+
+ org.apache.flink
+ flink-java
+
+
+ org.apache.commons
+ commons-text
+
+
+ org.apache.commons
+ commons-lang3
com.google.protobuf
@@ -124,4 +143,4 @@ under the License.
-
\ No newline at end of file
+
diff --git a/statefun-flink/statefun-flink-launcher/pom.xml b/statefun-flink/statefun-flink-launcher/pom.xml
index b61f6f2e9..db51372ab 100644
--- a/statefun-flink/statefun-flink-launcher/pom.xml
+++ b/statefun-flink/statefun-flink-launcher/pom.xml
@@ -31,17 +31,28 @@ under the License.
+
org.apache.flink
flink-runtime
- ${flink.version}
+
+
+ org.apache.commons
+ commons-text
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.flink
+ flink-shaded-jackson
org.apache.flink
flink-clients
${flink.version}
-
org.apache.flink
@@ -50,4 +61,4 @@ under the License.
-
\ No newline at end of file
+
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 8c84423f1..993e7bc26 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.16.2-scala_2.12-java8
+FROM flink:1.20.1-scala_2.12-java8
ENV ROLE worker
ENV MASTER_HOST localhost