From 4cb6ebf52d727ddf7fc2cbffe9646f5b38d84bb6 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Sat, 3 May 2025 18:03:30 +0100 Subject: [PATCH 1/4] Bump version -> `2.0.0-SNAPSHOT.331` --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index b67da822c7..d6a3e5bdc8 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -29,4 +29,4 @@ * * For Spine-based dependencies please see [io.spine.dependency.local.Spine]. */ -val validationVersion by extra("2.0.0-SNAPSHOT.330") +val validationVersion by extra("2.0.0-SNAPSHOT.331") From f815f764c0d171da4f907b0c4f61bd444b35b202 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Sat, 3 May 2025 18:07:11 +0100 Subject: [PATCH 2/4] Force `Jupiter` artifacts via `BomsPlugin` --- .../kotlin/io/spine/dependency/boms/BomsPlugin.kt | 12 ++++++++---- model/build.gradle.kts | 3 --- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/boms/BomsPlugin.kt b/buildSrc/src/main/kotlin/io/spine/dependency/boms/BomsPlugin.kt index 7366a3be5f..49cfae22cf 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/boms/BomsPlugin.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/boms/BomsPlugin.kt @@ -30,6 +30,7 @@ import io.gitlab.arturbosch.detekt.getSupportedKotlinVersion import io.spine.dependency.DependencyWithBom import io.spine.dependency.kotlinx.Coroutines import io.spine.dependency.lib.Kotlin +import io.spine.dependency.test.JUnit import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.artifacts.Configuration @@ -181,14 +182,17 @@ private fun Project.forceArtifacts() = log { "Forced the version of `$artifact` in " + this@all.diagSuffix(project) } } - fun forceAll(artifacts: Iterable) = artifacts.forEach { artifact -> + fun forceAll(artifacts: Map) = artifacts.values.forEach { artifact -> forceWithLogging(artifact) } if (!isDetekt) { - forceAll(Kotlin.artifacts.values) - forceAll(Kotlin.StdLib.artifacts.values) - forceAll(Coroutines.artifacts.values) + forceAll(Kotlin.artifacts) + forceAll(Kotlin.StdLib.artifacts) + forceAll(Coroutines.artifacts) + forceAll(JUnit.Jupiter.artifacts) /* + for configurations like `testFixturesCompileProtoPath`. + */ } } } diff --git a/model/build.gradle.kts b/model/build.gradle.kts index 9dceb7e74a..dbff68cb95 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -46,12 +46,9 @@ dependencies { implementation(project(":java-api")) implementation(project(":java-runtime")) - val enforcedJUnit = enforcedPlatform(JUnit.bom) - testImplementation(enforcedJUnit) testImplementation(Logging.testLib)?.because("We need `tapConsole`.") testImplementation(ProtoData.testlib) - testFixturesImplementation(enforcedJUnit) testFixturesImplementation(project(":proto:configuration")) testFixturesImplementation(ProtoData.api) testFixturesImplementation(ProtoData.testlib) From b564af7db9493604c67ddea15b91601da5eb749e Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Sat, 3 May 2025 18:07:26 +0100 Subject: [PATCH 3/4] Update dependency reports --- dependencies.md | 60 ++++++++++++++++++++++++------------------------- pom.xml | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dependencies.md b/dependencies.md index 9d5a29a95e..a22fe99551 100644 --- a/dependencies.md +++ b/dependencies.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine.validation:spine-validation-java:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-java:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -1008,12 +1008,12 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:54 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:25 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-java-api:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-java-api:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -2021,12 +2021,12 @@ This report was generated on **Sat May 03 17:16:54 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:54 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:25 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-java-bundle:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-java-bundle:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : org.jetbrains. **Name** : annotations. **Version** : 26.0.2. @@ -2752,12 +2752,12 @@ This report was generated on **Sat May 03 17:16:54 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:54 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:25 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-java-runtime:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-java-runtime:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -3543,12 +3543,12 @@ This report was generated on **Sat May 03 17:16:54 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:54 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:26 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-java-tests:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-java-tests:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -4624,12 +4624,12 @@ This report was generated on **Sat May 03 17:16:54 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:55 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:26 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-model:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-model:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -5645,12 +5645,12 @@ This report was generated on **Sat May 03 17:16:55 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:55 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:26 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-proto:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-proto:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -6727,12 +6727,12 @@ This report was generated on **Sat May 03 17:16:55 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:55 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:27 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-consumer:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-consumer:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -7740,12 +7740,12 @@ This report was generated on **Sat May 03 17:16:55 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:56 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:27 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-consumer-dependency:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-consumer-dependency:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -8696,12 +8696,12 @@ This report was generated on **Sat May 03 17:16:56 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:56 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:27 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-extensions:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-extensions:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -9773,12 +9773,12 @@ This report was generated on **Sat May 03 17:16:56 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:56 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:27 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-runtime:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-runtime:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -10729,12 +10729,12 @@ This report was generated on **Sat May 03 17:16:56 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:56 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:28 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-validating:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-validating:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -11689,12 +11689,12 @@ This report was generated on **Sat May 03 17:16:56 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:57 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:28 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-vanilla:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-vanilla:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -12581,12 +12581,12 @@ This report was generated on **Sat May 03 17:16:57 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:57 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:28 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-configuration:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-configuration:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -13658,12 +13658,12 @@ This report was generated on **Sat May 03 17:16:57 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:57 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat May 03 18:06:28 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.validation:spine-validation-context:2.0.0-SNAPSHOT.330` +# Dependencies of `io.spine.validation:spine-validation-context:2.0.0-SNAPSHOT.331` ## Runtime 1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.18.3. @@ -14735,4 +14735,4 @@ This report was generated on **Sat May 03 17:16:57 WEST 2025** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat May 03 17:16:57 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file +This report was generated on **Sat May 03 18:06:28 WEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file diff --git a/pom.xml b/pom.xml index ea40ef3a2b..120bd55535 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject. --> io.spine.validation validation -2.0.0-SNAPSHOT.330 +2.0.0-SNAPSHOT.331 2015 From 7cfff5544d4b22e69ba1f62f3ed23d2b1858ff68 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Sat, 3 May 2025 18:11:15 +0100 Subject: [PATCH 4/4] Optimise imports --- model/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/model/build.gradle.kts b/model/build.gradle.kts index dbff68cb95..c87c453644 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -27,7 +27,6 @@ import io.spine.dependency.local.CoreJava import io.spine.dependency.local.Logging import io.spine.dependency.local.ProtoData -import io.spine.dependency.test.JUnit plugins { java