Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ lazy val commonSettings =
// Note: when updating check versions in 'flink*V' below, because some libraries must be fixed at versions provided
// by Flink, or jobs may fail in runtime when Flink is run with 'classloader.resolve-order: parent-first'.
// You can find versions provided by Flink in it's lib/flink-dist-*.jar/META-INF/DEPENDENCIES file.
val flinkV = "1.20.1"
val flinkV = "1.20.2"
val flinkConnectorKafkaV = "3.3.0-1.20" // 3.4.0-1.20 breaks compilation with Scala 2.12
val jdbcFlinkConnectorV = "3.3.0-1.20"
val flinkCommonsCompressV = "1.26.0"
Expand Down Expand Up @@ -347,7 +347,7 @@ val retryV = "0.3.6"
// depending on scala version one of this jar lays in Flink lib dir
def flinkLibScalaDeps(scalaVersion: String, configurations: Option[Configuration] = None) =
Seq(
"pl.touk" %% "flink-scala" % "1.1.3"
"pl.touk" %% "flink-scala" % "1.1.4"
).map(m => configurations.map(m % _).getOrElse(m)).map(_ exclude ("com.esotericsoftware", "kryo-shaded"))

lazy val commonDockerSettings = {
Expand Down
2 changes: 1 addition & 1 deletion docs/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ description: Stay informed with detailed changelogs covering new features, impro
* [#8116](https://github.com/TouK/nussknacker/pull/8116) Improved Kafka metadata caching: common cache and caching topics when schemaless topics are enabled
* [#8123](https://github.com/TouK/nussknacker/pull/8123) For now on, it is possible to deploy and save a scenario at the same time.
* [#8228](https://github.com/TouK/nussknacker/pull/8228) Fixed sorting by scenario status name in component usages view.
* [#7137](https://github.com/TouK/nussknacker/pull/7137) Updated Flink dependency to 1.20.1
* [#7137](https://github.com/TouK/nussknacker/pull/7137)[#8317](https://github.com/TouK/nussknacker/pull/8317) Updated Flink dependency to 1.20.2
* [#8239](https://github.com/TouK/nussknacker/pull/8239) Added a DB reference to the set of services that can be invoked from inside the `CustomHttpServiceProvider` implementation
* [#8242](https://github.com/TouK/nussknacker/pull/8242) Toolbar buttons can be disabled and their tooltip can be customized based on user roles
* Example of button configuration, using new settings:
Expand Down
2 changes: 1 addition & 1 deletion docs/MigrationGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ To see the biggest differences please consult the [changelog](Changelog.md).
Also, if you provide one element in `groupBy` expression, it will be presented as one element list instead of scalar.
* [#8011](https://github.com/TouK/nussknacker/pull/8011) During scenario compilation, redundant parameters used in node are treated only as warning now. They are skipped and compilation passes.
* [#8198](https://github.com/TouK/nussknacker/pull/8198) Support for test data without `sourceId` specified is removed - now, you always have to specify it
* [#7137](https://github.com/TouK/nussknacker/pull/7137) Updated Flink 1.19.2 -> 1.20.1.
* [#7137](https://github.com/TouK/nussknacker/pull/7137)[#8317](https://github.com/TouK/nussknacker/pull/8317) Updated Flink 1.19.2 -> 1.20.2.
* [#8209](https://github.com/TouK/nussknacker/pull/8209) Nussknacker now requires flink to be run with replaced `lib/flink-scala_2.12-x.x.x.jar` by `pl.touk:flink-scala` lib for the same scala version as used Nussknacker distribution. We provide prebuild flink docker images on [Docker Hub](https://hub.docker.com/r/touk/flink)

## In version 1.18.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ x-flink-service-with-postgres-driver: &flink-with-postgres-driver
context: ./flink/
dockerfile: FlinkWithPostgresDriverDockerfile
args:
FLINK_VERSION: "1.20.1-scala_2.12-java11"
FLINK_VERSION: "1.20.2-scala_2.12-java11"

services:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM flink:1.20.1-scala_2.12-java11
FROM flink:1.20.2-scala_2.12-java11

COPY entrypointWithIP.sh /
COPY conf.yml /
Expand Down
4 changes: 2 additions & 2 deletions examples/dev/local-testing.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ services:
build:
context: flink/
args:
FLINK_VERSION: "1.20.1-scala_2.12-java11"
FLINK_VERSION: "1.20.2-scala_2.12-java11"
restart: unless-stopped
command: jobmanager
ports:
Expand All @@ -159,7 +159,7 @@ services:
build:
context: flink/
args:
FLINK_VERSION: "1.20.1-scala_2.12-java11"
FLINK_VERSION: "1.20.2-scala_2.12-java11"
restart: unless-stopped
command: taskmanager
environment:
Expand Down
4 changes: 2 additions & 2 deletions examples/installation/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ services:
build:
context: ./flink/
args:
FLINK_VERSION: "1.1.3-SNAPSHOT-flink1.20.1-scala_2.12"
TOUK_FLINK_VERSION: "1.1.4-flink1.20.2-scala_2.12"
restart: unless-stopped
command: jobmanager
environment:
Expand All @@ -218,7 +218,7 @@ services:
build:
context: ./flink/
args:
FLINK_VERSION: "1.1.3-SNAPSHOT-flink1.20.1-scala_2.12"
TOUK_FLINK_VERSION: "1.1.4-flink1.20.2-scala_2.12"
restart: unless-stopped
command: taskmanager
environment:
Expand Down
4 changes: 2 additions & 2 deletions examples/installation/flink/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG FLINK_VERSION
ARG TOUK_FLINK_VERSION

FROM touk/flink:${FLINK_VERSION}
FROM touk/flink:${TOUK_FLINK_VERSION}

USER root
RUN echo '#!/bin/sh' > /ex-docker-entrypoint.sh && \
Expand Down
Loading