@@ -23,10 +23,7 @@ import java.io.File
23
23
24
24
import org.apache.maven.project.ProjectBuildingResult
25
25
26
- import org.eclipse.aether.artifact.Artifact
27
26
import org.eclipse.aether.graph.DependencyNode
28
- import org.eclipse.aether.repository.WorkspaceReader
29
- import org.eclipse.aether.repository.WorkspaceRepository
30
27
31
28
import org.ossreviewtoolkit.analyzer.AbstractPackageManagerFactory
32
29
import org.ossreviewtoolkit.analyzer.PackageManager
@@ -41,10 +38,10 @@ import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
41
38
import org.ossreviewtoolkit.model.config.RepositoryConfiguration
42
39
import org.ossreviewtoolkit.model.createAndLogIssue
43
40
import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder
41
+ import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.LocalProjectWorkspaceReader
44
42
import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.MavenDependencyHandler
45
43
import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.MavenSupport
46
44
import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.getOriginalScm
47
- import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.identifier
48
45
import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.parseAuthors
49
46
import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.parseLicenses
50
47
import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.parseVcsInfo
@@ -77,22 +74,7 @@ class Maven(
77
74
) = Maven (type, analysisRoot, analyzerConfig, repoConfig)
78
75
}
79
76
80
- private inner class LocalProjectWorkspaceReader : WorkspaceReader {
81
- private val workspaceRepository = WorkspaceRepository (" maven/remote-artifacts" )
82
-
83
- override fun findArtifact (artifact : Artifact ) =
84
- artifact.takeIf { it.extension == " pom" }?.let {
85
- localProjectBuildingResults[it.identifier()]?.pomFile?.absoluteFile
86
- }
87
-
88
- override fun findVersions (artifact : Artifact ) =
89
- // Avoid resolution of (SNAPSHOT) versions for local projects.
90
- localProjectBuildingResults[artifact.identifier()]?.let { listOf (artifact.version) }.orEmpty()
91
-
92
- override fun getRepository () = workspaceRepository
93
- }
94
-
95
- private val mavenSupport = MavenSupport (LocalProjectWorkspaceReader ())
77
+ private val mavenSupport = MavenSupport (LocalProjectWorkspaceReader { localProjectBuildingResults[it]?.pomFile })
96
78
97
79
private val localProjectBuildingResults = mutableMapOf<String , ProjectBuildingResult >()
98
80
0 commit comments