From 35af83e8ac5a79b53b07cf1834adfdd92195355d Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 28 Jan 2026 20:19:38 +0100 Subject: [PATCH 1/7] Upgrade Dokka to v2 --- gradle/libs.versions.toml | 4 ++-- settings.gradle.kts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41cc74d..31ef83f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ wiremock-junit = { group = "ru.lanwen.wiremock", name = "wiremock-junit5", versi [plugins] release = { id = "com.bakdata.release", version = "2.0.0" } sonar = { id = "com.bakdata.sonar", version = "2.0.0" } -sonatype = { id = "com.bakdata.sonatype", version = "2.0.0" } -dokka = { id = "org.jetbrains.dokka", version = "2.0.0" } +sonatype = { id = "com.bakdata.sonatype", version = "2.0.2-SNAPSHOT" } +dokka = { id = "org.jetbrains.dokka", version = "2.1.0" } kotlin = { id = "org.gradle.kotlin.kotlin-dsl", version = "6.4.2" } plugin-publish = { id = "com.gradle.plugin-publish", version = "2.0.0" } diff --git a/settings.gradle.kts b/settings.gradle.kts index fe6b927..af669c3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,7 @@ pluginManagement { repositories { gradlePluginPortal() + mavenLocal() } } From fc3b3a2624e2ce81d07b5df6a1e144ef275bdf75 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 28 Jan 2026 21:09:44 +0100 Subject: [PATCH 2/7] Upgrade Dokka to 2.1 --- .github/workflows/build-and-publish.yaml | 1 + settings.gradle.kts | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml index af0eaf0..f303698 100644 --- a/.github/workflows/build-and-publish.yaml +++ b/.github/workflows/build-and-publish.yaml @@ -13,6 +13,7 @@ jobs: uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.70.2 with: java-version: 21 + gradle-refresh-dependencies: true secrets: sonar-token: ${{ secrets.SONARCLOUD_TOKEN }} sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }} diff --git a/settings.gradle.kts b/settings.gradle.kts index af669c3..1c642d2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenLocal() + maven(url = "https://central.sonatype.com/repository/maven-snapshots") } } From e42cbc8a7c34587e8ca71194096de4553b72b87c Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Aug 2026 12:11:40 +0200 Subject: [PATCH 3/7] Update --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7208c1a..1874dbc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,6 @@ wiremock-junit = { group = "ru.lanwen.wiremock", name = "wiremock-junit5", versi release = { id = "com.bakdata.release", version = "2.2.0" } sonar = { id = "com.bakdata.sonar", version = "2.2.0" } sonatype = { id = "com.bakdata.sonatype", version = "2.2.1-SNAPSHOT" } -dokka = { id = "org.jetbrains.dokka", version = "2.2.0" } +dokka = { id = "org.jetbrains.dokka-javadoc", version = "2.2.0" } kotlin = { id = "org.gradle.kotlin.kotlin-dsl", version = "6.6.4" } plugin-publish = { id = "com.gradle.plugin-publish", version = "2.1.1" } From 176e0a9550b8dc67ab0ef6f23f5e4e1faf9541c4 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Aug 2026 12:51:18 +0200 Subject: [PATCH 4/7] Testing --- .../src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt index 73846fb..9c5aa5a 100644 --- a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt +++ b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt @@ -47,6 +47,13 @@ import java.time.Duration import kotlin.reflect.KMutableProperty1 import kotlin.reflect.KProperty1 +/** + * A group of *members*. + * + * This class has no useful logic; it's just a documentation example. + * + * @constructor Creates an empty group. + */ class SonatypePlugin : Plugin { private val log = Logging.getLogger(SonatypePlugin::class.java) From 269bd040f9c681d453c8ddbe6147f68ed060616a Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Aug 2026 13:11:06 +0200 Subject: [PATCH 5/7] Fix JavaDoc --- gradle.properties | 2 +- .../src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index c955bf6..f5b4617 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.2.1-SNAPSHOT +version=2.2.2-SNAPSHOT org.gradle.caching=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx2048m diff --git a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt index 9c5aa5a..73846fb 100644 --- a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt +++ b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt @@ -47,13 +47,6 @@ import java.time.Duration import kotlin.reflect.KMutableProperty1 import kotlin.reflect.KProperty1 -/** - * A group of *members*. - * - * This class has no useful logic; it's just a documentation example. - * - * @constructor Creates an empty group. - */ class SonatypePlugin : Plugin { private val log = Logging.getLogger(SonatypePlugin::class.java) From 22c4df73ae15a953401513a45ad95dce1665fd49 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Aug 2026 14:03:18 +0200 Subject: [PATCH 6/7] Revert temp changes --- .github/workflows/build-and-publish.yaml | 2 -- gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml index f8eb5b3..b161a67 100644 --- a/.github/workflows/build-and-publish.yaml +++ b/.github/workflows/build-and-publish.yaml @@ -12,8 +12,6 @@ jobs: build-and-publish: name: Java Gradle uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.82.1 - with: - gradle-refresh-dependencies: true secrets: sonar-token: ${{ secrets.SONARCLOUD_TOKEN }} sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }} diff --git a/gradle.properties b/gradle.properties index f5b4617..c955bf6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.2.2-SNAPSHOT +version=2.2.1-SNAPSHOT org.gradle.caching=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx2048m diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1874dbc..7d395db 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ wiremock-junit = { group = "ru.lanwen.wiremock", name = "wiremock-junit5", versi [plugins] release = { id = "com.bakdata.release", version = "2.2.0" } sonar = { id = "com.bakdata.sonar", version = "2.2.0" } -sonatype = { id = "com.bakdata.sonatype", version = "2.2.1-SNAPSHOT" } +sonatype = { id = "com.bakdata.sonatype", version = "2.2.1" } dokka = { id = "org.jetbrains.dokka-javadoc", version = "2.2.0" } kotlin = { id = "org.gradle.kotlin.kotlin-dsl", version = "6.6.4" } plugin-publish = { id = "com.gradle.plugin-publish", version = "2.1.1" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 1c642d2..fe6b927 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,6 @@ pluginManagement { repositories { gradlePluginPortal() - mavenLocal() - maven(url = "https://central.sonatype.com/repository/maven-snapshots") } } From 153092847a631b8be326adc9439cb027ea88699a Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Aug 2026 14:06:05 +0200 Subject: [PATCH 7/7] Update --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d395db..6f43541 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,8 +14,8 @@ wiremock = { group = "org.wiremock", name = "wiremock", version = "3.13.2" } wiremock-junit = { group = "ru.lanwen.wiremock", name = "wiremock-junit5", version = "1.3.1" } [plugins] -release = { id = "com.bakdata.release", version = "2.2.0" } -sonar = { id = "com.bakdata.sonar", version = "2.2.0" } +release = { id = "com.bakdata.release", version = "2.2.1" } +sonar = { id = "com.bakdata.sonar", version = "2.2.1" } sonatype = { id = "com.bakdata.sonatype", version = "2.2.1" } dokka = { id = "org.jetbrains.dokka-javadoc", version = "2.2.0" } kotlin = { id = "org.gradle.kotlin.kotlin-dsl", version = "6.6.4" }