From 8307788b513b77f8ce117c903c33fddefac5ee4c Mon Sep 17 00:00:00 2001 From: Martijn Visser <2989614+MartijnVisser@users.noreply.github.com> Date: Mon, 27 Nov 2023 11:52:30 +0100 Subject: [PATCH 01/27] [FLINK-XXXXX] Upgrade to Flink 1.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Frédérique Mittelstaedt --- pom.xml | 22 +++++++++---------- statefun-flink/statefun-flink-core/pom.xml | 2 +- .../flink/core/StatefulFunctionsConfig.java | 2 +- .../statefun-flink-io-bundle/pom.xml | 8 ++++++- tools/docker/Dockerfile | 2 +- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 1b9935c4c..6b617a2b3 100644 --- a/pom.xml +++ b/pom.xml @@ -79,11 +79,11 @@ under the License. 3.7.1 2.3.2 3.11.1 - 1.16.2 + 1.17.1 2.12 2.12.7 1.8.0 - 2.12.4-15.0 + 2.13.4-16.1 1.7.32 **/*Test.* @@ -113,24 +113,24 @@ 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 + --> - com.fasterxml.jackson.core - jackson-databind - 2.13.4.2 + org.apache.flink + flink-shaded-force-shading + 16.1 diff --git a/statefun-flink/statefun-flink-core/pom.xml b/statefun-flink/statefun-flink-core/pom.xml index 55e8c0061..c17c2b8de 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.82.Final-16.1 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-io-bundle/pom.xml b/statefun-flink/statefun-flink-io-bundle/pom.xml index db79e96ad..b411389c7 100644 --- a/statefun-flink/statefun-flink-io-bundle/pom.xml +++ b/statefun-flink/statefun-flink-io-bundle/pom.xml @@ -90,7 +90,13 @@ under the License. org.apache.flink flink-connector-kinesis - ${flink.version} + 4.1.0-1.17 + + + org.apache.flink + flink-connector-base + + diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 8c84423f1..84db6e15c 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 apache/flink:1.17.1-scala_2.12-java8 ENV ROLE worker ENV MASTER_HOST localhost From 66d08b82c7cf2e399512faf035c9e834885af5ce Mon Sep 17 00:00:00 2001 From: Martijn Visser <2989614+MartijnVisser@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:24:05 +0100 Subject: [PATCH 02/27] [FLINK-XXXXX] Update to Reload4J --- pom.xml | 2 +- statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml | 4 ++-- statefun-flink/pom.xml | 6 +++--- statefun-flink/statefun-flink-distribution/pom.xml | 4 +--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 6b617a2b3..45e6f3a7c 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ under the License. 2.12.7 1.8.0 2.13.4-16.1 - 1.7.32 + 1.7.36 **/*Test.* diff --git a/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml b/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml index 223fa5bd0..c3ee83616 100644 --- a/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml +++ b/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml @@ -69,8 +69,8 @@ under the License. org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} + slf4j-reload4j + ${slf4j.version} log4j diff --git a/statefun-flink/pom.xml b/statefun-flink/pom.xml index 409fcba9b..f627c6213 100644 --- a/statefun-flink/pom.xml +++ b/statefun-flink/pom.xml @@ -132,12 +132,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-distribution/pom.xml b/statefun-flink/statefun-flink-distribution/pom.xml index 5ea7b2eb1..8febd1bb8 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 From ecbf18b0bcb04f65b468aa37a8b867cd33f0400d Mon Sep 17 00:00:00 2001 From: Martijn Visser <2989614+MartijnVisser@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:07:47 +0100 Subject: [PATCH 03/27] [FLINK-XXXXX] Update Testcontainers --- statefun-e2e-tests/pom.xml | 2 +- statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml | 6 ------ statefun-e2e-tests/statefun-smoke-e2e-embedded/pom.xml | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) 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-smoke-e2e-common/pom.xml b/statefun-e2e-tests/statefun-smoke-e2e-common/pom.xml index c3ee83616..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 - - 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 From 791499eb1834a0c1972ef21e54177dc34a75fd93 Mon Sep 17 00:00:00 2001 From: Martijn Visser <2989614+MartijnVisser@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:43:13 +0100 Subject: [PATCH 04/27] [FLINK-XXXXX] Update Auto Annotation service --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45e6f3a7c..348a18736 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 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 From fc71a132218f85cab569fa9143e05bd1f954a3d7 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 13:58:58 +0000 Subject: [PATCH 05/27] Upgrade to Flink 1.20.1 --- pom.xml | 4 ++-- statefun-flink/statefun-flink-core/pom.xml | 2 +- statefun-flink/statefun-flink-io-bundle/pom.xml | 4 ++-- tools/docker/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 348a18736..770a64e59 100644 --- a/pom.xml +++ b/pom.xml @@ -79,11 +79,11 @@ under the License. 3.7.1 2.3.2 3.11.1 - 1.17.1 + 1.20.1 2.12 2.12.7 1.8.0 - 2.13.4-16.1 + 2.18.2-20.0 1.7.36 **/*Test.* diff --git a/statefun-flink/statefun-flink-core/pom.xml b/statefun-flink/statefun-flink-core/pom.xml index c17c2b8de..a07061edd 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.82.Final-16.1 + 4.1.100.Final-20.0 diff --git a/statefun-flink/statefun-flink-io-bundle/pom.xml b/statefun-flink/statefun-flink-io-bundle/pom.xml index b411389c7..442c4aafb 100644 --- a/statefun-flink/statefun-flink-io-bundle/pom.xml +++ b/statefun-flink/statefun-flink-io-bundle/pom.xml @@ -90,7 +90,7 @@ under the License. org.apache.flink flink-connector-kinesis - 4.1.0-1.17 + 5.0.0-1.20 org.apache.flink @@ -116,4 +116,4 @@ under the License. - \ No newline at end of file + diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 84db6e15c..12d5a096c 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.17.1-scala_2.12-java8 +FROM apache/flink:1.20.1-scala_2.12-java8 ENV ROLE worker ENV MASTER_HOST localhost From 90faa99c10ffa641cd2f034848d727256bfd828c Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 13:59:25 +0000 Subject: [PATCH 06/27] Fix Dependency convergence error for org.apache.commons:commons-compress:1.26.0 --- statefun-flink/statefun-flink-common/pom.xml | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/statefun-flink/statefun-flink-common/pom.xml b/statefun-flink/statefun-flink-common/pom.xml index 42037eacd..59b44a769 100644 --- a/statefun-flink/statefun-flink-common/pom.xml +++ b/statefun-flink/statefun-flink-common/pom.xml @@ -31,6 +31,8 @@ under the License. target/additional-sources + + 1.19.3 @@ -78,6 +80,29 @@ under the License. flink-test-utils-junit ${flink.version} test + + + + org.testcontainers + testcontainers + + + + + org.testcontainers + testcontainers + ${testcontainers.version} + + + org.apache.commons + commons-compress + + + + + org.apache.commons + commons-compress + 1.26.0 com.google.jimfs From 5ba63cc1e8a1d7d7ea5cb926b06b52b17c8aa8a8 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 14:16:42 +0000 Subject: [PATCH 07/27] Fix Dependency convergence error for org.apache.commons:commons-lang3:3.12.0 --- statefun-flink/statefun-flink-common/pom.xml | 36 +++++++++- statefun-flink/statefun-flink-core/pom.xml | 21 ++++++ statefun-flink/statefun-flink-io/pom.xml | 69 +++++++++++++++++++- 3 files changed, 123 insertions(+), 3 deletions(-) diff --git a/statefun-flink/statefun-flink-common/pom.xml b/statefun-flink/statefun-flink-common/pom.xml index 59b44a769..503dd3c64 100644 --- a/statefun-flink/statefun-flink-common/pom.xml +++ b/statefun-flink/statefun-flink-common/pom.xml @@ -31,8 +31,8 @@ under the License. target/additional-sources - - 1.19.3 + + 1.19.1 @@ -47,6 +47,27 @@ under the License. org.apache.flink flink-core ${flink.version} + + + + org.apache.commons + commons-text + + + org.apache.commons + commons-lang3 + + + + + org.apache.commons + commons-text + 1.12.0 + + + org.apache.commons + commons-lang3 + 3.14.0 @@ -74,6 +95,17 @@ under the License. ${flink.version} test-jar test + + + + org.apache.commons + commons-text + + + org.apache.commons + commons-lang3 + + org.apache.flink diff --git a/statefun-flink/statefun-flink-core/pom.xml b/statefun-flink/statefun-flink-core/pom.xml index a07061edd..9e63d0aa5 100644 --- a/statefun-flink/statefun-flink-core/pom.xml +++ b/statefun-flink/statefun-flink-core/pom.xml @@ -113,6 +113,27 @@ under the License. ${flink.version} test-jar test + + + + org.apache.commons + commons-text + + + org.apache.commons + commons-lang3 + + + + + org.apache.commons + commons-text + 1.12.0 + + + org.apache.commons + commons-lang3 + 3.14.0 org.apache.flink diff --git a/statefun-flink/statefun-flink-io/pom.xml b/statefun-flink/statefun-flink-io/pom.xml index b26b912ff..8207cb2ac 100644 --- a/statefun-flink/statefun-flink-io/pom.xml +++ b/statefun-flink/statefun-flink-io/pom.xml @@ -53,6 +53,73 @@ 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.flink + flink-core + ${flink.version} + + + + org.apache.commons + commons-text + + + org.apache.commons + commons-lang3 + + + + + org.apache.flink + flink-runtime + ${flink.version} + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-text + + + + + org.apache.flink + flink-java + ${flink.version} + + + org.apache.commons + commons-lang3 + + + + + org.apache.commons + commons-text + 1.12.0 + + + org.apache.commons + commons-lang3 + 3.14.0 com.google.protobuf @@ -124,4 +191,4 @@ under the License. - \ No newline at end of file + From 4dc75ec173967d3207e70187a1f7d439763bbd0a Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 14:45:42 +0000 Subject: [PATCH 08/27] Revert update of flink-shaded-netty.version --- statefun-flink/statefun-flink-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/statefun-flink/statefun-flink-core/pom.xml b/statefun-flink/statefun-flink-core/pom.xml index 9e63d0aa5..504e050e6 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.100.Final-20.0 + 4.1.91.Final-17.0 From dd1f9e2915dc94711b85dfea816e3335fc5a39e1 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 16:04:42 +0000 Subject: [PATCH 09/27] Fix flink-connector-kafka version --- statefun-flink/pom.xml | 2 +- statefun-flink/statefun-flink-io-bundle/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/statefun-flink/pom.xml b/statefun-flink/pom.xml index f627c6213..feafe1975 100644 --- a/statefun-flink/pom.xml +++ b/statefun-flink/pom.xml @@ -70,7 +70,7 @@ under the License. org.apache.flink flink-connector-kafka - ${flink.version} + 3.4.0-1.20 From 680e81fdb8881bef78d4361edcfeb57a1bee247e Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 16:05:44 +0000 Subject: [PATCH 10/27] Fix FakeRuntimeContext & FakeOutput --- .../flink/core/functions/ReductionsTest.java | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) 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) {} From 894c16a89aaff69dca71348912dc1f73701a6fa5 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 16:09:57 +0000 Subject: [PATCH 11/27] Fix Dependency convergence error for org.apache.commons:commons-lang3:3.12.0 --- .../statefun-flink-launcher/pom.xml | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/statefun-flink/statefun-flink-launcher/pom.xml b/statefun-flink/statefun-flink-launcher/pom.xml index b61f6f2e9..758b2a2ca 100644 --- a/statefun-flink/statefun-flink-launcher/pom.xml +++ b/statefun-flink/statefun-flink-launcher/pom.xml @@ -31,23 +31,54 @@ under the License. + org.apache.flink flink-runtime ${flink.version} + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-text + + + + + org.apache.commons + commons-text + 1.12.0 + + + org.apache.commons + commons-lang3 + 3.14.0 org.apache.flink flink-clients ${flink.version} - org.apache.flink - statefun-flink-core - ${project.version} + flink-core + ${flink.version} + + + + org.apache.commons + commons-text + + + org.apache.commons + commons-lang3 + + - \ No newline at end of file + From 7abdcfa67969efe2d9ec66f36373f6ba5c44dbc0 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 12/27] Fix Dependency convergence error for com.google.guava:guava:32.1.2-jre --- statefun-flink/statefun-flink-io-bundle/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/statefun-flink/statefun-flink-io-bundle/pom.xml b/statefun-flink/statefun-flink-io-bundle/pom.xml index c145b5165..b799b5439 100644 --- a/statefun-flink/statefun-flink-io-bundle/pom.xml +++ b/statefun-flink/statefun-flink-io-bundle/pom.xml @@ -84,6 +84,17 @@ under the License. org.apache.flink flink-connector-kafka 3.4.0-1.20 + + + com.google.guava + guava + + + + + com.google.guava + guava + 32.1.3-jre From 6ff3a7a55a7ee38a228f945bc6537a46afec8d0b Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 13/27] Fix Dependency convergence error for com.fasterxml.jackson.core:jackson-annotations:2.10.3 --- statefun-flink/statefun-flink-common/pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/statefun-flink/statefun-flink-common/pom.xml b/statefun-flink/statefun-flink-common/pom.xml index 503dd3c64..7f5083855 100644 --- a/statefun-flink/statefun-flink-common/pom.xml +++ b/statefun-flink/statefun-flink-common/pom.xml @@ -129,6 +129,10 @@ under the License. org.apache.commons commons-compress + + com.github.docker-java + docker-java-api + @@ -136,6 +140,22 @@ under the License. commons-compress 1.26.0 + + com.github.docker-java + docker-java-api + 3.3.3 + + + com.fasterxml.jackson.core + jackson-annotations + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.15.2 + com.google.jimfs jimfs From 098b72096442e95680008ee1c6d4d07b1fb20304 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 14/27] Fix Dependency convergence error for org.apache.commons:commons-lang3:3.14.0 --- statefun-flink/statefun-flink-io-bundle/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/statefun-flink/statefun-flink-io-bundle/pom.xml b/statefun-flink/statefun-flink-io-bundle/pom.xml index b799b5439..55838fe7e 100644 --- a/statefun-flink/statefun-flink-io-bundle/pom.xml +++ b/statefun-flink/statefun-flink-io-bundle/pom.xml @@ -107,8 +107,17 @@ under the License. org.apache.flink flink-connector-base + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-lang3 + 3.14.0 + From e48e0e04ff9f5ef635b850bf4463261e39760120 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 15/27] Fix Dependency convergence error for org.apache.commons:commons-lang3:3.14.0 --- .../statefun-flink-distribution/pom.xml | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/statefun-flink/statefun-flink-distribution/pom.xml b/statefun-flink/statefun-flink-distribution/pom.xml index 8febd1bb8..fa94b5926 100644 --- a/statefun-flink/statefun-flink-distribution/pom.xml +++ b/statefun-flink/statefun-flink-distribution/pom.xml @@ -86,12 +86,24 @@ under the License. flink-core ${flink.version} provided + + + org.apache.commons + commons-lang3 + + org.apache.flink flink-java ${flink.version} provided + + + org.apache.commons + commons-lang3 + + org.apache.flink @@ -104,6 +116,12 @@ under the License. flink-runtime ${flink.version} provided + + + org.apache.commons + commons-lang3 + + org.apache.flink @@ -117,6 +135,11 @@ under the License. ${flink.version} provided + + org.apache.commons + commons-lang3 + 3.14.0 + @@ -197,4 +220,4 @@ under the License. - \ No newline at end of file + From bcc27386bcae45a194dcbc1d6e3156ac990ec151 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 16/27] Fix Dependency convergence error for org.apache.commons:commons-text:1.12.0 --- statefun-flink/statefun-flink-distribution/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/statefun-flink/statefun-flink-distribution/pom.xml b/statefun-flink/statefun-flink-distribution/pom.xml index fa94b5926..0e55d03ad 100644 --- a/statefun-flink/statefun-flink-distribution/pom.xml +++ b/statefun-flink/statefun-flink-distribution/pom.xml @@ -91,6 +91,10 @@ under the License. org.apache.commons commons-lang3 + + org.apache.commons + commons-text + @@ -121,6 +125,10 @@ under the License. org.apache.commons commons-lang3 + + org.apache.commons + commons-text + @@ -140,6 +148,11 @@ under the License. commons-lang3 3.14.0 + + org.apache.commons + commons-text + 1.12.0 + From f5ffc1e9430774b90b0f4d7d854dfe64af1a5400 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 17/27] Fix Dependency convergence error for org.apache.commons:commons-lang3:3.14.0 --- statefun-flink/statefun-flink-harness/pom.xml | 69 ++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/statefun-flink/statefun-flink-harness/pom.xml b/statefun-flink/statefun-flink-harness/pom.xml index 2e6c692e4..88e91e628 100644 --- a/statefun-flink/statefun-flink-harness/pom.xml +++ b/statefun-flink/statefun-flink-harness/pom.xml @@ -39,6 +39,73 @@ under the License. org.apache.flink flink-streaming-java ${flink.version} + + + org.apache.flink + flink-streaming-java + + + org.apache.flink + flink-streaming-java + + + + + 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.flink + flink-core + ${flink.version} + + + org.apache.commons + commons-lang3 + + + + + org.apache.flink + flink-runtime + ${flink.version} + + + org.apache.commons + commons-lang3 + + + + + org.apache.flink + flink-java + ${flink.version} + + + org.apache.commons + commons-lang3 + + + + + org.apache.commons + commons-lang3 + 3.14.0 @@ -72,4 +139,4 @@ under the License. - \ No newline at end of file + From 094d1c94b99c485f83390f3d9338f3985e0ae4e7 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 18/27] Fix Dependency convergence error for org.apache.commons:commons-lang3:3.14.0 --- statefun-flink/statefun-flink-harness/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/statefun-flink/statefun-flink-harness/pom.xml b/statefun-flink/statefun-flink-harness/pom.xml index 88e91e628..c8c918655 100644 --- a/statefun-flink/statefun-flink-harness/pom.xml +++ b/statefun-flink/statefun-flink-harness/pom.xml @@ -78,6 +78,10 @@ under the License. org.apache.commons commons-lang3 + + org.apache.commons + commons-text + @@ -89,6 +93,10 @@ under the License. org.apache.commons commons-lang3 + + org.apache.commons + commons-text + @@ -107,6 +115,11 @@ under the License. commons-lang3 3.14.0 + + org.apache.commons + commons-text + 1.12.0 + From edc3a9f8aed42661c23ddd4f01952988df7ca4d0 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 19/27] Fix Move org.apache.commons:commons-lang3:3.14.0 and org.apache.commons:commons-text:1.12.0 to bom --- pom.xml | 107 ++++++++++++++++++ statefun-flink/statefun-flink-common/pom.xml | 26 ----- statefun-flink/statefun-flink-core/pom.xml | 14 --- .../statefun-flink-distribution/pom.xml | 32 ------ statefun-flink/statefun-flink-harness/pom.xml | 61 ---------- .../statefun-flink-io-bundle/pom.xml | 12 -- statefun-flink/statefun-flink-io/pom.xml | 48 -------- .../statefun-flink-launcher/pom.xml | 25 ---- 8 files changed, 107 insertions(+), 218 deletions(-) diff --git a/pom.xml b/pom.xml index 770a64e59..5e2a6ecc7 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,113 @@ under the License. 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.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-runtime + ${flink.version} + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-text + + + + + 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-connector-kinesis + 5.0.0-1.20 + + + org.apache.flink + flink-connector-base + + + org.apache.commons + commons-lang3 + + + + + org.apache.commons + commons-lang3 + 3.14.0 + diff --git a/statefun-flink/statefun-flink-common/pom.xml b/statefun-flink/statefun-flink-common/pom.xml index 7f5083855..881488024 100644 --- a/statefun-flink/statefun-flink-common/pom.xml +++ b/statefun-flink/statefun-flink-common/pom.xml @@ -46,28 +46,14 @@ under the License. org.apache.flink flink-core - ${flink.version} - - - - org.apache.commons - commons-text - - - org.apache.commons - commons-lang3 - - org.apache.commons commons-text - 1.12.0 org.apache.commons commons-lang3 - 3.14.0 @@ -92,20 +78,8 @@ 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 diff --git a/statefun-flink/statefun-flink-core/pom.xml b/statefun-flink/statefun-flink-core/pom.xml index 504e050e6..78af1c733 100644 --- a/statefun-flink/statefun-flink-core/pom.xml +++ b/statefun-flink/statefun-flink-core/pom.xml @@ -110,30 +110,16 @@ 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.commons commons-text - 1.12.0 org.apache.commons commons-lang3 - 3.14.0 org.apache.flink diff --git a/statefun-flink/statefun-flink-distribution/pom.xml b/statefun-flink/statefun-flink-distribution/pom.xml index 0e55d03ad..6c4b71037 100644 --- a/statefun-flink/statefun-flink-distribution/pom.xml +++ b/statefun-flink/statefun-flink-distribution/pom.xml @@ -84,52 +84,22 @@ under the License. org.apache.flink flink-core - ${flink.version} provided - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-text - - org.apache.flink flink-java - ${flink.version} provided - - - org.apache.commons - commons-lang3 - - org.apache.flink flink-streaming-java - ${flink.version} provided org.apache.flink flink-runtime - ${flink.version} provided - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-text - - org.apache.flink @@ -146,12 +116,10 @@ under the License. org.apache.commons commons-lang3 - 3.14.0 org.apache.commons commons-text - 1.12.0 diff --git a/statefun-flink/statefun-flink-harness/pom.xml b/statefun-flink/statefun-flink-harness/pom.xml index c8c918655..3b96e0267 100644 --- a/statefun-flink/statefun-flink-harness/pom.xml +++ b/statefun-flink/statefun-flink-harness/pom.xml @@ -38,87 +38,26 @@ under the License. org.apache.flink flink-streaming-java - ${flink.version} - - - org.apache.flink - flink-streaming-java - - - org.apache.flink - flink-streaming-java - - - - - 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.flink flink-core - ${flink.version} - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-text - - org.apache.flink flink-runtime - ${flink.version} - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-text - - 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 diff --git a/statefun-flink/statefun-flink-io-bundle/pom.xml b/statefun-flink/statefun-flink-io-bundle/pom.xml index 55838fe7e..197d000b4 100644 --- a/statefun-flink/statefun-flink-io-bundle/pom.xml +++ b/statefun-flink/statefun-flink-io-bundle/pom.xml @@ -101,22 +101,10 @@ under the License. org.apache.flink flink-connector-kinesis - 5.0.0-1.20 - - - org.apache.flink - flink-connector-base - - - org.apache.commons - commons-lang3 - - org.apache.commons commons-lang3 - 3.14.0 diff --git a/statefun-flink/statefun-flink-io/pom.xml b/statefun-flink/statefun-flink-io/pom.xml index 8207cb2ac..179900ea7 100644 --- a/statefun-flink/statefun-flink-io/pom.xml +++ b/statefun-flink/statefun-flink-io/pom.xml @@ -52,74 +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.flink flink-core - ${flink.version} - - - - org.apache.commons - commons-text - - - org.apache.commons - commons-lang3 - - org.apache.flink flink-runtime - ${flink.version} - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-text - - org.apache.flink flink-java - ${flink.version} - - - org.apache.commons - commons-lang3 - - org.apache.commons commons-text - 1.12.0 org.apache.commons commons-lang3 - 3.14.0 com.google.protobuf diff --git a/statefun-flink/statefun-flink-launcher/pom.xml b/statefun-flink/statefun-flink-launcher/pom.xml index 758b2a2ca..50af898c3 100644 --- a/statefun-flink/statefun-flink-launcher/pom.xml +++ b/statefun-flink/statefun-flink-launcher/pom.xml @@ -35,27 +35,14 @@ under the License. org.apache.flink flink-runtime - ${flink.version} - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-text - - org.apache.commons commons-text - 1.12.0 org.apache.commons commons-lang3 - 3.14.0 org.apache.flink @@ -66,18 +53,6 @@ under the License. org.apache.flink flink-core - ${flink.version} - - - - org.apache.commons - commons-text - - - org.apache.commons - commons-lang3 - - From 51774e645914784fb4cb43fc4dc1b2a5d3ff552a Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 20/27] Fix Dependency convergence error for org.slf4j:slf4j-api:1.7.36 --- pom.xml | 60 ++++++++++++++++++++ statefun-flink/statefun-flink-common/pom.xml | 34 ++--------- 2 files changed, 64 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index 5e2a6ecc7..31b6e677d 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,7 @@ under the License. 2.18.2-20.0 1.7.36 **/*Test.* + 1.19.3 @@ -239,6 +240,65 @@ under the License. commons-lang3 3.14.0 + + + 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.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-annotations + 2.15.2 + + + org.slf4j + slf4j-api + 1.7.36 + diff --git a/statefun-flink/statefun-flink-common/pom.xml b/statefun-flink/statefun-flink-common/pom.xml index 881488024..938783845 100644 --- a/statefun-flink/statefun-flink-common/pom.xml +++ b/statefun-flink/statefun-flink-common/pom.xml @@ -31,8 +31,6 @@ under the License. target/additional-sources - - 1.19.1 @@ -84,51 +82,27 @@ under the License. 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.apache.commons commons-compress - 1.26.0 com.github.docker-java docker-java-api - 3.3.3 - - - com.fasterxml.jackson.core - jackson-annotations - - com.fasterxml.jackson.core jackson-annotations - 2.15.2 + + + org.slf4j + slf4j-api com.google.jimfs From e5eac931fc0dc4a547b62dbd82c4d5ea1d43cb5c Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 21/27] Fix Dependency convergence error for flink-shaded-jackson --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31b6e677d..0c7ee1ff9 100644 --- a/pom.xml +++ b/pom.xml @@ -181,6 +181,10 @@ under the License. org.apache.commons commons-text + + org.apache.flink + flink-shaded-jackson + @@ -196,6 +200,10 @@ under the License. org.apache.commons commons-text + + org.apache.flink + flink-shaded-jackson + @@ -219,7 +227,12 @@ under the License. commons-text 1.12.0 - + + org.apache.flink + flink-shaded-jackson + 2.18.2-20.0 + + org.apache.flink flink-connector-kinesis From 47197d730547003b759c563ae4bf904b1f3859ce Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 22/27] Fix Duplicate --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0c7ee1ff9..45a9e2082 100644 --- a/pom.xml +++ b/pom.xml @@ -248,11 +248,6 @@ under the License. - - org.apache.commons - commons-lang3 - 3.14.0 - org.apache.flink From 0ccaae5e6e8b1f694b55671311e14f685b471a2b Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 23/27] Fix Dependency convergence error for org.xerial.snappy:snappy-java:1.1.8.4 --- pom.xml | 26 +++++++++++++++++++ .../statefun-flink-io-bundle/pom.xml | 13 +++------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 45a9e2082..6f025b4a4 100644 --- a/pom.xml +++ b/pom.xml @@ -307,6 +307,32 @@ under the License. slf4j-api 1.7.36 + + + org.apache.flink + flink-connector-kafka + 3.4.0-1.20 + + + com.google.guava + guava + + + org.xerial.snappy + snappy-java + + + + + com.google.guava + guava + 32.1.3-jre + + + org.xerial.snappy + snappy-java + 1.1.10.4 + diff --git a/statefun-flink/statefun-flink-io-bundle/pom.xml b/statefun-flink/statefun-flink-io-bundle/pom.xml index 197d000b4..d1e93c3a5 100644 --- a/statefun-flink/statefun-flink-io-bundle/pom.xml +++ b/statefun-flink/statefun-flink-io-bundle/pom.xml @@ -83,20 +83,15 @@ under the License. org.apache.flink flink-connector-kafka - 3.4.0-1.20 - - - com.google.guava - guava - - com.google.guava guava - 32.1.3-jre - + + org.xerial.snappy + snappy-java + org.apache.flink From 72da216e187aa722530d0ec7b3eac88e821c6558 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 24/27] Fix wrong renaming statefun-flink-core -> flink-core --- statefun-flink/statefun-flink-launcher/pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/statefun-flink/statefun-flink-launcher/pom.xml b/statefun-flink/statefun-flink-launcher/pom.xml index 50af898c3..db51372ab 100644 --- a/statefun-flink/statefun-flink-launcher/pom.xml +++ b/statefun-flink/statefun-flink-launcher/pom.xml @@ -44,6 +44,10 @@ under the License. org.apache.commons commons-lang3 + + org.apache.flink + flink-shaded-jackson + org.apache.flink flink-clients @@ -52,7 +56,8 @@ under the License. org.apache.flink - flink-core + statefun-flink-core + ${project.version} From 8b270fd3470ab0a7a854bcef062b8284e58ac8e2 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 25/27] Use non apache flink image that supports AMD64 --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 12d5a096c..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.20.1-scala_2.12-java8 +FROM flink:1.20.1-scala_2.12-java8 ENV ROLE worker ENV MASTER_HOST localhost From 96f5686e61ecd8789961818e376756d6d239abfe Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 26/27] Move testcontainers dependency to parent --- pom.xml | 32 +++++++++++++ .../statefun-e2e-tests-common/pom.xml | 45 ++++++++----------- 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 6f025b4a4..fdd2c1bee 100644 --- a/pom.xml +++ b/pom.xml @@ -275,6 +275,22 @@ under the License. com.github.docker-java docker-java-api + + org.slf4j + slf4j-api + + + com.kohlschutter.junixsocket + junixsocket-common + + + + net.java.dev.jna + jna + @@ -307,6 +323,16 @@ under the License. slf4j-api 1.7.36 + + net.java.dev.jna + jna + 5.5.0 + + + com.kohlschutter.junixsocket + junixsocket-common + ${unixsocket.version} + org.apache.flink @@ -333,6 +359,12 @@ under the License. snappy-java 1.1.10.4 + + + commons-codec + commons-codec + 1.18.0 + 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 + From d652b6c3c47ae6c2380cd65dc0c7f4695decfec6 Mon Sep 17 00:00:00 2001 From: Guillaume Vauvert Date: Sun, 16 Mar 2025 23:06:29 +0000 Subject: [PATCH 27/27] Fix slf4j-api & --- pom.xml | 8 ++++ .../statefun-smoke-e2e-driver/pom.xml | 26 ++----------- statefun-flink/pom.xml | 37 ------------------- 3 files changed, 12 insertions(+), 59 deletions(-) diff --git a/pom.xml b/pom.xml index fdd2c1bee..3d32dbd7a 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,10 @@ under the License. org.apache.flink flink-java + + org.slf4j + slf4j-api + @@ -347,6 +351,10 @@ under the License. org.xerial.snappy snappy-java + + org.slf4j + slf4j-api + 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-flink/pom.xml b/statefun-flink/pom.xml index feafe1975..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 - 3.4.0-1.20 - - - - org.xerial.snappy - snappy-java - - - - org.slf4j - slf4j-api - - - org.apache.flink flink-metrics-dropwizard