This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 89c3842845676e89377c1b9a94664c4641b92357 Author: Dominik Riemer <[email protected]> AuthorDate: Wed Dec 22 23:11:17 2021 +0100 [STREAMPIPES-486] Bump Flink version, add log4j to dependency management --- .../cli/deploy/standalone/jobmanager/docker-compose.yml | 2 +- .../cli/deploy/standalone/taskmanager/docker-compose.yml | 2 +- installer/compose/docker-compose.full.yml | 4 ++-- installer/k8s/values.yaml | 2 +- pom.xml | 14 ++++++++++++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/installer/cli/deploy/standalone/jobmanager/docker-compose.yml b/installer/cli/deploy/standalone/jobmanager/docker-compose.yml index fe692e9..ea436ae 100644 --- a/installer/cli/deploy/standalone/jobmanager/docker-compose.yml +++ b/installer/cli/deploy/standalone/jobmanager/docker-compose.yml @@ -16,7 +16,7 @@ version: "3.4" services: jobmanager: - image: fogsyio/flink:1.13.2-scala_2.11 + image: fogsyio/flink:1.13.5-scala_2.11 command: jobmanager environment: - JOB_MANAGER_RPC_ADDRESS=jobmanager diff --git a/installer/cli/deploy/standalone/taskmanager/docker-compose.yml b/installer/cli/deploy/standalone/taskmanager/docker-compose.yml index d7ecad3..6ff8a50 100644 --- a/installer/cli/deploy/standalone/taskmanager/docker-compose.yml +++ b/installer/cli/deploy/standalone/taskmanager/docker-compose.yml @@ -16,7 +16,7 @@ version: "3.4" services: taskmanager: - image: fogsyio/flink:1.13.2-scala_2.11 + image: fogsyio/flink:1.13.5-scala_2.11 depends_on: - jobmanager command: taskmanager diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml index 8d33814..38ae812 100644 --- a/installer/compose/docker-compose.full.yml +++ b/installer/compose/docker-compose.full.yml @@ -168,7 +168,7 @@ services: spnet: jobmanager: - image: fogsyio/flink:1.13.2-scala_2.11 + image: fogsyio/flink:1.13.5-scala_2.11 command: jobmanager environment: - JOB_MANAGER_RPC_ADDRESS=jobmanager @@ -178,7 +178,7 @@ services: spnet: taskmanager: - image: fogsyio/flink:1.13.2-scala_2.11 + image: fogsyio/flink:1.13.5-scala_2.11 depends_on: - jobmanager command: taskmanager diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml index 8b9263d..382f41e 100644 --- a/installer/k8s/values.yaml +++ b/installer/k8s/values.yaml @@ -27,7 +27,7 @@ external: activemqVersion: 5.15.9 consulVersion: 1.9.6 couchdbVersion: 2.3.1 - flinkVersion: 1.13.2-scala_2.11 + flinkVersion: 1.13.5-scala_2.11 kafkaVersion: 2.2.0 zookeeperVersion: 3.4.13 influxdbVersion: 1.7 diff --git a/pom.xml b/pom.xml index 8d0f2b2..63beeca 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ <consul-client.version>1.5.2</consul-client.version> <elasticsearch.version>6.6.2</elasticsearch.version> <empire-rdf4j.version>1.9.14</empire-rdf4j.version> - <flink.version>1.13.2</flink.version> + <flink.version>1.13.5</flink.version> <fogsy-qudt.version>1.0</fogsy-qudt.version> <fst.version>2.56</fst.version> <geojson-jackson.version>1.8</geojson-jackson.version> @@ -83,7 +83,7 @@ <jsr305.version>3.0.2</jsr305.version> <kafka.version>2.7.0</kafka.version> <lightcouch.version>0.2.0</lightcouch.version> - <log4j.version>2.12.1</log4j.version> + <log4j.version>2.17.0</log4j.version> <lz4.version>1.7.1</lz4.version> <logback-classic.version>1.2.3</logback-classic.version> <maven-invoker.version>2.2</maven-invoker.version> @@ -401,6 +401,16 @@ <version>${log4j.version}</version> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-invoker</artifactId> <version>${maven-invoker.version}</version>
