utils: Move FileMatcher from core to common

The code is not specific to ORT and can be useful for other modules. Signed-off-by: Martin Nonnenmacher <[email protected]>
oss-review-toolkit · Nov 2, 2021 · fa375ef · fa375ef
1 parent 95fc30f
commit fa375ef
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/model/src/main/kotlin/ScanSummary.kt b/model/src/main/kotlin/ScanSummary.kt
@@ -29,7 +29,7 @@ import java.util.SortedSet
 
 import org.ossreviewtoolkit.model.config.LicenseFilenamePatterns
 import org.ossreviewtoolkit.model.utils.RootLicenseMatcher
-import org.ossreviewtoolkit.utils.core.FileMatcher
+import org.ossreviewtoolkit.utils.common.FileMatcher
 import org.ossreviewtoolkit.utils.spdx.SpdxExpression
 
 /**

diff --git a/model/src/main/kotlin/utils/FileArchiver.kt b/model/src/main/kotlin/utils/FileArchiver.kt
@@ -27,7 +27,7 @@ import kotlin.time.measureTime
 import kotlin.time.measureTimedValue
 
 import org.ossreviewtoolkit.model.KnownProvenance
-import org.ossreviewtoolkit.utils.core.FileMatcher
+import org.ossreviewtoolkit.utils.common.FileMatcher
 import org.ossreviewtoolkit.utils.core.ORT_NAME
 import org.ossreviewtoolkit.utils.core.collectMessagesAsString
 import org.ossreviewtoolkit.utils.core.log

diff --git a/model/src/main/kotlin/utils/RootLicenseMatcher.kt b/model/src/main/kotlin/utils/RootLicenseMatcher.kt
@@ -23,7 +23,7 @@ import java.io.File
 
 import org.ossreviewtoolkit.model.LicenseFinding
 import org.ossreviewtoolkit.model.config.LicenseFilenamePatterns
-import org.ossreviewtoolkit.utils.core.FileMatcher
+import org.ossreviewtoolkit.utils.common.FileMatcher
 import org.ossreviewtoolkit.utils.core.getAllAncestorDirectories
 
 /**

diff --git a/utils/common/build.gradle.kts b/utils/common/build.gradle.kts
@@ -17,7 +17,13 @@
  * License-Filename: LICENSE
  */
 
+val springCoreVersion: String by project
+
 plugins {
     // Apply core plugins.
     `java-library`
 }
+
+dependencies {
+    implementation("org.springframework:spring-core:$springCoreVersion")
+}
diff --git a/utils/core/src/main/kotlin/FileMatcher.kt → utils/common/src/main/kotlin/FileMatcher.kt b/utils/core/src/main/kotlin/FileMatcher.kt → utils/common/src/main/kotlin/FileMatcher.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.utils.core
+package org.ossreviewtoolkit.utils.common
 
 import org.springframework.util.AntPathMatcher
 

diff --git a/...s/core/src/test/kotlin/FileMatcherTest.kt → ...common/src/test/kotlin/FileMatcherTest.kt b/...s/core/src/test/kotlin/FileMatcherTest.kt → ...common/src/test/kotlin/FileMatcherTest.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.utils.core
+package org.ossreviewtoolkit.utils.common
 
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.matchers.shouldBe

diff --git a/utils/core/build.gradle.kts b/utils/core/build.gradle.kts
@@ -26,7 +26,6 @@ val log4jApiKotlinVersion: String by project
 val mockkVersion: String by project
 val okhttpVersion: String by project
 val semverVersion: String by project
-val springCoreVersion: String by project
 val xzVersion: String by project
 
 plugins {
@@ -49,7 +48,6 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jsr223")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
-    implementation("org.springframework:spring-core:$springCoreVersion")
     implementation("org.tukaani:xz:$xzVersion")
 
     testImplementation("io.mockk:mockk:$mockkVersion")