From eba6a3ef994b5a106c07bf5b32cf99ba238a59ee Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sun, 13 Apr 2025 16:29:57 +0200 Subject: [PATCH 1/4] remove unused dependencies Signed-off-by: Manfred Hanke Signed-off-by: Peter Gafert --- archunit-junit/build.gradle | 10 ---------- archunit-junit/junit4/build.gradle | 8 -------- archunit-junit/junit5/engine-api/build.gradle | 4 ---- 3 files changed, 22 deletions(-) diff --git a/archunit-junit/build.gradle b/archunit-junit/build.gradle index a449537e66..ec8515d3eb 100644 --- a/archunit-junit/build.gradle +++ b/archunit-junit/build.gradle @@ -36,16 +36,11 @@ artifacts { dependencies { archJunitApi project(path: ':archunit', configuration: 'shadow') dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) } - implementation dependency.slf4j testImplementation dependency.junit4 testImplementation dependency.junit_dataprovider testImplementation dependency.mockito testImplementation dependency.assertj - testImplementation(dependency.assertj_guava) { - exclude module: 'assertj-core' - exclude module: 'guava' - } testImplementation project(path: ':archunit', configuration: 'tests') // This is a hack for running tests with IntelliJ instead of delegating to Gradle, @@ -53,16 +48,11 @@ dependencies { testRuntimeOnly dependency.asm } -archUnitTest { - providesTestJar = true -} - shadowJar { exclude 'META-INF/**' dependencies { exclude(project(':archunit')) - exclude(dependency(dependency.slf4j)) } } diff --git a/archunit-junit/junit4/build.gradle b/archunit-junit/junit4/build.gradle index b84799d800..bdacfebb2f 100644 --- a/archunit-junit/junit4/build.gradle +++ b/archunit-junit/junit4/build.gradle @@ -10,18 +10,11 @@ dependencies { api dependency.junit4 implementation project(path: ':archunit-junit', configuration: 'shadow') dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) } - implementation dependency.slf4j testImplementation dependency.junit4 - testImplementation dependency.junit_dataprovider testImplementation dependency.mockito testImplementation dependency.assertj - testImplementation(dependency.assertj_guava) { - exclude module: 'assertj-core' - exclude module: 'guava' - } testImplementation project(path: ':archunit', configuration: 'tests') - testImplementation project(path: ':archunit-junit', configuration: 'tests') // This is a hack for running tests with IntelliJ instead of delegating to Gradle, // because for some reason this dependency cannot be resolved otherwise :-( @@ -43,7 +36,6 @@ shadowJar { dependencies { exclude(project(':archunit')) exclude(dependency(dependency.junit4)) - exclude(dependency(dependency.slf4j)) exclude(dependency(dependency.hamcrest)) // Shadow doesn't respect transitive excludes :-( } } diff --git a/archunit-junit/junit5/engine-api/build.gradle b/archunit-junit/junit5/engine-api/build.gradle index dffc0e57e2..fbc2cf26a2 100644 --- a/archunit-junit/junit5/engine-api/build.gradle +++ b/archunit-junit/junit5/engine-api/build.gradle @@ -9,13 +9,9 @@ ext.minimumJavaVersion = JavaVersion.VERSION_1_8 dependencies { api dependency.junitPlatformEngine implementation project(path: ':archunit') - dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) } - implementation dependency.slf4j testImplementation project(path: ':archunit-junit5-api') - testImplementation project(path: ':archunit', configuration: 'tests') testImplementation dependency.assertj - testImplementation dependency.mockito } compileJava.dependsOn project(':archunit-junit5-api').finishArchive From c103ab242dda22f5724607b58d35563167780367 Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sun, 13 Apr 2025 16:29:49 +0200 Subject: [PATCH 2/4] simplify dependency exclusion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `it` in the `exclude(dependency { /*...*/ })` closure of [DependencyFilter](https://github.com/GradleUp/shadow/blob/8.3.6/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter.groovy) is a [`org.gradle.api.artifacts.ResolvedDependency`](https://docs.gradle.org/current/javadoc/org/gradle/api/artifacts/ResolvedDependency.html), whose [`name`](https://github.com/gradle/gradle/blob/v8.13.0/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultResolvedDependency.java#L76-L78) is a `String`. When the comparison `it.name != dependency.guava` was introduced with 18c5d18e345cdc0bca50bf4348ab3fa8c11b09be, `dependency.guava` was String that could be compared against `it.name`, but 82d61ad39301d0e6fd7604232159ade3835c110c has changed this those to a `Map`. However `dependency.guava` is relocated anyway – and hence removed by the `removeDuplicateThirdParty` task (as it is transitively available in `archunit.jar`), so we can simply drop `dependency.guava` from not being excluded in the `shadowJar`. Signed-off-by: Manfred Hanke --- archunit-junit/junit5/api/build.gradle | 3 +-- archunit-junit/junit5/engine-api/build.gradle | 2 +- archunit-junit/junit5/engine/build.gradle | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/archunit-junit/junit5/api/build.gradle b/archunit-junit/junit5/api/build.gradle index 369cc510bb..5d2e620e31 100644 --- a/archunit-junit/junit5/api/build.gradle +++ b/archunit-junit/junit5/api/build.gradle @@ -23,8 +23,7 @@ shadowJar { exclude 'META-INF/maven/**' dependencies { - exclude(project(':archunit')) - exclude(dependency { it.name != dependency.guava && !it.name.contains('archunit-junit') }) + exclude(dependency { !it.name.contains('archunit-junit') }) } } diff --git a/archunit-junit/junit5/engine-api/build.gradle b/archunit-junit/junit5/engine-api/build.gradle index fbc2cf26a2..32fbf6a702 100644 --- a/archunit-junit/junit5/engine-api/build.gradle +++ b/archunit-junit/junit5/engine-api/build.gradle @@ -26,7 +26,7 @@ shadowJar { exclude 'META-INF/maven/**' dependencies { - exclude(dependency { it.name != dependency.guava }) + exclude(dependency { true }) } } diff --git a/archunit-junit/junit5/engine/build.gradle b/archunit-junit/junit5/engine/build.gradle index 8100031f2d..a8a43d79a4 100644 --- a/archunit-junit/junit5/engine/build.gradle +++ b/archunit-junit/junit5/engine/build.gradle @@ -45,7 +45,7 @@ shadowJar { dependencies { exclude(dependency { def isApi = it.configuration == 'archJunitApi' - def isUnwantedDependency = it.name != dependency.guava && it.moduleName != 'archunit-junit' + def isUnwantedDependency = it.moduleName != 'archunit-junit' isUnwantedDependency || isApi }) } From 7d3bc3540bffc8641cc4eb5583234d09210772b8 Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sat, 12 Apr 2025 23:48:30 +0200 Subject: [PATCH 3/4] use Gradle version catalog for ArchUnit dependencies The [version catalog](https://docs.gradle.org/current/userguide/version_catalogs.html) `libs.version.toml` is [recognized by dependabot](https://docs.github.com/en/code-security/dependabot/ecosystems-supported-by-dependabot/supported-ecosystems-and-repositories#gradle). Signed-off-by: Manfred Hanke Signed-off-by: Peter Gafert --- archunit-3rd-party-test/build.gradle | 6 ++--- archunit-example/example-plain/build.gradle | 2 +- archunit-integration-test/build.gradle | 4 +-- archunit-junit/build.gradle | 10 +++---- archunit-junit/junit4/build.gradle | 14 +++++----- archunit-junit/junit5/api/build.gradle | 2 +- archunit-junit/junit5/engine-api/build.gradle | 4 +-- archunit-junit/junit5/engine/build.gradle | 10 +++---- archunit-maven-test/build.gradle | 9 ++++--- archunit-maven-test/pom.xml.template | 6 ++--- archunit/build.gradle | 20 +++++++------- build.gradle | 22 +--------------- ...unit.java-release-check-conventions.gradle | 4 ++- .../archunit.java-testing-conventions.gradle | 8 +++--- .../archunit.license-conventions.gradle | 12 ++++----- gradle/libs.versions.toml | 26 +++++++++++++++++++ 16 files changed, 85 insertions(+), 74 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/archunit-3rd-party-test/build.gradle b/archunit-3rd-party-test/build.gradle index 90ff8bf6f5..2dee23b9a5 100644 --- a/archunit-3rd-party-test/build.gradle +++ b/archunit-3rd-party-test/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation project(path: ':archunit', configuration: 'tests') testImplementation dependency.springBootLoader dependency.addGuava { dependencyNotation, config -> testImplementation(dependencyNotation, config) } - testImplementation dependency.junit4 - testImplementation dependency.junit_dataprovider - testImplementation dependency.assertj + testImplementation libs.junit4 + testImplementation libs.junitDataprovider + testImplementation libs.assertj } diff --git a/archunit-example/example-plain/build.gradle b/archunit-example/example-plain/build.gradle index cec9903a34..256e5319de 100644 --- a/archunit-example/example-plain/build.gradle +++ b/archunit-example/example-plain/build.gradle @@ -9,7 +9,7 @@ dependencies { // we still use JUnit 4 as the test runner, but we don't use JUnit 4 support within this project // so tests could well be run using TestNG, etc. - testImplementation dependency.junit4 + testImplementation libs.junit4 } test { diff --git a/archunit-integration-test/build.gradle b/archunit-integration-test/build.gradle index 28032ef4a1..50cb2c18f9 100644 --- a/archunit-integration-test/build.gradle +++ b/archunit-integration-test/build.gradle @@ -7,8 +7,8 @@ ext.moduleName = 'com.tngtech.archunit.integrationtest' ext.minimumJavaVersion = JavaVersion.VERSION_1_8 dependencies { - testImplementation dependency.junitPlatform - testImplementation dependency.assertj + testImplementation libs.junitPlatform + testImplementation libs.assertj testImplementation project(path: ':archunit', configuration: 'tests') testImplementation project(path: ':archunit-junit4') testImplementation project(path: ':archunit-junit5-api') diff --git a/archunit-junit/build.gradle b/archunit-junit/build.gradle index ec8515d3eb..2efd216be5 100644 --- a/archunit-junit/build.gradle +++ b/archunit-junit/build.gradle @@ -37,15 +37,15 @@ dependencies { archJunitApi project(path: ':archunit', configuration: 'shadow') dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) } - testImplementation dependency.junit4 - testImplementation dependency.junit_dataprovider - testImplementation dependency.mockito - testImplementation dependency.assertj + testImplementation libs.junit4 + testImplementation libs.junitDataprovider + testImplementation libs.mockito + testImplementation libs.assertj testImplementation project(path: ':archunit', configuration: 'tests') // This is a hack for running tests with IntelliJ instead of delegating to Gradle, // because for some reason this dependency cannot be resolved otherwise :-( - testRuntimeOnly dependency.asm + testRuntimeOnly libs.asm } shadowJar { diff --git a/archunit-junit/junit4/build.gradle b/archunit-junit/junit4/build.gradle index bdacfebb2f..6d2a9049e7 100644 --- a/archunit-junit/junit4/build.gradle +++ b/archunit-junit/junit4/build.gradle @@ -7,18 +7,18 @@ ext.moduleName = 'com.tngtech.archunit.junit4' dependencies { api project(path: ':archunit', configuration: 'shadow') api project(path: ':archunit-junit', configuration: 'archJunitApi') - api dependency.junit4 + api libs.junit4 implementation project(path: ':archunit-junit', configuration: 'shadow') dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) } - testImplementation dependency.junit4 - testImplementation dependency.mockito - testImplementation dependency.assertj + testImplementation libs.junit4 + testImplementation libs.mockito + testImplementation libs.assertj testImplementation project(path: ':archunit', configuration: 'tests') // This is a hack for running tests with IntelliJ instead of delegating to Gradle, // because for some reason this dependency cannot be resolved otherwise :-( - testRuntimeOnly dependency.asm + testRuntimeOnly libs.asm } javadoc { @@ -35,8 +35,8 @@ shadowJar { dependencies { exclude(project(':archunit')) - exclude(dependency(dependency.junit4)) - exclude(dependency(dependency.hamcrest)) // Shadow doesn't respect transitive excludes :-( + exclude(dependency("${libs.junit4.get()}")) + exclude(dependency("${libs.hamcrest.get()}")) // Shadow doesn't respect transitive excludes :-( } } diff --git a/archunit-junit/junit5/api/build.gradle b/archunit-junit/junit5/api/build.gradle index 5d2e620e31..a5ba74a134 100644 --- a/archunit-junit/junit5/api/build.gradle +++ b/archunit-junit/junit5/api/build.gradle @@ -9,7 +9,7 @@ ext.minimumJavaVersion = JavaVersion.VERSION_1_8 dependencies { api project(path: ':archunit') api project(path: ':archunit-junit', configuration: 'archJunitApi') - api dependency.junitPlatformCommons + api libs.junitPlatformCommons } javadoc { diff --git a/archunit-junit/junit5/engine-api/build.gradle b/archunit-junit/junit5/engine-api/build.gradle index 32fbf6a702..210e95230f 100644 --- a/archunit-junit/junit5/engine-api/build.gradle +++ b/archunit-junit/junit5/engine-api/build.gradle @@ -7,11 +7,11 @@ ext.moduleName = 'com.tngtech.archunit.junit5.engineapi' ext.minimumJavaVersion = JavaVersion.VERSION_1_8 dependencies { - api dependency.junitPlatformEngine + api libs.junitPlatformEngine implementation project(path: ':archunit') testImplementation project(path: ':archunit-junit5-api') - testImplementation dependency.assertj + testImplementation libs.assertj } compileJava.dependsOn project(':archunit-junit5-api').finishArchive diff --git a/archunit-junit/junit5/engine/build.gradle b/archunit-junit/junit5/engine/build.gradle index a8a43d79a4..810e81e54f 100644 --- a/archunit-junit/junit5/engine/build.gradle +++ b/archunit-junit/junit5/engine/build.gradle @@ -12,13 +12,13 @@ dependencies { api project(path: ':archunit-junit5-engine-api') implementation project(path: ':archunit-junit') dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) } - implementation dependency.slf4j + implementation libs.slf4j testImplementation project(path: ':archunit', configuration: 'tests') - testImplementation dependency.assertj - testImplementation dependency.mockito - testImplementation dependency.mockito_junit5 - testImplementation dependency.log4j_core + testImplementation libs.assertj + testImplementation libs.mockito + testImplementation libs.mockito.junit5 + testImplementation libs.log4j.core } gradle.projectsEvaluated { diff --git a/archunit-maven-test/build.gradle b/archunit-maven-test/build.gradle index ca74c13ce0..31c60e66c7 100644 --- a/archunit-maven-test/build.gradle +++ b/archunit-maven-test/build.gradle @@ -118,6 +118,7 @@ def addMavenTest = { IntegrationTestConfig config -> createAllRepositoryTags(getRepoUrls(project.getProperty('mavenRepos'))) : '' + def versionCatalog = versionCatalogs.named("libs") mavenPom.text = mavenPom.text .replace('#{archunit.version}', "${version}") .replace('#{archunitTestArtifact}', config.archunitTestArtifact) @@ -125,8 +126,10 @@ def addMavenTest = { IntegrationTestConfig config -> .replace('#{javaVersion}', "${config.javaVersion}") .replace('#{additionalDependencies}', config.additionalDependencies ?: '') .replace('#{surefireExampleConfiguration}', config.surefireExampleConfiguration) - .replaceAll(/#\{dependency.([^}:]+):?([^}]*)}/) { all, dependencyReference, scope -> - def targetDependency = dependency[dependencyReference] + .replaceAll(/#\{(dependency|libs).([^}:]+):?([^}]*)}/) { all, catalog, dependencyReference, scope -> + def targetDependency = catalog == "libs" ? + versionCatalog.findLibrary(dependencyReference).get().get() : + dependency[dependencyReference] def scopePart = scope ? "\n ${scope}" : '' """ | @@ -212,7 +215,7 @@ List integrationTestConfigs = [ ) ] -def vintageEngine = dependency.junit5VintageEngine +def vintageEngine = libs.junit5VintageEngine.get() integrationTestConfigs << new IntegrationTestConfig( javaVersion: integrationTestJavaVersion, testType: TestType.JUNIT5, diff --git a/archunit-maven-test/pom.xml.template b/archunit-maven-test/pom.xml.template index edf40686ed..1b6fb1e3ea 100644 --- a/archunit-maven-test/pom.xml.template +++ b/archunit-maven-test/pom.xml.template @@ -57,9 +57,9 @@ #{dependency.jakartaInject} #{dependency.jakartaAnnotations} #{dependency.guice} - #{dependency.junit4:test} - #{dependency.junit_dataprovider:test} - #{dependency.assertj:test} + #{libs.junit4:test} + #{libs.junitDataprovider:test} + #{libs.assertj:test} #{dependency.joox:test} #{additionalDependencies} diff --git a/archunit/build.gradle b/archunit/build.gradle index 16a18ff1d0..0eda647d7a 100644 --- a/archunit/build.gradle +++ b/archunit/build.gradle @@ -5,17 +5,17 @@ plugins { ext.moduleName = 'com.tngtech.archunit' dependencies { - api dependency.slf4j - implementation dependency.asm + api libs.slf4j + implementation libs.asm dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) } - testImplementation dependency.log4j_api - testImplementation dependency.log4j_core - testImplementation dependency.junit4 - testImplementation dependency.junit_dataprovider - testImplementation dependency.mockito - testImplementation dependency.assertj - testImplementation(dependency.assertj_guava) { + testImplementation libs.log4j.api + testImplementation libs.log4j.core + testImplementation libs.junit4 + testImplementation libs.junitDataprovider + testImplementation libs.mockito + testImplementation libs.assertj + testImplementation(libs.assertj.guava) { exclude module: 'assertj-core' exclude module: 'guava' } @@ -25,7 +25,7 @@ shadowJar { exclude 'META-INF/**' dependencies { - exclude(dependency(dependency.slf4j)) + exclude(dependency("${libs.slf4j.get()}")) } } diff --git a/build.gradle b/build.gradle index 9036950ee6..557570181d 100644 --- a/build.gradle +++ b/build.gradle @@ -35,34 +35,14 @@ ext { googleRelocationPackage = "${thirdPartyRelocationPackage}.com.google" dependency = [ - asm : [group: 'org.ow2.asm', name: 'asm', version: '9.8'], - guava : [group: 'com.google.guava', name: 'guava', version: '33.4.8-jre'], addGuava : { dependencyHandler -> - dependencyHandler(dependency.guava) { + dependencyHandler(libs.guava) { exclude module: 'listenablefuture' exclude module: 'jspecify' exclude module: 'error_prone_annotations' exclude module: 'j2objc-annotations' } }, - slf4j : [group: 'org.slf4j', name: 'slf4j-api', version: '2.0.17'], - log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.24.3'], - log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.24.3'], - log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.24.3'], - - junit4 : [group: 'junit', name: 'junit', version: '4.13.2'], - junit5Jupiter : [group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.12.2'], - junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.12.2'], - junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.12.2'], - junitPlatformCommons : [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.12.2'], - junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.12.2'], - junitPlatformLauncher: [group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.2'], - hamcrest : [group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3'], - junit_dataprovider : [group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.11.0'], - mockito : [group: 'org.mockito', name: 'mockito-core', version: '4.11.0'], // mockito 5 requires Java 11 - mockito_junit5 : [group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.6.1'], - assertj : [group: 'org.assertj', name: 'assertj-core', version: '3.27.3'], - assertj_guava : [group: 'org.assertj', name: 'assertj-guava', version: '3.27.3'], // Dependencies for example projects / tests javaxAnnotationApi : [group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'], diff --git a/buildSrc/src/main/groovy/archunit.java-release-check-conventions.gradle b/buildSrc/src/main/groovy/archunit.java-release-check-conventions.gradle index 6ee53b462a..ed8a2b516d 100644 --- a/buildSrc/src/main/groovy/archunit.java-release-check-conventions.gradle +++ b/buildSrc/src/main/groovy/archunit.java-release-check-conventions.gradle @@ -17,7 +17,9 @@ task ensureReleaseCheckUpToDate { } releaseCheckDependencies.each { releaseCheckDependency -> - def matchingProjectDependency = dependency.values().find { + VersionCatalog versionCatalog = versionCatalogs.named("libs") + def dependencies = versionCatalog.libraryAliases.collect { versionCatalog.findLibrary(it).get().get() } + def matchingProjectDependency = dependencies.find { it.group == releaseCheckDependency.groupId && it.name == releaseCheckDependency.artifactId } assert matchingProjectDependency != null: diff --git a/buildSrc/src/main/groovy/archunit.java-testing-conventions.gradle b/buildSrc/src/main/groovy/archunit.java-testing-conventions.gradle index fc1ed312d2..8dcd5ccd64 100644 --- a/buildSrc/src/main/groovy/archunit.java-testing-conventions.gradle +++ b/buildSrc/src/main/groovy/archunit.java-testing-conventions.gradle @@ -9,11 +9,11 @@ abstract class ArchUnitTestExtension { ext.archUnitTest = extensions.create('archUnitTest', ArchUnitTestExtension) dependencies { - testImplementation dependency.junit5Jupiter + testImplementation libs.junit5Jupiter - testRuntimeOnly dependency.junit5VintageEngine - testRuntimeOnly dependency.junitPlatformLauncher - testRuntimeOnly dependency.log4j_slf4j + testRuntimeOnly libs.junit5VintageEngine + testRuntimeOnly libs.junitPlatformLauncher + testRuntimeOnly libs.log4j.slf4j } tasks.withType(Test) { diff --git a/buildSrc/src/main/groovy/archunit.license-conventions.gradle b/buildSrc/src/main/groovy/archunit.license-conventions.gradle index 7428af7e81..921f6e71bd 100644 --- a/buildSrc/src/main/groovy/archunit.license-conventions.gradle +++ b/buildSrc/src/main/groovy/archunit.license-conventions.gradle @@ -8,12 +8,12 @@ def fillTemplateFile = { String resourceName -> replace('${owner}', "${company.name}") } -def pomOf = { Map dep -> - "${dep.group}:${dep.name}:${dep.version}@pom" +def pomOf = { MinimalExternalModuleDependency dep, nameSuffix = "" -> + "${dep.module.group}:${dep.module.name}${nameSuffix}:${dep.version}@pom" } -def parentPomOf = { Map dep -> - pomOf(dep + [name: "${dep.name}-parent"]) +def parentPomOf = { MinimalExternalModuleDependency dep -> + pomOf(dep, "-parent") } configurations { @@ -22,8 +22,8 @@ configurations { } dependencies { - thirdpartyAsm pomOf(dependency.asm) - thirdpartyGuava parentPomOf(dependency.guava) + thirdpartyAsm pomOf(libs.asm.get()) + thirdpartyGuava parentPomOf(libs.guava.get()) } def parseLicenseInfoFrom = { config -> diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..17961bd22f --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,26 @@ +[versions] +log4j = "2.24.3" +junit5 = "5.12.2" +junitPlatform = "1.12.2" +assertj = "3.27.3" + +[libraries] +asm = { group = "org.ow2.asm", name = "asm", version = "9.8" } +guava = { group = "com.google.guava", name = "guava", version = "33.4.8-jre" } +slf4j = { group = "org.slf4j", name = "slf4j-api", version = "2.0.17" } +log4j_api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" } +log4j_core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" } +log4j_slf4j = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version.ref = "log4j" } +junit4 = { group = "junit", name = "junit", version = "4.13.2" } +junit5Jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit5" } +junit5VintageEngine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "junit5" } +junitPlatform = { group = "org.junit.platform", name = "junit-platform-runner", version.ref = "junitPlatform" } +junitPlatformCommons = { group = "org.junit.platform", name = "junit-platform-commons", version.ref = "junitPlatform" } +junitPlatformEngine = { group = "org.junit.platform", name = "junit-platform-engine", version.ref = "junitPlatform" } +junitPlatformLauncher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junitPlatform" } +hamcrest = { group = "org.hamcrest", name = "hamcrest-core", version = "1.3" } +junitDataprovider = { group = "com.tngtech.java", name = "junit-dataprovider", version = "1.11.0" } +mockito = { group = "org.mockito", name = "mockito-core", version = "4.11.0" } # mockito 5 requires Java 11 +mockito_junit5 = { group = "org.mockito", name = "mockito-junit-jupiter", version = "4.6.1" } +assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } +assertj_guava = { group = "org.assertj", name = "assertj-guava", version.ref = "assertj" } From 2f57b0568caaaf7d81458513c50c5d4ec8296aab Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sat, 19 Apr 2025 21:28:17 +0200 Subject: [PATCH 4/4] use Gradle version catalog for ArchUnit-Examples introducing a separate catalog for example dependencies to make it easier to see which dependencies are really meant for ArchUnit in all places. Signed-off-by: Manfred Hanke Signed-off-by: Peter Gafert --- archunit-3rd-party-test/build.gradle | 2 +- archunit-maven-test/build.gradle | 8 +++----- archunit-maven-test/pom.xml.template | 18 +++++++++--------- .../release/archunit-examples-utils.gradle | 4 ++-- build.gradle | 13 ------------- .../archunit.java-examples-conventions.gradle | 16 ++++++++-------- gradle/example-libs.versions.toml | 13 +++++++++++++ settings.gradle | 8 ++++++++ 8 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 gradle/example-libs.versions.toml diff --git a/archunit-3rd-party-test/build.gradle b/archunit-3rd-party-test/build.gradle index 2dee23b9a5..f3f0ce8167 100644 --- a/archunit-3rd-party-test/build.gradle +++ b/archunit-3rd-party-test/build.gradle @@ -7,7 +7,7 @@ ext.moduleName = 'com.tngtech.archunit.thirdpartytest' dependencies { testImplementation project(path: ':archunit', configuration: 'shadow') testImplementation project(path: ':archunit', configuration: 'tests') - testImplementation dependency.springBootLoader + testImplementation exampleLibs.springBootLoader dependency.addGuava { dependencyNotation, config -> testImplementation(dependencyNotation, config) } testImplementation libs.junit4 testImplementation libs.junitDataprovider diff --git a/archunit-maven-test/build.gradle b/archunit-maven-test/build.gradle index 31c60e66c7..b041c16555 100644 --- a/archunit-maven-test/build.gradle +++ b/archunit-maven-test/build.gradle @@ -118,7 +118,6 @@ def addMavenTest = { IntegrationTestConfig config -> createAllRepositoryTags(getRepoUrls(project.getProperty('mavenRepos'))) : '' - def versionCatalog = versionCatalogs.named("libs") mavenPom.text = mavenPom.text .replace('#{archunit.version}', "${version}") .replace('#{archunitTestArtifact}', config.archunitTestArtifact) @@ -126,10 +125,9 @@ def addMavenTest = { IntegrationTestConfig config -> .replace('#{javaVersion}', "${config.javaVersion}") .replace('#{additionalDependencies}', config.additionalDependencies ?: '') .replace('#{surefireExampleConfiguration}', config.surefireExampleConfiguration) - .replaceAll(/#\{(dependency|libs).([^}:]+):?([^}]*)}/) { all, catalog, dependencyReference, scope -> - def targetDependency = catalog == "libs" ? - versionCatalog.findLibrary(dependencyReference).get().get() : - dependency[dependencyReference] + .replaceAll(/#\{(libs|exampleLibs).([^}:]+):?([^}]*)}/) { all, catalog, dependencyReference, scope -> + def versionCatalog = versionCatalogs.named(catalog) + def targetDependency = versionCatalog.findLibrary(dependencyReference).get().get() def scopePart = scope ? "\n ${scope}" : '' """ | diff --git a/archunit-maven-test/pom.xml.template b/archunit-maven-test/pom.xml.template index 1b6fb1e3ea..8bdf2fd067 100644 --- a/archunit-maven-test/pom.xml.template +++ b/archunit-maven-test/pom.xml.template @@ -49,18 +49,18 @@ #{archunit.version} test - #{dependency.javaxAnnotationApi} - #{dependency.geronimoEjb} - #{dependency.geronimoJpa} - #{dependency.jodaTime} - #{dependency.springBeans} - #{dependency.jakartaInject} - #{dependency.jakartaAnnotations} - #{dependency.guice} + #{exampleLibs.javaxAnnotationApi} + #{exampleLibs.geronimoEjb} + #{exampleLibs.geronimoJpa} + #{exampleLibs.jodaTime} + #{exampleLibs.springBeans} + #{exampleLibs.jakartaInject} + #{exampleLibs.jakartaAnnotations} + #{exampleLibs.guice} #{libs.junit4:test} #{libs.junitDataprovider:test} #{libs.assertj:test} - #{dependency.joox:test} + #{exampleLibs.joox:test} #{additionalDependencies} diff --git a/build-steps/release/archunit-examples-utils.gradle b/build-steps/release/archunit-examples-utils.gradle index 6c8edc1d82..7eb3882f99 100644 --- a/build-steps/release/archunit-examples-utils.gradle +++ b/build-steps/release/archunit-examples-utils.gradle @@ -33,9 +33,9 @@ private void updateArchUnitExampleDependencies(File targetArchUnitExampleDir) { def buildFile = new File(targetArchUnitExampleDir, 'build.gradle') List> sortedDependencies = archUnitExamplesMainDependencies.collect() - .sort { first, second -> first.group <=> second.group ?: first.name <=> second.name } + .sort { first, second -> first.get().group <=> second.get().group ?: first.get().name <=> second.get().name } def dependencyIndent = ' ' * 8 - List dependencyLines = sortedDependencies + List dependencyLines = sortedDependencies.collect { it.get() } .collect { "${dependencyIndent}implementation '${it.group}:${it.name}:${it.version}'".toString() } buildFile.text = archUnitExamplesRootBuildFileContent.replace('#{dependencies}', dependencyLines.join('\n')) // always Unix line separator diff --git a/build.gradle b/build.gradle index 557570181d..3181647708 100644 --- a/build.gradle +++ b/build.gradle @@ -43,19 +43,6 @@ ext { exclude module: 'j2objc-annotations' } }, - - // Dependencies for example projects / tests - javaxAnnotationApi : [group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'], - springBeans : [group: 'org.springframework', name: 'spring-beans', version: '5.3.23'], - springBootLoader : [group: 'org.springframework.boot', name: 'spring-boot-loader', version: '2.7.13'], - jakartaInject : [group: 'jakarta.inject', name: 'jakarta.inject-api', version: '2.0.1'], - jakartaAnnotations : [group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '2.1.1'], - guice : [group: 'com.google.inject', name: 'guice', version: '5.1.0'], - // NOTE: The pure javaee-api dependencies are crippled, so to run any test we need to choose a full implementation provider - geronimoEjb : [group: 'org.apache.geronimo.specs', name: 'geronimo-ejb_3.1_spec', version: '1.0.2'], - geronimoJpa : [group: 'org.apache.geronimo.specs', name: 'geronimo-jpa_2.0_spec', version: '1.1'], - jodaTime : [group: 'joda-time', name: 'joda-time', version: '2.12.7'], - joox : [group: 'org.jooq', name: 'joox-java-6', version: '1.6.0'] ] minSupportedJavaVersion = JavaVersion.VERSION_1_8 diff --git a/buildSrc/src/main/groovy/archunit.java-examples-conventions.gradle b/buildSrc/src/main/groovy/archunit.java-examples-conventions.gradle index 1d00e5ea80..2091c7fff1 100644 --- a/buildSrc/src/main/groovy/archunit.java-examples-conventions.gradle +++ b/buildSrc/src/main/groovy/archunit.java-examples-conventions.gradle @@ -11,14 +11,14 @@ archUnitTest { } rootProject.ext.archUnitExamplesMainDependencies = [ - dependency.jodaTime, - dependency.javaxAnnotationApi, - dependency.jakartaInject, - dependency.jakartaAnnotations, - dependency.springBeans, - dependency.guice, - dependency.geronimoEjb, - dependency.geronimoJpa + exampleLibs.jodaTime, + exampleLibs.javaxAnnotationApi, + exampleLibs.jakartaInject, + exampleLibs.jakartaAnnotations, + exampleLibs.springBeans, + exampleLibs.guice, + exampleLibs.geronimoEjb, + exampleLibs.geronimoJpa ] dependencies { diff --git a/gradle/example-libs.versions.toml b/gradle/example-libs.versions.toml new file mode 100644 index 0000000000..8188566157 --- /dev/null +++ b/gradle/example-libs.versions.toml @@ -0,0 +1,13 @@ +# Dependencies for example projects / tests +[libraries] +javaxAnnotationApi = { group = "javax.annotation", name = "javax.annotation-api", version = "1.3.2" } +springBeans = { group = "org.springframework", name = "spring-beans", version = "5.3.23" } +springBootLoader = { group = "org.springframework.boot", name = "spring-boot-loader", version = "2.7.13" } +jakartaInject = { group = "jakarta.inject", name = "jakarta.inject-api", version = "2.0.1" } +jakartaAnnotations = { group = "jakarta.annotation", name = "jakarta.annotation-api", version = "2.1.1" } +guice = { group = "com.google.inject", name = "guice", version = "5.1.0" } +# NOTE: The pure javaee-api dependencies are crippled, so to run any test we need to choose a full implementation provider +geronimoEjb = { group = "org.apache.geronimo.specs", name = "geronimo-ejb_3.1_spec", version = "1.0.2" } +geronimoJpa = { group = "org.apache.geronimo.specs", name = "geronimo-jpa_2.0_spec", version = "1.1" } +jodaTime = { group = "joda-time", name = "joda-time", version = "2.12.7" } +joox = { group = "org.jooq", name = "joox-java-6", version = "1.6.0" } diff --git a/settings.gradle b/settings.gradle index 5a4ba5268e..1bb8ade8d8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,6 +14,14 @@ project(':archunit-junit5-engine-api').projectDir = file('archunit-junit/junit5/ project(':archunit-junit5-engine').projectDir = file('archunit-junit/junit5/engine') project(':archunit-junit5').projectDir = file('archunit-junit/junit5/aggregator') +dependencyResolutionManagement { + versionCatalogs { + exampleLibs { + from(files('gradle/example-libs.versions.toml')) + } + } +} + gradleEnterprise { buildScan { termsOfServiceUrl = "https://gradle.com/terms-of-service"