Skip to content

Commit

Permalink
Upgrade to very latest and remove dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
jvican committed Jan 8, 2018
1 parent ffdfdb0 commit f13c853
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 73 deletions.
21 changes: 8 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,18 @@ sbtPlugin := true
scalaVersion := "2.12.4"
releaseEarlyWith := SonatypePublisher

val aetherProviderVersion = "3.3.9"
val mavenVersion = "3.5.2"
val mvnWagonVersion = "3.0.0"
val aetherVersion = "1.0.2.v20150114"
val aetherVersion = "1.1.0"

libraryDependencies ++= Seq(
"org.apache.maven" % "maven-embedder" % aetherProviderVersion,
"org.apache.maven" % "maven-aether-provider" % aetherProviderVersion,
"org.eclipse.aether" % "aether-transport-wagon" % aetherVersion,
"org.apache.maven.wagon" % "wagon-http" % mvnWagonVersion,
"org.apache.maven.wagon" % "wagon-http-lightweight" % mvnWagonVersion,
"org.apache.maven.wagon" % "wagon-file" % mvnWagonVersion
)
"org.apache.maven" % "maven-embedder" % mavenVersion,
"org.apache.maven" % "maven-resolver-provider" % mavenVersion,

dependencyOverrides ++= Seq(
"org.apache.maven" % "maven-embedder" % aetherProviderVersion,
"org.apache.maven" % "maven-aether-provider" % aetherProviderVersion,
"org.eclipse.aether" % "aether-transport-wagon" % aetherVersion
"org.apache.maven.resolver" % "maven-resolver" % aetherVersion,
"org.apache.maven.resolver" % "maven-resolver-transport-wagon" % aetherVersion,
"org.apache.maven.resolver" % "maven-resolver-transport-http" % aetherVersion,
"org.apache.maven.resolver" % "maven-resolver-transport-file" % aetherVersion,
)

update := update.dependsOn(evicted).value
Expand Down
59 changes: 0 additions & 59 deletions src/main/scala/ch/epfl/scala/sbt/pom/HackedWagonProvider.scala

This file was deleted.

1 change: 0 additions & 1 deletion src/main/scala/ch/epfl/scala/sbt/pom/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ package object pom {
classOf[SnapshotMetadataGeneratorFactory])
locator.addService(classOf[MetadataGeneratorFactory],
classOf[VersionsMetadataGeneratorFactory])
locator.setServices(classOf[WagonProvider], new HackedWagonProvider)
locator.getService(classOf[RepositorySystem])
}

Expand Down

0 comments on commit f13c853

Please sign in to comment.