From b7d2351bf0c7d024befc947e31f1e3ba4253f9da Mon Sep 17 00:00:00 2001 From: Michael Luo <405726+wl21st@users.noreply.github.com> Date: Sun, 24 Apr 2022 13:52:26 -0700 Subject: [PATCH 1/3] Add version check plugin and bump to latest version, --- build.gradle | 11 ++++++----- common/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 8053a98c..ed7f2f85 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,9 @@ */ plugins { - id 'com.github.johnrengelman.shadow' version '7.0.0' apply false - id "com.diffplug.spotless" version "6.4.2" apply false + id 'com.github.johnrengelman.shadow' version '7.1.2' apply false + id "com.diffplug.spotless" version "6.5.0" apply false + id "com.github.ben-manes.versions" version '0.42.0' } description = "Flink Training Exercises" @@ -95,10 +96,10 @@ subprojects { ext { javaVersion = '1.8' - flinkVersion = '1.14.0' + flinkVersion = '1.14.4' scalaBinaryVersion = '2.12' - log4jVersion = '2.12.1' - junitVersion = '4.13' + log4jVersion = '2.17.2' + junitVersion = '4.13.2' } sourceCompatibility = javaVersion diff --git a/common/build.gradle b/common/build.gradle index 799963f8..6f563afb 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -32,5 +32,5 @@ dependencies { testApi "org.apache.flink:flink-runtime:${flinkVersion}:tests" testApi "org.apache.flink:flink-test-utils-junit:${flinkVersion}" testApi "org.apache.flink:flink-test-utils_${scalaBinaryVersion}:${flinkVersion}" - testApi 'org.assertj:assertj-core:3.20.2' + testApi 'org.assertj:assertj-core:3.22.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a97150..aa991fce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From d6b81a10a64f38a2403fac1330a12fcb441b3232 Mon Sep 17 00:00:00 2001 From: Michael Luo <405726+wl21st@users.noreply.github.com> Date: Mon, 30 Sep 2024 02:30:29 -0700 Subject: [PATCH 2/3] Upgrade the gradle to be able to use latest JDK version. --- gradle/wrapper/gradle-wrapper.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fce..7c3a7902 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Sep 30 02:29:21 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 9be79c9d7f797e24cfd80312a3e2f30f45ff9876 Mon Sep 17 00:00:00 2001 From: Michael Luo <405726+wl21st@users.noreply.github.com> Date: Mon, 30 Sep 2024 02:44:42 -0700 Subject: [PATCH 3/3] Upgrade the library and gradle version. --- build.gradle | 19 ++++++++++--------- common/build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index ed7f2f85..24febe7b 100644 --- a/build.gradle +++ b/build.gradle @@ -16,9 +16,9 @@ */ plugins { - id 'com.github.johnrengelman.shadow' version '7.1.2' apply false - id "com.diffplug.spotless" version "6.5.0" apply false - id "com.github.ben-manes.versions" version '0.42.0' + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id "com.diffplug.spotless" version "6.25.0" apply false + id "com.github.ben-manes.versions" version '0.51.0' } description = "Flink Training Exercises" @@ -95,10 +95,11 @@ subprojects { apply plugin: 'eclipse' ext { - javaVersion = '1.8' - flinkVersion = '1.14.4' + javaVersion = '11' + flinkVersion = '1.20.0' + flinkScalaVersion = '1.14.6' scalaBinaryVersion = '2.12' - log4jVersion = '2.17.2' + log4jVersion = '2.24.0' junitVersion = '4.13.2' } @@ -127,13 +128,13 @@ subprojects { shadow "org.apache.logging.log4j:log4j-api:${log4jVersion}" shadow "org.apache.logging.log4j:log4j-core:${log4jVersion}" - shadow "org.apache.flink:flink-clients_${scalaBinaryVersion}:${flinkVersion}" + shadow "org.apache.flink:flink-clients_${scalaBinaryVersion}:${flinkScalaVersion}" shadow "org.apache.flink:flink-java:${flinkVersion}" - shadow "org.apache.flink:flink-streaming-java_${scalaBinaryVersion}:${flinkVersion}" + shadow "org.apache.flink:flink-streaming-java_${scalaBinaryVersion}:${flinkScalaVersion}" shadow "org.apache.flink:flink-streaming-scala_${scalaBinaryVersion}:${flinkVersion}" // allows using Flink's web UI when running in the IDE: - shadow "org.apache.flink:flink-runtime-web_${scalaBinaryVersion}:${flinkVersion}" + shadow "org.apache.flink:flink-runtime-web_${scalaBinaryVersion}:${flinkScalaVersion}" if (project != project(":common")) { implementation project(path: ':common') diff --git a/common/build.gradle b/common/build.gradle index 6f563afb..cd5c46d7 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -28,9 +28,9 @@ java { // common set of dependencies dependencies { testApi "junit:junit:${junitVersion}" - testApi "org.apache.flink:flink-streaming-java_${scalaBinaryVersion}:${flinkVersion}:tests" + testApi "org.apache.flink:flink-streaming-java_${scalaBinaryVersion}:${flinkScalaVersion}:tests" testApi "org.apache.flink:flink-runtime:${flinkVersion}:tests" testApi "org.apache.flink:flink-test-utils-junit:${flinkVersion}" - testApi "org.apache.flink:flink-test-utils_${scalaBinaryVersion}:${flinkVersion}" - testApi 'org.assertj:assertj-core:3.22.0' + testApi "org.apache.flink:flink-test-utils_${scalaBinaryVersion}:${flinkScalaVersion}" + testApi 'org.assertj:assertj-core:3.26.3' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c3a7902..eae382a7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Sep 30 02:29:21 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists