From de3507fdf56cd4b47b148be7195250d71eb670d7 Mon Sep 17 00:00:00 2001 From: Kai Bernhard <17817496+kaibernhard@users.noreply.github.com> Date: Fri, 25 Aug 2023 11:39:42 +0200 Subject: [PATCH] Configure versions to keep in version-catalog-conventions --- .talismanrc | 2 ++ ...gitalservice.version-catalog-conventions.gradle.kts | 7 +++++++ gradle/libs.versions.toml | 10 ---------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.talismanrc b/.talismanrc index 88e7dd6..e951095 100644 --- a/.talismanrc +++ b/.talismanrc @@ -11,3 +11,5 @@ fileignoreconfig: checksum: 9e61ff7423d64063bd392c1a476fa305fbdc2266ad08c22d3423bfebddabab19 - filename: .github/workflows/scan.yml checksum: 4250f5d63ec7447ff24a329b68528d8a584b98e4013932aab6ae773c13cf9c59 + - filename: buildSrc/src/main/kotlin/de.bund.digitalservice.version-catalog-conventions.gradle.kts + checksum: 72b1198910484daad9f2b08848f9504c0ec95dee592a45c0b14c2583b10d3b0b diff --git a/buildSrc/src/main/kotlin/de.bund.digitalservice.version-catalog-conventions.gradle.kts b/buildSrc/src/main/kotlin/de.bund.digitalservice.version-catalog-conventions.gradle.kts index b89d8c3..c995f58 100644 --- a/buildSrc/src/main/kotlin/de.bund.digitalservice.version-catalog-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/de.bund.digitalservice.version-catalog-conventions.gradle.kts @@ -15,3 +15,10 @@ tasks { rejectVersionIf { !isStable(candidate.version) } } } + +versionCatalogUpdate { + keep { + versions.set(listOf("jacoco")) + keepUnusedPlugins.set(true) + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b263609..6684c9d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,4 @@ [versions] -# @keep jacoco = "0.8.10" kotlin = "1.9.0" spring-boot = "3.1.2" @@ -23,22 +22,13 @@ spring-security-test = { module = "org.springframework.security:spring-security- springmockk = "com.ninja-squad:springmockk:4.0.2" [plugins] -# @keep dependency-license-report = "com.github.jk1.dependency-license-report:2.5" -# @keep kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } -# @keep sonarqube = "org.sonarqube:4.3.0.3225" -# @keep spotless = "com.diffplug.spotless:6.20.0" -# @keep spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" } -# @keep spring-dependency-management = "io.spring.dependency-management:1.1.3" -# @keep test-logger = "com.adarshr.test-logger:3.2.0" -# @keep version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.1" -# @keep versions = "com.github.ben-manes.versions:0.47.0"