use Gradle version catalog for ArchUnit-Examples

Signed-off-by: Manfred Hanke <Manfred.Hanke@tngtech.com>

Author: hankem

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 libs.springBootLoader
     dependency.addGuava { dependencyNotation, config -> testImplementation(dependencyNotation, config) }
     testImplementation libs.junit4
     testImplementation libs.junit.dataprovider

archunit-maven-test/build.gradle

@@ -126,10 +126,8 @@ 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.([^}:]+):?([^}]*)}/) { all, dependencyReference, scope ->
+                                                def targetDependency = versionCatalog.findLibrary(dependencyReference).get().get()
                                                 def scopePart = scope ? "\n            <scope>${scope}</scope>" : ''
                                                 """
                                                 |        <dependency>

archunit-maven-test/pom.xml.template

@@ -49,18 +49,18 @@
             <version>#{archunit.version}</version>
             <scope>test</scope>
         </dependency>
-        #{dependency.javaxAnnotationApi}
-        #{dependency.geronimoEjb}
-        #{dependency.geronimoJpa}
-        #{dependency.jodaTime}
-        #{dependency.springBeans}
-        #{dependency.jakartaInject}
-        #{dependency.jakartaAnnotations}
-        #{dependency.guice}
+        #{libs.javaxAnnotationApi}
+        #{libs.geronimoEjb}
+        #{libs.geronimoJpa}
+        #{libs.jodaTime}
+        #{libs.springBeans}
+        #{libs.jakartaInject}
+        #{libs.jakartaAnnotations}
+        #{libs.guice}
         #{libs.junit4:test}
         #{libs.junit_dataprovider:test}
         #{libs.assertj:test}
-        #{dependency.joox:test}
+        #{libs.joox:test}
         #{additionalDependencies}
     </dependencies>
 

build-steps/release/archunit-examples-utils.gradle

@@ -33,9 +33,9 @@ private void updateArchUnitExampleDependencies(File targetArchUnitExampleDir) {
     def buildFile = new File(targetArchUnitExampleDir, 'build.gradle')
 
     List<Map<String, String>> 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<String> dependencyLines = sortedDependencies
+    List<String> 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

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

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
+        libs.jodaTime,
+        libs.javaxAnnotationApi,
+        libs.jakartaInject,
+        libs.jakartaAnnotations,
+        libs.springBeans,
+        libs.guice,
+        libs.geronimoEjb,
+        libs.geronimoJpa
 ]
 
 dependencies {

gradle/libs.versions.toml

@@ -24,3 +24,16 @@ mockito = { group = "org.mockito", name = "mockito-core", version = "4.11.0" } #
 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" }
+
+# 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" }