Switch to version catalog for dependency management

asciidocfx · Feb 22, 2023 · e278fa3 · e278fa3
1 parent cf5fbee
commit e278fa3
Show file tree

Hide file tree

Showing 16 changed files with 91 additions and 58 deletions.
diff --git a/buildLogic.gradle b/buildLogic.gradle
@@ -1,7 +1,5 @@
 apply plugin: 'java-library'
 
-apply from: "$rootDir/dependencies.gradle"
-
 sourceCompatibility = 1.8
 
 tasks.withType(JavaCompile) {

diff --git a/dependencies.gradle b/dependencies.gradle
diff --git a/marytts-common/build.gradle b/marytts-common/build.gradle
@@ -3,10 +3,10 @@ apply from: "$rootDir/testLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 
 dependencies {
-    api libs.commonsIo
-    api libs.commonsLang
-    api libs.log4jCore
-    testImplementation libs.testng
+    api libs.commons.io
+    api libs.commons.lang
+    api libs.log4j.core
+    testImplementation testLibs.testng
 }
 
 processResources {

diff --git a/marytts-languages/marytts-lang-de/build.gradle b/marytts-languages/marytts-lang-de/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 

diff --git a/marytts-languages/marytts-lang-en/build.gradle b/marytts-languages/marytts-lang-en/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 
@@ -44,7 +43,7 @@ dependencies {
     implementation project(':marytts-runtime')
     opennlp group: 'org.apache.opennlp', name: 'en-pos-maxent', version: '1.5', ext: 'bin'
     runtimeOnly group: 'de.dfki.mary', name: 'marytts-lexicon-en_US-cmudict', version: '0.1.0'
-    testImplementation libs.xmlunit
+    testImplementation testLibs.xmlunit
     integrationTestImplementation project(':marytts-runtime').sourceSets.test.output
 }
 

diff --git a/marytts-languages/marytts-lang-fr/build.gradle b/marytts-languages/marytts-lang-fr/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 
@@ -19,7 +18,7 @@ marytts {
 dependencies {
     implementation project(':marytts-runtime')
     runtimeOnly group: 'de.dfki.mary', name: 'marytts-lexicon-fr', version: '0.1.0'
-    testImplementation libs.xmlunit
+    testImplementation testLibs.xmlunit
     integrationTestImplementation project(':marytts-runtime').sourceSets.test.output
 }
 

diff --git a/marytts-languages/marytts-lang-it/build.gradle b/marytts-languages/marytts-lang-it/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 

diff --git a/marytts-languages/marytts-lang-lb/build.gradle b/marytts-languages/marytts-lang-lb/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 
@@ -20,7 +19,7 @@ dependencies {
     implementation project(':marytts-runtime')
     implementation project(':marytts-languages:marytts-lang-fr')
     runtimeOnly group: 'de.dfki.mary', name: 'marytts-lexicon-lb', version: '0.1.0'
-    testImplementation libs.xmlunit
+    testImplementation testLibs.xmlunit
     integrationTestImplementation project(':marytts-runtime').sourceSets.test.output
 }
 

diff --git a/marytts-languages/marytts-lang-ru/build.gradle b/marytts-languages/marytts-lang-ru/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 

diff --git a/marytts-languages/marytts-lang-sv/build.gradle b/marytts-languages/marytts-lang-sv/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 

diff --git a/marytts-languages/marytts-lang-te/build.gradle b/marytts-languages/marytts-lang-te/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 

diff --git a/marytts-languages/marytts-lang-tr/build.gradle b/marytts-languages/marytts-lang-tr/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 

diff --git a/marytts-runtime/build.gradle b/marytts-runtime/build.gradle
@@ -9,19 +9,20 @@ apply from: "$rootDir/publishLogic.gradle"
 dependencies {
     api project(':marytts-common')
     api project(':marytts-signalproc')
-    api libs.commonsCollection
-    implementation libs.emotionmlCheckerJava
-    implementation libs.fastMd5
+    api libs.commons.collections
+    implementation libs.emotionml.checker
+    implementation libs.fast.md5
     api libs.guava
     implementation libs.hsqldb
-    implementation libs.httpCore
-    implementation libs.httpNio
+    implementation libs.httpcore
+    implementation libs.httpcore.nio
     api libs.icu4j
-    implementation libs.jtokCore
-    implementation libs.opennlpTools
+    implementation libs.jtok.core
+    implementation libs.opennlp.tools
     implementation libs.trove4j
-    testImplementation libs.junit
-    testImplementation libs.festAssert
-    integrationTestImplementation libs.groovy
+    testImplementation testLibs.junit
+    testImplementation testLibs.fest.assert
+    integrationTestImplementation localGroovy()
+    integrationTestImplementation testLibs.junit
     integrationTestRuntimeOnly project(':voice-cmu-slt-hsmm')
 }
diff --git a/marytts-signalproc/build.gradle b/marytts-signalproc/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     api project(':marytts-common')
     api libs.jama
     implementation libs.jampack
-    api libs.swingLayout
-    testImplementation libs.junit
+    api libs.swing.layout
+    testImplementation testLibs.junit
 }
diff --git a/settings.gradle b/settings.gradle
@@ -16,3 +16,73 @@ include 'marytts-languages:marytts-lang-tr'
 include 'marytts-runtime'
 include 'marytts-signalproc'
 include 'voice-cmu-slt-hsmm'
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            version('commons-collections', '3.2.2')
+            version('commons-io', '2.5')
+            version('commons-lang', '2.6')
+            version('emotionml-checker', '1.1')
+            version('fast-md5', '2.7.1')
+            version('guava', '24.1.1-jre')
+            version('hsqldb', '2.0.0')
+            version('httpcore', '4.1')
+            version('icu4j', '66.1')
+            version('jama', '1.0.3')
+            version('jampack', '1.0')
+            version('jtok', '1.9.3')
+            version('log4j', '2.13.1')
+            version('opennlp-tools', '1.9.2')
+            version('swing-layout', '1.0.3')
+            version('trove4j', '2.0.2')
+            library('commons-collections', 'commons-collections', 'commons-collections')
+                    .versionRef('commons-collections')
+            library('commons-io', 'commons-io', 'commons-io')
+                    .versionRef('commons-io')
+            library('commons-lang', 'commons-lang', 'commons-lang')
+                    .versionRef('commons-lang')
+            library('emotionml-checker', 'de.dfki.mary', 'emotionml-checker-java')
+                    .versionRef('emotionml-checker')
+            library('fast-md5', 'com.twmacinta', 'fast-md5')
+                    .versionRef('fast-md5')
+            library('guava', 'com.google.guava', 'guava')
+                    .versionRef('guava')
+            library('hsqldb', 'org.hsqldb', 'hsqldb')
+                    .versionRef('hsqldb')
+            library('httpcore', 'org.apache.httpcomponents', 'httpcore')
+                    .versionRef('httpcore')
+            library('httpcore-nio', 'org.apache.httpcomponents', 'httpcore-nio')
+                    .versionRef('httpcore')
+            library('icu4j', 'com.ibm.icu', 'icu4j')
+                    .versionRef('icu4j')
+            library('jama', 'gov.nist.math', 'jama')
+                    .versionRef('jama')
+            library('jampack', 'gov.nist.math', 'Jampack')
+                    .versionRef('jampack')
+            library('jtok-core', 'de.dfki.lt.jtok', 'jtok-core')
+                    .versionRef('jtok')
+            library('log4j-core', 'org.apache.logging.log4j', 'log4j-core')
+                    .versionRef('log4j')
+            library('opennlp-tools', 'org.apache.opennlp', 'opennlp-tools')
+                    .versionRef('opennlp-tools')
+            library('swing-layout', 'org.swinglabs', 'swing-layout')
+                    .versionRef('swing-layout')
+            library('trove4j', 'net.sf.trove4j', 'trove4j')
+                    .versionRef('trove4j')
+        }
+        testLibs {
+            version('fest-assert', '1.4')
+            version('junit', '4.12')
+            version('testng', '6.9.11')
+            version('xmlunit', '1.6')
+            library('fest-assert', 'org.easytesting', 'fest-assert')
+                    .versionRef('fest-assert')
+            library('junit', 'junit', 'junit')
+                    .versionRef('junit')
+            library('testng', 'org.testng', 'testng')
+                    .versionRef('testng')
+            library('xmlunit', 'xmlunit', 'xmlunit')
+                    .versionRef('xmlunit')
+        }
+    }
+}
diff --git a/voice-cmu-slt-hsmm/build.gradle b/voice-cmu-slt-hsmm/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'de.dfki.mary.component'
 }
-apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/buildLogic.gradle"
 apply from: "$rootDir/publishLogic.gradle"
 
@@ -18,7 +17,7 @@ marytts {
 
 dependencies {
     implementation project(':marytts-languages:marytts-lang-en')
-    testImplementation libs.testng
+    testImplementation testLibs.testng
 }
 
 test {