fix: Dependency Clash with annotations-api

.github/workflows/deploy-release.yaml

@@ -28,4 +28,4 @@ jobs:
           ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
           ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
           ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
-        run: ./gradlew publishAllPublicationsToOSSRHReleaseRepository
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-configuration-cache

.github/workflows/deploy-snapshot.yaml

@@ -31,4 +31,4 @@ jobs:
           ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
           ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
           ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
-        run: ./gradlew publishAllPublicationsToOSSRHSnapshotRepository
+        run: ./gradlew publishToSonatype --no-configuration-cache

build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,16 @@ plugins {
     version
     kotlin("jvm")
     jacoco
+    alias(libs.plugins.gradle.nexus.publish.plugin)
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            username = System.getenv("ORG_OSSRH_USERNAME")
+            password = System.getenv("ORG_OSSRH_PASSWORD")
+        }
+    }
 }
 
 subprojects {
@@ -60,6 +70,12 @@ subprojects {
         }
         systemProperties = systemPropertiesMap
     }
+
+    // https://docs.gradle.org/current/userguide/dependency_locking.html
+    dependencyLocking {
+        lockAllConfigurations()
+        lockFile = file("$projectDir/gradle.lockfile")
+    }
 }
 
 @OptIn(ExperimentalPathApi::class)

buildSrc/src/main/kotlin/publish.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,9 @@ plugins {
 }
 
 interface PublishPluginExtension {
+    val artifactGroup: Property<String>
+    val artifactName: Property<String>
+    val artifactVersion: Property<String>
     val mavenPublicationName: Property<String>
     val componentName: Property<String>
     val description: Property<String>
@@ -32,29 +35,12 @@ val extension = project.extensions.create<PublishPluginExtension>("publish")
 
 afterEvaluate {
     publishing {
-        repositories {
-            maven {
-                name = "OSSRHRelease"
-
-                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                credentials {
-                    username = System.getenv("ORG_OSSRH_USERNAME")
-                    password = System.getenv("ORG_OSSRH_PASSWORD")
-                }
-            }
-            maven {
-                name = "OSSRHSnapshot"
-
-                url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-                credentials {
-                    username = System.getenv("ORG_OSSRH_USERNAME")
-                    password = System.getenv("ORG_OSSRH_PASSWORD")
-                }
-            }
-        }
         publications {
             register<MavenPublication>(extension.mavenPublicationName.get()) {
                 from(components[extension.componentName.get()])
+                groupId = extension.artifactGroup.getOrElse(project.group.toString())
+                artifactId = extension.artifactName.getOrElse(project.name)
+                version = extension.artifactVersion.getOrElse(project.version.toString())
 
                 pom {
                     name = "${project.group}:${project.name}"

gradle/libs.versions.toml

@@ -2,9 +2,8 @@
 androidGradlePlugin = "8.3.2" # Check with detekt table first: https://detekt.dev/docs/introduction/compatibility/
 detekt = "1.23.6"
 dockerJavaCore = "3.4.1"
-dokka = "1.9.10"
+dokka = "1.9.20"
 kotlin = "1.9.22"
-tomcatAnnotations = "6.0.53"
 ktlint = "0.0" # Maintained inside ktlint.gradle.kts
 grpc = "1.65.1"
 grpcKotlin = "1.4.1"
@@ -25,7 +24,6 @@ grpc-kotlin-stub = { group = "io.grpc", name = "grpc-kotlin-stub", version.ref =
 protoc-gen-grpc-kotlin = { group = "io.grpc", name = "protoc-gen-grpc-kotlin", version.ref = "grpcKotlin" }
 protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" }
 
-tomcat-annotations = { group = "org.apache.tomcat", name = "annotations-api", version.ref = "tomcatAnnotations" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 
@@ -44,4 +42,4 @@ grpc-protoc-java-gen = { group = "io.grpc", name = "protoc-gen-grpc-java", versi
 
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-pluginPublishing = { id = "com.gradle.plugin-publish", version = "1.2.1" }
+gradle-nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }

kuksa-java-sdk/build.gradle.kts

@@ -88,22 +88,19 @@ java {
 }
 
 dependencies {
-    api(project(":vss-core")) // Models are exposed
-
-    testImplementation(project(":test-core"))
-
-    // needs to be api as long as we expose ProtoBuf specific objects
-    api(libs.grpc.protobuf)
-    api(libs.protobuf.kotlin.lite)
-
     implementation(kotlin("reflect"))
 
+    api(project(":vss-core")) // models are exposed
+    api(libs.grpc.protobuf) // needs to be api as long as we expose ProtoBuf specific objects
+
+    implementation(libs.protobuf.kotlin.lite)
     implementation(libs.grpc.okhttp)
     implementation(libs.grpc.stub)
     implementation(libs.grpc.kotlin.stub)
-    implementation(libs.tomcat.annotations)
     implementation(libs.kotlinx.coroutines.core)
 
+    testImplementation(project(":test-core"))
+
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.kotest)
     testImplementation(libs.mockk)