diff --git a/analyzer/src/funTest/kotlin/managers/CocoaPodsFunTest.kt b/analyzer/src/funTest/kotlin/managers/CocoaPodsFunTest.kt index 1fbb9588eb1d9..1e3c2430fa519 100644 --- a/analyzer/src/funTest/kotlin/managers/CocoaPodsFunTest.kt +++ b/analyzer/src/funTest/kotlin/managers/CocoaPodsFunTest.kt @@ -27,7 +27,7 @@ import java.time.Instant import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.model.ProjectAnalyzerResult -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.normalizeVcsUrl import org.ossreviewtoolkit.utils.test.DEFAULT_ANALYZER_CONFIGURATION import org.ossreviewtoolkit.utils.test.DEFAULT_REPOSITORY_CONFIGURATION diff --git a/analyzer/src/funTest/kotlin/managers/GradleFunTest.kt b/analyzer/src/funTest/kotlin/managers/GradleFunTest.kt index 55f84a2a75249..2fce9349f7e9f 100644 --- a/analyzer/src/funTest/kotlin/managers/GradleFunTest.kt +++ b/analyzer/src/funTest/kotlin/managers/GradleFunTest.kt @@ -31,7 +31,7 @@ import java.io.File import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.downloader.vcs.Git -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.normalizeVcsUrl import org.ossreviewtoolkit.utils.test.DEFAULT_ANALYZER_CONFIGURATION diff --git a/analyzer/src/funTest/kotlin/managers/MavenFunTest.kt b/analyzer/src/funTest/kotlin/managers/MavenFunTest.kt index 59905ff78fff4..465a8aeaee774 100644 --- a/analyzer/src/funTest/kotlin/managers/MavenFunTest.kt +++ b/analyzer/src/funTest/kotlin/managers/MavenFunTest.kt @@ -28,7 +28,7 @@ import io.kotest.matchers.shouldBe import java.io.File import org.ossreviewtoolkit.downloader.VersionControlSystem -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.normalizeVcsUrl import org.ossreviewtoolkit.utils.core.safeDeleteRecursively import org.ossreviewtoolkit.utils.test.DEFAULT_ANALYZER_CONFIGURATION diff --git a/analyzer/src/funTest/kotlin/managers/PipFunTest.kt b/analyzer/src/funTest/kotlin/managers/PipFunTest.kt index d5571c0df8ba7..1ab346a4be50e 100644 --- a/analyzer/src/funTest/kotlin/managers/PipFunTest.kt +++ b/analyzer/src/funTest/kotlin/managers/PipFunTest.kt @@ -25,7 +25,7 @@ import io.kotest.matchers.shouldBe import java.io.File import org.ossreviewtoolkit.downloader.VersionControlSystem -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.normalizeVcsUrl import org.ossreviewtoolkit.utils.test.DEFAULT_ANALYZER_CONFIGURATION import org.ossreviewtoolkit.utils.test.DEFAULT_REPOSITORY_CONFIGURATION diff --git a/analyzer/src/funTest/kotlin/managers/StackFunTest.kt b/analyzer/src/funTest/kotlin/managers/StackFunTest.kt index 1685365ed1820..c7da0e30854d1 100644 --- a/analyzer/src/funTest/kotlin/managers/StackFunTest.kt +++ b/analyzer/src/funTest/kotlin/managers/StackFunTest.kt @@ -24,7 +24,7 @@ import io.kotest.matchers.shouldBe import java.io.File -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.test.DEFAULT_ANALYZER_CONFIGURATION import org.ossreviewtoolkit.utils.test.DEFAULT_REPOSITORY_CONFIGURATION import org.ossreviewtoolkit.utils.test.USER_DIR diff --git a/analyzer/src/main/kotlin/managers/Bower.kt b/analyzer/src/main/kotlin/managers/Bower.kt index c85791ab2adc2..ea1e914250bf4 100644 --- a/analyzer/src/main/kotlin/managers/Bower.kt +++ b/analyzer/src/main/kotlin/managers/Bower.kt @@ -44,8 +44,8 @@ import org.ossreviewtoolkit.model.VcsType import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.jsonMapper +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.fieldNamesOrEmpty import org.ossreviewtoolkit.utils.core.fieldsOrEmpty import org.ossreviewtoolkit.utils.core.stashDirectories diff --git a/analyzer/src/main/kotlin/managers/Bundler.kt b/analyzer/src/main/kotlin/managers/Bundler.kt index cc5904efba0cd..9d23ff2694556 100644 --- a/analyzer/src/main/kotlin/managers/Bundler.kt +++ b/analyzer/src/main/kotlin/managers/Bundler.kt @@ -55,9 +55,9 @@ import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.createAndLogIssue import org.ossreviewtoolkit.model.yamlMapper +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.HttpDownloadError import org.ossreviewtoolkit.utils.core.OkHttpClientHelper -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.collectMessagesAsString import org.ossreviewtoolkit.utils.core.log import org.ossreviewtoolkit.utils.core.perf diff --git a/analyzer/src/main/kotlin/managers/Composer.kt b/analyzer/src/main/kotlin/managers/Composer.kt index 2ac8eec91b920..4042f57d5fef6 100644 --- a/analyzer/src/main/kotlin/managers/Composer.kt +++ b/analyzer/src/main/kotlin/managers/Composer.kt @@ -46,8 +46,8 @@ import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.createAndLogIssue import org.ossreviewtoolkit.model.orEmpty import org.ossreviewtoolkit.model.readJsonFile +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.collectMessagesAsString import org.ossreviewtoolkit.utils.core.fieldNamesOrEmpty diff --git a/analyzer/src/main/kotlin/managers/Conan.kt b/analyzer/src/main/kotlin/managers/Conan.kt index ed53be9fa002a..ff37d26f5e1e6 100644 --- a/analyzer/src/main/kotlin/managers/Conan.kt +++ b/analyzer/src/main/kotlin/managers/Conan.kt @@ -48,8 +48,8 @@ import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.jsonMapper import org.ossreviewtoolkit.model.yamlMapper +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.createOrtTempFile import org.ossreviewtoolkit.utils.core.log diff --git a/analyzer/src/main/kotlin/managers/GoMod.kt b/analyzer/src/main/kotlin/managers/GoMod.kt index e55a147e125d2..10682b388062c 100644 --- a/analyzer/src/main/kotlin/managers/GoMod.kt +++ b/analyzer/src/main/kotlin/managers/GoMod.kt @@ -40,8 +40,8 @@ import org.ossreviewtoolkit.model.VcsType import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.orEmpty +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.log import org.ossreviewtoolkit.utils.core.stashDirectories import org.ossreviewtoolkit.utils.core.withoutSuffix diff --git a/analyzer/src/main/kotlin/managers/Gradle.kt b/analyzer/src/main/kotlin/managers/Gradle.kt index 857d6facfbc02..220a8553f0f75 100644 --- a/analyzer/src/main/kotlin/managers/Gradle.kt +++ b/analyzer/src/main/kotlin/managers/Gradle.kt @@ -51,7 +51,7 @@ import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.createAndLogIssue import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.log import org.ossreviewtoolkit.utils.core.temporaryProperties diff --git a/analyzer/src/main/kotlin/managers/Npm.kt b/analyzer/src/main/kotlin/managers/Npm.kt index 08965d009d97d..bea0c81bb2aa4 100644 --- a/analyzer/src/main/kotlin/managers/Npm.kt +++ b/analyzer/src/main/kotlin/managers/Npm.kt @@ -60,9 +60,9 @@ import org.ossreviewtoolkit.model.orEmpty import org.ossreviewtoolkit.model.readJsonFile import org.ossreviewtoolkit.model.readValue import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool import org.ossreviewtoolkit.utils.core.OkHttpClientHelper -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.fieldNamesOrEmpty import org.ossreviewtoolkit.utils.core.installAuthenticatorAndProxySelector import org.ossreviewtoolkit.utils.core.isSymbolicLink diff --git a/analyzer/src/main/kotlin/managers/Pip.kt b/analyzer/src/main/kotlin/managers/Pip.kt index 2d38c3a67c668..9e798b1b2a9b9 100644 --- a/analyzer/src/main/kotlin/managers/Pip.kt +++ b/analyzer/src/main/kotlin/managers/Pip.kt @@ -46,10 +46,10 @@ import org.ossreviewtoolkit.model.VcsInfo import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.jsonMapper +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool import org.ossreviewtoolkit.utils.core.ORT_NAME import org.ossreviewtoolkit.utils.core.OkHttpClientHelper -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.getPathFromEnvironment import org.ossreviewtoolkit.utils.core.log diff --git a/analyzer/src/main/kotlin/managers/Pub.kt b/analyzer/src/main/kotlin/managers/Pub.kt index 18149f246708c..c6310f19e82e5 100644 --- a/analyzer/src/main/kotlin/managers/Pub.kt +++ b/analyzer/src/main/kotlin/managers/Pub.kt @@ -58,10 +58,10 @@ import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.createAndLogIssue import org.ossreviewtoolkit.model.yamlMapper +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool import org.ossreviewtoolkit.utils.core.ORT_NAME import org.ossreviewtoolkit.utils.core.OkHttpClientHelper -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.collectMessagesAsString import org.ossreviewtoolkit.utils.core.getPathFromEnvironment diff --git a/analyzer/src/main/kotlin/managers/Sbt.kt b/analyzer/src/main/kotlin/managers/Sbt.kt index 1a6fdbc78d24c..5f3e9f3cae2f0 100644 --- a/analyzer/src/main/kotlin/managers/Sbt.kt +++ b/analyzer/src/main/kotlin/managers/Sbt.kt @@ -32,8 +32,8 @@ import org.ossreviewtoolkit.analyzer.AbstractPackageManagerFactory import org.ossreviewtoolkit.analyzer.PackageManager import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.createOrtTempDir import org.ossreviewtoolkit.utils.core.getCommonFileParent import org.ossreviewtoolkit.utils.core.log diff --git a/analyzer/src/main/kotlin/managers/Yarn.kt b/analyzer/src/main/kotlin/managers/Yarn.kt index 07ff8aac531dc..a49064fd4bd7f 100644 --- a/analyzer/src/main/kotlin/managers/Yarn.kt +++ b/analyzer/src/main/kotlin/managers/Yarn.kt @@ -28,7 +28,7 @@ import org.ossreviewtoolkit.analyzer.managers.utils.hasYarnLockFile import org.ossreviewtoolkit.analyzer.managers.utils.mapDefinitionFilesForYarn import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os /** * The [Yarn](https://www.yarnpkg.com/) package manager for JavaScript. diff --git a/cli/src/main/kotlin/OrtMain.kt b/cli/src/main/kotlin/OrtMain.kt index 35df623fddb27..d6d3a2f920906 100644 --- a/cli/src/main/kotlin/OrtMain.kt +++ b/cli/src/main/kotlin/OrtMain.kt @@ -44,12 +44,12 @@ import org.apache.logging.log4j.core.config.Configurator import org.ossreviewtoolkit.cli.commands.* import org.ossreviewtoolkit.model.config.LicenseFilenamePatterns import org.ossreviewtoolkit.model.config.OrtConfiguration +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.Environment import org.ossreviewtoolkit.utils.core.ORT_CONFIG_DIR_ENV_NAME import org.ossreviewtoolkit.utils.core.ORT_CONFIG_FILENAME import org.ossreviewtoolkit.utils.core.ORT_DATA_DIR_ENV_NAME import org.ossreviewtoolkit.utils.core.ORT_NAME -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.PERFORMANCE import org.ossreviewtoolkit.utils.core.expandTilde import org.ossreviewtoolkit.utils.core.log diff --git a/downloader/src/main/kotlin/vcs/Git.kt b/downloader/src/main/kotlin/vcs/Git.kt index 8bf591d4ad179..2ab19bb44da7f 100644 --- a/downloader/src/main/kotlin/vcs/Git.kt +++ b/downloader/src/main/kotlin/vcs/Git.kt @@ -47,8 +47,8 @@ import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.downloader.WorkingTree import org.ossreviewtoolkit.model.VcsInfo import org.ossreviewtoolkit.model.VcsType +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.collectMessagesAsString import org.ossreviewtoolkit.utils.core.installAuthenticatorAndProxySelector import org.ossreviewtoolkit.utils.core.log diff --git a/downloader/src/main/kotlin/vcs/GitRepo.kt b/downloader/src/main/kotlin/vcs/GitRepo.kt index 3f0daac85d715..5d6f027b4da92 100644 --- a/downloader/src/main/kotlin/vcs/GitRepo.kt +++ b/downloader/src/main/kotlin/vcs/GitRepo.kt @@ -31,8 +31,8 @@ import org.ossreviewtoolkit.downloader.WorkingTree import org.ossreviewtoolkit.model.VcsInfo import org.ossreviewtoolkit.model.VcsType import org.ossreviewtoolkit.model.readValue +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.collectMessagesAsString import org.ossreviewtoolkit.utils.core.getPathFromEnvironment diff --git a/evaluator/src/main/kotlin/Evaluator.kt b/evaluator/src/main/kotlin/Evaluator.kt index d41825e38722b..3911e70a902ec 100644 --- a/evaluator/src/main/kotlin/Evaluator.kt +++ b/evaluator/src/main/kotlin/Evaluator.kt @@ -40,6 +40,7 @@ class Evaluator( import org.ossreviewtoolkit.model.config.* import org.ossreviewtoolkit.model.licenses.* import org.ossreviewtoolkit.model.utils.* + import org.ossreviewtoolkit.utils.common.* import org.ossreviewtoolkit.utils.core.* import org.ossreviewtoolkit.utils.spdx.* diff --git a/model/src/main/kotlin/ScanSummary.kt b/model/src/main/kotlin/ScanSummary.kt index bd13e997cf1d8..0c810ca216d56 100644 --- 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 index ca2234d630ed6..62c95544171c7 100644 --- 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 index 0cdc1fe0a5df5..6232850a05fd9 100644 --- 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/notifier/src/main/kotlin/Notifier.kt b/notifier/src/main/kotlin/Notifier.kt index 058279f158304..7e5508b85a915 100644 --- a/notifier/src/main/kotlin/Notifier.kt +++ b/notifier/src/main/kotlin/Notifier.kt @@ -36,6 +36,7 @@ class Notifier(ortResult: OrtResult = OrtResult.EMPTY, config: NotifierConfigura import org.ossreviewtoolkit.model.licenses.* import org.ossreviewtoolkit.model.utils.* import org.ossreviewtoolkit.notifier.modules.* + import org.ossreviewtoolkit.utils.common.* import org.ossreviewtoolkit.utils.core.* import java.util.* diff --git a/reporter/src/main/kotlin/HowToFixTextProvider.kt b/reporter/src/main/kotlin/HowToFixTextProvider.kt index 25ebb1a3b9fc4..4bc3fdd406df4 100644 --- a/reporter/src/main/kotlin/HowToFixTextProvider.kt +++ b/reporter/src/main/kotlin/HowToFixTextProvider.kt @@ -54,6 +54,7 @@ private class HowToFixScriptRunner(ortResult: OrtResult) : ScriptRunner() { import org.ossreviewtoolkit.model.licenses.* import org.ossreviewtoolkit.model.utils.* import org.ossreviewtoolkit.reporter.HowToFixTextProvider + import org.ossreviewtoolkit.utils.common.* import org.ossreviewtoolkit.utils.core.* """.trimIndent() diff --git a/scanner/src/funTest/kotlin/experimental/DefaultNestedProvenanceResolverFunTest.kt b/scanner/src/funTest/kotlin/experimental/DefaultNestedProvenanceResolverFunTest.kt index ee5f16fc3407a..33166bccde64f 100644 --- a/scanner/src/funTest/kotlin/experimental/DefaultNestedProvenanceResolverFunTest.kt +++ b/scanner/src/funTest/kotlin/experimental/DefaultNestedProvenanceResolverFunTest.kt @@ -32,7 +32,7 @@ import org.ossreviewtoolkit.model.RemoteArtifact import org.ossreviewtoolkit.model.RepositoryProvenance import org.ossreviewtoolkit.model.VcsInfo import org.ossreviewtoolkit.model.VcsType -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.test.containExactly class DefaultNestedProvenanceResolverFunTest : WordSpec() { diff --git a/scanner/src/main/kotlin/LocalScanner.kt b/scanner/src/main/kotlin/LocalScanner.kt index ebea616546930..6d05860dbb22c 100644 --- a/scanner/src/main/kotlin/LocalScanner.kt +++ b/scanner/src/main/kotlin/LocalScanner.kt @@ -58,9 +58,9 @@ import org.ossreviewtoolkit.model.config.createFileArchiver import org.ossreviewtoolkit.model.createAndLogIssue import org.ossreviewtoolkit.scanner.storages.FileBasedStorage import org.ossreviewtoolkit.scanner.storages.PostgresStorage +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.CommandLineTool import org.ossreviewtoolkit.utils.core.Environment -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.collectMessagesAsString import org.ossreviewtoolkit.utils.core.createOrtTempDir import org.ossreviewtoolkit.utils.core.fileSystemEncode diff --git a/scanner/src/main/kotlin/scanners/Askalono.kt b/scanner/src/main/kotlin/scanners/Askalono.kt index 9ceb89acceca8..29a79fa9af7c4 100644 --- a/scanner/src/main/kotlin/scanners/Askalono.kt +++ b/scanner/src/main/kotlin/scanners/Askalono.kt @@ -42,9 +42,9 @@ import org.ossreviewtoolkit.scanner.AbstractScannerFactory import org.ossreviewtoolkit.scanner.LocalScanner import org.ossreviewtoolkit.scanner.ScanException import org.ossreviewtoolkit.scanner.experimental.LocalScannerWrapper +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.ORT_NAME import org.ossreviewtoolkit.utils.core.OkHttpClientHelper -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.createOrtTempDir import org.ossreviewtoolkit.utils.core.log diff --git a/scanner/src/main/kotlin/scanners/BoyterLc.kt b/scanner/src/main/kotlin/scanners/BoyterLc.kt index 84cae1f688879..924086077e9ec 100644 --- a/scanner/src/main/kotlin/scanners/BoyterLc.kt +++ b/scanner/src/main/kotlin/scanners/BoyterLc.kt @@ -41,9 +41,9 @@ import org.ossreviewtoolkit.scanner.AbstractScannerFactory import org.ossreviewtoolkit.scanner.LocalScanner import org.ossreviewtoolkit.scanner.ScanException import org.ossreviewtoolkit.scanner.experimental.LocalScannerWrapper +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.ORT_NAME import org.ossreviewtoolkit.utils.core.OkHttpClientHelper -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.createOrtTempDir import org.ossreviewtoolkit.utils.core.log diff --git a/scanner/src/main/kotlin/scanners/Licensee.kt b/scanner/src/main/kotlin/scanners/Licensee.kt index 8d15a90ed04dc..3b874b3b1ceff 100644 --- a/scanner/src/main/kotlin/scanners/Licensee.kt +++ b/scanner/src/main/kotlin/scanners/Licensee.kt @@ -35,7 +35,7 @@ import org.ossreviewtoolkit.scanner.AbstractScannerFactory import org.ossreviewtoolkit.scanner.LocalScanner import org.ossreviewtoolkit.scanner.ScanException import org.ossreviewtoolkit.scanner.experimental.LocalScannerWrapper -import org.ossreviewtoolkit.utils.core.Os +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.createOrtTempDir import org.ossreviewtoolkit.utils.core.log diff --git a/scanner/src/main/kotlin/scanners/scancode/ScanCode.kt b/scanner/src/main/kotlin/scanners/scancode/ScanCode.kt index 2fe3b59c3a3f4..b1e9adf1cafbe 100644 --- a/scanner/src/main/kotlin/scanners/scancode/ScanCode.kt +++ b/scanner/src/main/kotlin/scanners/scancode/ScanCode.kt @@ -45,9 +45,9 @@ import org.ossreviewtoolkit.scanner.LocalScanner import org.ossreviewtoolkit.scanner.ScanException import org.ossreviewtoolkit.scanner.ScanResultsStorage import org.ossreviewtoolkit.scanner.experimental.LocalScannerWrapper +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.core.ORT_NAME import org.ossreviewtoolkit.utils.core.OkHttpClientHelper -import org.ossreviewtoolkit.utils.core.Os import org.ossreviewtoolkit.utils.core.ProcessCapture import org.ossreviewtoolkit.utils.core.createOrtTempDir import org.ossreviewtoolkit.utils.core.isTrue diff --git a/settings.gradle.kts b/settings.gradle.kts index c4d77789551a7..16a42fdb15e72 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -64,6 +64,7 @@ include(":notifier") include(":reporter") include(":reporter-web-app") include(":scanner") +include(":utils:common") include(":utils:core") include(":utils:spdx") include(":utils:test") diff --git a/utils/common/build.gradle.kts b/utils/common/build.gradle.kts new file mode 100644 index 0000000000000..ebbe336e931f3 --- /dev/null +++ b/utils/common/build.gradle.kts @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2021 Bosch.IO GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * 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 b/utils/common/src/main/kotlin/FileMatcher.kt similarity index 97% rename from utils/core/src/main/kotlin/FileMatcher.kt rename to utils/common/src/main/kotlin/FileMatcher.kt index 15db5cecab2e6..ae121f862768e 100644 --- a/utils/core/src/main/kotlin/FileMatcher.kt +++ b/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/utils/core/src/main/kotlin/Os.kt b/utils/common/src/main/kotlin/Os.kt similarity index 95% rename from utils/core/src/main/kotlin/Os.kt rename to utils/common/src/main/kotlin/Os.kt index 1fd3f8e8ad083..99a1b3d640c40 100644 --- a/utils/core/src/main/kotlin/Os.kt +++ b/utils/common/src/main/kotlin/Os.kt @@ -17,7 +17,7 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.utils.core +package org.ossreviewtoolkit.utils.common import java.io.File import java.lang.IllegalArgumentException @@ -82,7 +82,6 @@ object Os { it.isNotBlank() } ?: throw IllegalArgumentException("Unable to determine a user home directory.") - log.warn { "Fixing up the user home directory from '$userHome' to '$fallbackUserHome'." } System.setProperty("user.home", fallbackUserHome) return fallbackUserHome diff --git a/utils/core/src/test/kotlin/FileMatcherTest.kt b/utils/common/src/test/kotlin/FileMatcherTest.kt similarity index 97% rename from utils/core/src/test/kotlin/FileMatcherTest.kt rename to utils/common/src/test/kotlin/FileMatcherTest.kt index 75d88f919c472..430c3769e88e4 100644 --- a/utils/core/src/test/kotlin/FileMatcherTest.kt +++ b/utils/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 index 5f70cbd45d244..1f4cd4fbf4e1c 100644 --- 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 { @@ -35,6 +34,8 @@ plugins { } dependencies { + api(project(":utils:common")) + api("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") api("com.squareup.okhttp3:okhttp:$okhttpVersion") api("com.vdurmont:semver4j:$semverVersion") @@ -47,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") diff --git a/utils/core/src/main/kotlin/ArchiveUtils.kt b/utils/core/src/main/kotlin/ArchiveUtils.kt index 60fe6bec59366..09da6785abc2b 100644 --- a/utils/core/src/main/kotlin/ArchiveUtils.kt +++ b/utils/core/src/main/kotlin/ArchiveUtils.kt @@ -48,6 +48,9 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream import org.apache.commons.compress.compressors.xz.XZCompressorInputStream import org.apache.commons.compress.utils.SeekableInMemoryByteChannel +import org.ossreviewtoolkit.utils.common.Os +import org.ossreviewtoolkit.utils.spdx.VCS_DIRECTORIES + enum class ArchiveType(vararg val extensions: String) { TAR(".gem", ".tar"), TAR_BZIP2(".tar.bz2", ".tbz2"), @@ -68,6 +71,25 @@ enum class ArchiveType(vararg val extensions: String) { } } +/** + * Archive the contents of [inputDir], omitting common [VCS_DIRECTORIES], to [zipFile] where an optional [prefix] is + * added to each file. Return a [Result] wrapping the [zipFile] on success, or an exception of failure. + */ +fun archive(inputDir: File, zipFile: File, prefix: String = ""): Result { + return runCatching { + inputDir.packZip( + zipFile, + prefix, + directoryFilter = { it.name !in VCS_DIRECTORIES }, + fileFilter = { it != zipFile } + ) + + zipFile + }.onFailure { + it.showStackTrace() + } +} + /** * Unpack the [File] to [targetDirectory] using [filter] to select only the entries of interest. */ diff --git a/utils/core/src/main/kotlin/Ci.kt b/utils/core/src/main/kotlin/Ci.kt index dd8e3a0810bc7..3fd1969c2e87e 100644 --- a/utils/core/src/main/kotlin/Ci.kt +++ b/utils/core/src/main/kotlin/Ci.kt @@ -19,6 +19,8 @@ package org.ossreviewtoolkit.utils.core +import org.ossreviewtoolkit.utils.common.Os + /** * Continuous-Integration-specific utility functions. */ diff --git a/utils/core/src/main/kotlin/Environment.kt b/utils/core/src/main/kotlin/Environment.kt index 53df62b21bc6b..a6713216b4ab9 100644 --- a/utils/core/src/main/kotlin/Environment.kt +++ b/utils/core/src/main/kotlin/Environment.kt @@ -21,6 +21,8 @@ package org.ossreviewtoolkit.utils.core import java.lang.Runtime +import org.ossreviewtoolkit.utils.common.Os + /** * A description of the environment that ORT was executed in. */ diff --git a/utils/core/src/main/kotlin/Extensions.kt b/utils/core/src/main/kotlin/Extensions.kt index e618ea2e1c9ae..452d1bc7298c7 100644 --- a/utils/core/src/main/kotlin/Extensions.kt +++ b/utils/core/src/main/kotlin/Extensions.kt @@ -39,6 +39,10 @@ import java.nio.file.StandardCopyOption import java.nio.file.attribute.BasicFileAttributes import java.util.Locale +import kotlin.reflect.full.memberProperties + +import org.ossreviewtoolkit.utils.common.Os + /** * Create a temporary directory with a name specific to ORT, and optional [infixes]. */ @@ -67,6 +71,12 @@ fun createOrtTempFile(prefix: String? = null, suffix: String? = null): File = fun Any.createOrtTempFile(prefix: String? = null, suffix: String? = null): File = kotlin.io.path.createTempFile(createOrtTempDir().toPath(), prefix, suffix).toFile() +/** + * Return whether [T] (usually an instance of a data class) has any non-null property. + */ +inline fun T.hasNonNullProperty() = + T::class.memberProperties.asSequence().map { it.get(this) }.any { it != null } + /** * Return a string of hexadecimal digits representing the bytes in the array. */ diff --git a/utils/core/src/main/kotlin/OrtAuthenticator.kt b/utils/core/src/main/kotlin/OrtAuthenticator.kt index ad9888fb5c662..b3df43fefa353 100644 --- a/utils/core/src/main/kotlin/OrtAuthenticator.kt +++ b/utils/core/src/main/kotlin/OrtAuthenticator.kt @@ -27,6 +27,8 @@ import java.net.ProxySelector import org.apache.logging.log4j.Level +import org.ossreviewtoolkit.utils.common.Os + /** * An authenticator for network connections established by ORT. For proxy authentication, the [OrtProxySelector] is * required to also be installed. diff --git a/utils/core/src/main/kotlin/OrtProxySelector.kt b/utils/core/src/main/kotlin/OrtProxySelector.kt index c8ab845929fe5..d5457d5f1b233 100644 --- a/utils/core/src/main/kotlin/OrtProxySelector.kt +++ b/utils/core/src/main/kotlin/OrtProxySelector.kt @@ -29,6 +29,8 @@ import java.net.URI import org.apache.logging.log4j.Level +import org.ossreviewtoolkit.utils.common.Os + typealias AuthenticatedProxy = Pair typealias ProtocolProxyMap = Map> diff --git a/utils/core/src/main/kotlin/Redirection.kt b/utils/core/src/main/kotlin/Redirection.kt index 53099cf851b9e..f587cb5cdb006 100644 --- a/utils/core/src/main/kotlin/Redirection.kt +++ b/utils/core/src/main/kotlin/Redirection.kt @@ -23,6 +23,8 @@ import java.io.FileInputStream import java.io.FileOutputStream import java.io.PrintStream +import org.ossreviewtoolkit.utils.common.Os + private fun redirectOutput(originalOutput: PrintStream, setOutput: (PrintStream) -> Unit, block: () -> Unit): String { val tempFile = createOrtTempFile("redirect") val fileStream = FileOutputStream(tempFile) diff --git a/utils/core/src/main/kotlin/Utils.kt b/utils/core/src/main/kotlin/Utils.kt index cd1fa689e99f8..9fed8ee22cbe8 100644 --- a/utils/core/src/main/kotlin/Utils.kt +++ b/utils/core/src/main/kotlin/Utils.kt @@ -23,9 +23,7 @@ package org.ossreviewtoolkit.utils.core import java.io.File -import kotlin.reflect.full.memberProperties - -import org.ossreviewtoolkit.utils.spdx.VCS_DIRECTORIES +import org.ossreviewtoolkit.utils.common.Os private val mavenCentralUrlPattern = Regex("^https?://repo1?\\.maven(\\.apache)?\\.org(/.*)?$") @@ -67,31 +65,6 @@ val ortDataDirectory by lazy { */ var printStackTrace = false -/** - * Archive the contents of [inputDir], omitting common [VCS_DIRECTORIES], to [zipFile] where an optional [prefix] is - * added to each file. Return a [Result] wrapping the [zipFile] on success, or an exception of failure. - */ -fun archive(inputDir: File, zipFile: File, prefix: String = ""): Result { - return runCatching { - inputDir.packZip( - zipFile, - prefix, - directoryFilter = { it.name !in VCS_DIRECTORIES }, - fileFilter = { it != zipFile } - ) - - zipFile - }.onFailure { - it.showStackTrace() - } -} - -/** - * Return whether [T] (usually an instance of a data class) has any non-null property. - */ -inline fun T.hasNonNullProperty() = - T::class.memberProperties.asSequence().map { it.get(this) }.any { it != null } - /** * Filter a list of [names] to include only those that likely belong to the given [version] of an optional [project]. */ diff --git a/utils/core/src/test/kotlin/ExtensionsTest.kt b/utils/core/src/test/kotlin/ExtensionsTest.kt index e7bf6262a745b..d61896f0294d4 100644 --- a/utils/core/src/test/kotlin/ExtensionsTest.kt +++ b/utils/core/src/test/kotlin/ExtensionsTest.kt @@ -34,6 +34,7 @@ import java.io.File import java.io.IOException import java.util.Locale +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.test.containExactly import org.ossreviewtoolkit.utils.test.createSpecTempDir import org.ossreviewtoolkit.utils.test.createTestTempDir diff --git a/utils/core/src/test/kotlin/ProcessCaptureTest.kt b/utils/core/src/test/kotlin/ProcessCaptureTest.kt index 4785121a84648..3f5fdebcab26b 100644 --- a/utils/core/src/test/kotlin/ProcessCaptureTest.kt +++ b/utils/core/src/test/kotlin/ProcessCaptureTest.kt @@ -22,6 +22,8 @@ package org.ossreviewtoolkit.utils.core import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe +import org.ossreviewtoolkit.utils.common.Os + class ProcessCaptureTest : StringSpec({ "Environment variables should be passed correctly" { val env = mapOf("PREFIX" to "This is some path: ", "SOME_PATH" to "/foo/bar") diff --git a/utils/core/src/test/kotlin/UtilsTest.kt b/utils/core/src/test/kotlin/UtilsTest.kt index 4540baa942dcf..63b8fe4f83fed 100644 --- a/utils/core/src/test/kotlin/UtilsTest.kt +++ b/utils/core/src/test/kotlin/UtilsTest.kt @@ -32,6 +32,7 @@ import io.kotest.matchers.shouldNot import java.io.File import java.nio.file.Paths +import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.test.shouldNotBeNull class UtilsTest : WordSpec({