From 14377533edc6c57348f799a6a2b83bf91eea1997 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 14 Feb 2024 08:00:37 +0100 Subject: [PATCH 1/5] Upgrade to Java 17 and Gradle 8.4 --- build.gradle.kts | 11 ++++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8f234c9..25e3d0e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,9 +5,9 @@ plugins { id("net.researchgate.release") version "3.0.2" id("com.bakdata.sonar") version "1.1.11" id("com.bakdata.sonatype") version "1.1.11" - id("org.hildan.github.changelog") version "1.12.1" + id("org.hildan.github.changelog") version "2.2.0" id("com.google.cloud.tools.jib") version "3.4.0" - id("io.freefair.lombok") version "6.6.3" + id("io.freefair.lombok") version "8.4" } allprojects { @@ -24,9 +24,10 @@ allprojects { } } -configure { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } configure { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b22d05..309b4e1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 8125fc0dc617bb622ddc6ee4979cdd1cc42a10b8 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 21 Feb 2024 10:18:05 +0100 Subject: [PATCH 2/5] Update plugins --- build.gradle.kts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f7f7c9a..bfde875 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,15 +1,27 @@ description = "An application to reset the state of Kafka Connect connectors" +buildscript { + repositories { + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + } + } + dependencies { + classpath("com.bakdata.gradle:sonar:1.1.16-SNAPSHOT") + } +} + plugins { `java-library` id("net.researchgate.release") version "3.0.2" - id("com.bakdata.sonar") version "1.1.14" id("com.bakdata.sonatype") version "1.1.14" id("org.hildan.github.changelog") version "2.2.0" id("com.google.cloud.tools.jib") version "3.4.0" id("io.freefair.lombok") version "8.4" } +apply(plugin = "com.bakdata.sonar") + allprojects { group = "com.bakdata.kafka" From 8333ebae1c548adab657445b75aa2f0a430e8e6b Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 21 Feb 2024 14:47:22 +0100 Subject: [PATCH 3/5] Empty-Commit From 4275df3984599f064a4ea703aa5d743a9cc7d4a0 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 21 Feb 2024 14:51:06 +0100 Subject: [PATCH 4/5] Empty-Commit From 03c0d62ae9a52228f24edff1891ce2bdefff1d45 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 21 Feb 2024 16:43:24 +0100 Subject: [PATCH 5/5] Update plugins --- build.gradle.kts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bfde875..60fcf15 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,27 +1,15 @@ description = "An application to reset the state of Kafka Connect connectors" -buildscript { - repositories { - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots") - } - } - dependencies { - classpath("com.bakdata.gradle:sonar:1.1.16-SNAPSHOT") - } -} - plugins { `java-library` id("net.researchgate.release") version "3.0.2" + id("com.bakdata.sonar") version "1.1.16" id("com.bakdata.sonatype") version "1.1.14" id("org.hildan.github.changelog") version "2.2.0" id("com.google.cloud.tools.jib") version "3.4.0" id("io.freefair.lombok") version "8.4" } -apply(plugin = "com.bakdata.sonar") - allprojects { group = "com.bakdata.kafka"