build(Gradle): Move remaining Maven and Sbt package managers to projects

Signed-off-by: Sebastian Schuberth <[email protected]>

Author: sschuberth

.gitmodules

@@ -11,7 +11,7 @@
 	url = https://github.com/advancedtelematic/quickcheck-state-machine.git
 	ignore = untracked
 [submodule "sbt-multi-project-example"]
-	path = analyzer/src/funTest/assets/projects/external/sbt-multi-project-example
+	path = plugins/package-managers/sbt/src/funTest/assets/projects/external/sbt-multi-project-example
 	url = https://github.com/oss-review-toolkit/sbt-multi-project-example.git
 	ignore = untracked
 [submodule "dart-http"]

analyzer/build.gradle.kts

@@ -30,20 +30,8 @@ dependencies {
 
     implementation(project(":downloader"))
     implementation(project(":utils:ort-utils"))
-    implementation(project(":utils:spdx-utils"))
-
-    implementation(libs.mavenCore)
-
-    // TODO: Remove this once https://issues.apache.org/jira/browse/MNG-6561 is resolved.
-    implementation(libs.mavenCompat)
-
-    // The classes from the maven-resolver dependencies are not used directly but initialized by the Plexus IoC
-    // container automatically. They are required on the classpath for Maven dependency resolution to work.
-    implementation(libs.bundles.mavenResolver)
 
     implementation(libs.kotlinxCoroutines)
-    implementation(libs.log4jApi)
-    implementation(libs.semver4j)
 
     funTestImplementation(platform(project(":plugins:package-managers")))
 
@@ -54,6 +42,4 @@ dependencies {
 
     testFixturesImplementation(libs.kotestAssertionsCore)
     testFixturesImplementation(libs.kotestRunnerJunit5)
-
-    testImplementation(libs.mockk)
 }

analyzer/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory

@@ -81,10 +81,10 @@ class GitWorkingTreeFunTest : StringSpec({
 
     "Git correctly lists submodules" {
         val expectedSubmodules = listOf(
-            "analyzer/src/funTest/assets/projects/external/sbt-multi-project-example",
             "plugins/package-managers/pub/src/funTest/assets/projects/external/dart-http",
             "plugins/package-managers/python/src/funTest/assets/projects/external/example-python-flask",
             "plugins/package-managers/python/src/funTest/assets/projects/external/spdx-tools-python",
+            "plugins/package-managers/sbt/src/funTest/assets/projects/external/sbt-multi-project-example",
             "plugins/package-managers/stack/src/funTest/assets/projects/external/quickcheck-state-machine"
         ).associateWith { VersionControlSystem.getPathInfo(File("../$it")) }
 

downloader/src/funTest/kotlin/vcs/GitWorkingTreeFunTest.kt

@@ -28,6 +28,7 @@ dependencies {
 
     implementation(project(":downloader"))
     implementation(project(":plugins:package-managers:gradle-model"))
+    implementation(project(":plugins:package-managers:maven-package-manager"))
     implementation(project(":utils:common-utils"))
     implementation(project(":utils:ort-utils"))
 

plugins/package-managers/gradle/build.gradle.kts

@@ -40,8 +40,6 @@ import org.gradle.tooling.internal.consumer.DefaultGradleConnector
 import org.ossreviewtoolkit.analyzer.AbstractPackageManagerFactory
 import org.ossreviewtoolkit.analyzer.PackageManager
 import org.ossreviewtoolkit.analyzer.PackageManagerResult
-import org.ossreviewtoolkit.analyzer.managers.utils.MavenSupport
-import org.ossreviewtoolkit.analyzer.managers.utils.identifier
 import org.ossreviewtoolkit.downloader.VersionControlSystem
 import org.ossreviewtoolkit.model.DependencyGraph
 import org.ossreviewtoolkit.model.Identifier
@@ -55,6 +53,8 @@ import org.ossreviewtoolkit.model.config.PackageManagerConfiguration
 import org.ossreviewtoolkit.model.config.RepositoryConfiguration
 import org.ossreviewtoolkit.model.createAndLogIssue
 import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder
+import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.MavenSupport
+import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.identifier
 import org.ossreviewtoolkit.utils.common.Os
 import org.ossreviewtoolkit.utils.common.safeDeleteRecursively
 import org.ossreviewtoolkit.utils.common.splitOnWhitespace

plugins/package-managers/gradle/src/main/kotlin/Gradle.kt

@@ -27,15 +27,15 @@ import org.eclipse.aether.RepositoryException
 import org.eclipse.aether.artifact.DefaultArtifact
 import org.eclipse.aether.repository.RemoteRepository
 
-import org.ossreviewtoolkit.analyzer.managers.utils.MavenSupport
-import org.ossreviewtoolkit.analyzer.managers.utils.identifier
 import org.ossreviewtoolkit.model.Identifier
 import org.ossreviewtoolkit.model.Issue
 import org.ossreviewtoolkit.model.Package
 import org.ossreviewtoolkit.model.PackageLinkage
 import org.ossreviewtoolkit.model.Severity
 import org.ossreviewtoolkit.model.createAndLogIssue
 import org.ossreviewtoolkit.model.utils.DependencyHandler
+import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.MavenSupport
+import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.identifier
 import org.ossreviewtoolkit.utils.common.collectMessages
 import org.ossreviewtoolkit.utils.ort.showStackTrace
 

plugins/package-managers/gradle/src/main/kotlin/GradleDependencyHandler.kt

@@ -47,7 +47,6 @@ import org.apache.maven.project.ProjectBuildingException
 import org.eclipse.aether.artifact.DefaultArtifact
 import org.eclipse.aether.repository.RemoteRepository
 
-import org.ossreviewtoolkit.analyzer.managers.utils.MavenSupport
 import org.ossreviewtoolkit.model.Identifier
 import org.ossreviewtoolkit.model.Issue
 import org.ossreviewtoolkit.model.Package
@@ -57,6 +56,7 @@ import org.ossreviewtoolkit.model.Scope
 import org.ossreviewtoolkit.model.Severity
 import org.ossreviewtoolkit.model.VcsInfo
 import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder
+import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.MavenSupport
 import org.ossreviewtoolkit.utils.test.shouldNotBeNull
 
 /**

plugins/package-managers/gradle/src/test/kotlin/GradleDependencyHandlerTest.kt

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2023 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
+ *
+ * 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
+ */
+
+plugins {
+    // Apply precompiled plugins.
+    id("ort-library-conventions")
+}
+
+dependencies {
+    api(project(":analyzer"))
+    api(project(":model"))
+
+    api(libs.mavenCore)
+    api(libs.mavenResolverApi)
+
+    implementation(project(":downloader"))
+    implementation(project(":utils:common-utils"))
+
+    // The classes from the maven-resolver dependencies are not used directly but initialized by the Plexus IoC
+    // container automatically. They are required on the classpath for Maven dependency resolution to work.
+    runtimeOnly(libs.bundles.mavenResolver)
+
+    // TODO: Remove this once https://issues.apache.org/jira/browse/MNG-6561 is resolved.
+    runtimeOnly(libs.mavenCompat)
+
+    funTestImplementation(testFixtures(project(":analyzer")))
+
+    testImplementation(libs.mockk)
+}

plugins/package-managers/maven/build.gradle.kts

@@ -1,7 +1,7 @@
 ---
 project:
   id: "Maven:org.ossreviewtoolkit.maven:maven-app:1.0-SNAPSHOT"
-  definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/maven/app/pom.xml"
+  definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven/app/pom.xml"
   authors:
   - "Google"
   - "The Apache Software Foundation"
@@ -20,7 +20,7 @@ project:
     type: "Git"
     url: "<REPLACE_URL_PROCESSED>"
     revision: "<REPLACE_REVISION>"
-    path: "analyzer/src/funTest/assets/projects/synthetic/maven/app"
+    path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/maven/app"
   homepage_url: "http://maven.apache.org"
   scopes:
   - name: "compile"