Merge pull request #85 from gemelen/feature/upgrade-maven

Feature/upgrade maven

Author: gemelen

build.sbt

@@ -1,5 +1,5 @@
-val mvnVersion = "3.8.2"
-val mvnResolverVersion = "1.7.2"
+val mvnVersion = "3.9.4"
+val mvnResolverVersion = "1.9.18"
 val scala212 = "2.12.19"
 
 ThisBuild / organization := "com.github.sbt"
@@ -19,11 +19,17 @@ lazy val root = (project in file("."))
   .enablePlugins(SbtPlugin)
   .settings(nocomma {
     name := "sbt-pom-reader"
+    scalacOptions := Seq(
+      "-Wconf:any:wv",
+      "-Xlint:unused",
+      "-Xlint:deprecation"
+    )
 
     libraryDependencies ++= Seq(
       "org.apache.maven" % "maven-embedder" % mvnVersion
     ) ++ Seq(
       "org.apache.maven.resolver" % "maven-resolver-connector-basic",
+      "org.apache.maven.resolver" % "maven-resolver-supplier",
       "org.apache.maven.resolver" % "maven-resolver-transport-file",
       "org.apache.maven.resolver" % "maven-resolver-transport-http",
       "org.apache.maven.resolver" % "maven-resolver-transport-wagon"
@@ -39,6 +45,6 @@ lazy val root = (project in file("."))
 
     scriptedLaunchOpts := scriptedLaunchOpts.value ++ Seq("-Dproject.version=" + version.value)
     scriptedLaunchOpts ++= Seq("-Dplugin.version=" + version.value)
-    scriptedBufferLog := false
+    scriptedBufferLog := true
     scriptedSbt := "1.9.9"
   })

src/main/scala/sbtpomreader/MavenHelper.scala

@@ -80,10 +80,10 @@ object MavenHelper {
         scalaVersion.value
       }
     },
-    unmanagedSourceDirectories in Compile ++= {
+    Compile / unmanagedSourceDirectories ++= {
       getAdditionalSourcesFromPlugin(effectivePom.value).filterNot(_.contains("test")).map(x => baseDirectory.value / x)
     },
-    unmanagedSourceDirectories in Test ++= {
+    Test / unmanagedSourceDirectories ++= {
       getAdditionalSourcesFromPlugin(effectivePom.value).filter(_.contains("test")).map(x => baseDirectory.value / x)
     },
     libraryDependencies ++= fromPom(getDependencies).value,

src/main/scala/sbtpomreader/MavenProjectHelper.scala

@@ -1,18 +1,10 @@
 package sbtpomreader
 
-import sbtpomreader.SbtPomKeys._
-
 import sbt._
-import sbt.Keys._
 
 import scala.collection.JavaConverters._
 
-import org.apache.maven.model.{
-  Dependency => PomDependency,
-  Model => PomModel,
-  Plugin => PomPlugin,
-  Repository => PomRepository
-}
+import org.apache.maven.model.{ Model => PomModel }
 
 /** This object knows how to load maven reactor projects and turn them into sbt projects. */
 object MavenProjectHelper {

src/main/scala/sbtpomreader/package.scala

@@ -2,24 +2,14 @@ import java.io.File
 
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils
 import org.eclipse.aether.RepositorySystem
-import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory
 import org.eclipse.aether.repository.LocalRepository
-import org.eclipse.aether.spi.connector.RepositoryConnectorFactory
-import org.eclipse.aether.spi.connector.transport.TransporterFactory
-import org.eclipse.aether.transport.file.FileTransporterFactory
-import org.eclipse.aether.transport.http.HttpTransporterFactory
-import org.eclipse.aether.transport.wagon.WagonTransporterFactory
+import org.eclipse.aether.supplier.RepositorySystemSupplier
 
 /** Helper methods for dealing with starting up Aether. */
 package object sbtpomreader {
-  def newRepositorySystemImpl: RepositorySystem = {
-    val locator = MavenRepositorySystemUtils.newServiceLocator()
-    locator.addService(classOf[RepositoryConnectorFactory], classOf[BasicRepositoryConnectorFactory])
-    locator.addService(classOf[TransporterFactory], classOf[FileTransporterFactory])
-    locator.addService(classOf[TransporterFactory], classOf[HttpTransporterFactory])
-    locator.addService(classOf[TransporterFactory], classOf[WagonTransporterFactory])
-    locator.getService(classOf[RepositorySystem])
-  }
+  def newRepositorySystemImpl: RepositorySystem =
+    this.synchronized[RepositorySystem](new RepositorySystemSupplier().get())
+
   def newSessionImpl(system: RepositorySystem, localRepoDir: File) = {
     val session = MavenRepositorySystemUtils.newSession()
     val localRepo = new LocalRepository(localRepoDir.getAbsolutePath)