Cleanups

GradleUp · Dec 19, 2024 · f33f355 · f33f355
1 parent c7f621f
commit f33f355
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -54,6 +54,8 @@ val intiTestRuntimeOnly: Configuration by configurations.getting {
 val funcTest: SourceSet by sourceSets.creating
 val funcTestImplementation: Configuration by configurations.getting {
   extendsFrom(configurations.testImplementation.get())
+  // TODO: this will be removed after we migrated all functional tests to Kotlin.
+  extendsFrom(intiTestImplementation)
 }
 val funcTestRuntimeOnly: Configuration by configurations.getting {
   extendsFrom(configurations.testRuntimeOnly.get())
@@ -87,8 +89,6 @@ dependencies {
   }
   funcTestImplementation(sourceSets.main.get().output)
   funcTestImplementation(intiTest.output)
-  funcTestImplementation(libs.apache.maven.modelBuilder)
-  funcTestImplementation(libs.apache.maven.repositoryMetadata)
 
   intiTestImplementation(libs.apache.maven.modelBuilder)
   intiTestImplementation(libs.apache.maven.repositoryMetadata)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,13 @@
+[versions]
+maven = "3.9.9"
+
 [libraries]
 apache-ant = "org.apache.ant:ant:1.10.15"
 apache-commonsIo = "commons-io:commons-io:2.18.0"
 apache-commonsLang = "org.apache.commons:commons-lang3:3.17.0"
 apache-log4j = "org.apache.logging.log4j:log4j-core:2.24.3"
-apache-maven-modelBuilder = "org.apache.maven:maven-model-builder:3.9.9"
-apache-maven-repositoryMetadata = "org.apache.maven:maven-repository-metadata:3.9.9"
+apache-maven-modelBuilder = { module = "org.apache.maven:maven-model-builder", version.ref = "maven" }
+apache-maven-repositoryMetadata = { module = "org.apache.maven:maven-repository-metadata", version.ref = "maven" }
 asm = "org.ow2.asm:asm-commons:9.7.1"
 jdependency = "org.vafer:jdependency:2.11"
 jdom2 = "org.jdom:jdom2:2.0.6.1"