Skip to content

Commit 05ef639

Browse files
author
Antonio Cunei
committed
Temporarily moving out of the way the incomplete Maven build system
The current (incomplete) code is using an outdated version of Aether, resulting in some bitrot. The package names would have to be changed, and the logic reworked in order to conform to the new API and package names. For the moment, this incomplete build system is being moved out of the way, so that the new mini-build system based on Aether can use the latest API; at a later time, the old code should be brought up to date again.
1 parent 0c4417e commit 05ef639

File tree

14 files changed

+0
-705
lines changed

14 files changed

+0
-705
lines changed

build/src/main/scala/com/typesafe/dbuild/build/LocalBuildMain.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class LocalBuildMain(repos: List[xsbti.Repository], options: BuildRunOptions) {
3030
Seq(new support.sbt.SbtBuildSystem(repos, targetDir, options.debug),
3131
support.scala.ScalaBuildSystem,
3232
new support.ivy.IvyBuildSystem(repos, targetDir),
33-
support.mvn.MvnBuildSystem,
3433
support.assemble.AssembleBuildSystem,
3534
support.test.TestBuildSystem,
3635
support.nil.NilBuildSystem)

build/src/main/scala/com/typesafe/dbuild/build/SimpleBuildActor.scala

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.typesafe.dbuild.project.{ BuildSystem, BuildData }
99
import com.typesafe.dbuild.logging.Logger
1010
import com.typesafe.dbuild.hashing
1111
import com.typesafe.dbuild.graph
12-
import com.typesafe.dbuild.repo.PomHelper
1312
import akka.actor.{ Actor, ActorRef, Props }
1413
import akka.pattern.{ ask, pipe }
1514
import akka.dispatch.{ Future, Futures, Promise }
@@ -250,17 +249,6 @@ class SimpleBuildActor(extractor: ActorRef, builder: ActorRef, repository: Repos
250249
log.info("---== End Dependency Information ===---")
251250
}
252251

253-
def logPoms(build: RepeatableDBuildConfig, arts: BuildArtifactsIn, log: Logger): Unit =
254-
try {
255-
log info "Printing Poms!"
256-
val poms = PomHelper.makePomStrings(build, arts)
257-
log info (poms mkString "----------")
258-
} catch {
259-
case e: Throwable =>
260-
log trace e
261-
throw e
262-
}
263-
264252
implicit val buildTimeout: Timeout = 4 hours
265253
type ProjectGraph = graph.Graph[ProjectConfigAndExtracted, EdgeData]
266254
type BuildFinder = Function1[String, RepeatableProjectBuild]

metadata/src/main/scala/com/typesafe/dbuild/model/Config.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,6 @@ case class IvyArtifact(
622622
ext: String = "jar",
623623
configs: SeqString = Seq("default"))
624624

625-
case class MavenExtraConfig(
626-
directory: String = "") extends ExtraConfig
627-
628625
/**
629626
* sbt-specific build parameters
630627
*/
@@ -658,7 +655,6 @@ object BuildSystemExtras {
658655
"sbt" -> classOf[SbtExtraConfig],
659656
"scala" -> classOf[ScalaExtraConfig],
660657
"ivy" -> classOf[IvyExtraConfig],
661-
"maven" -> classOf[MavenExtraConfig],
662658
"assemble" -> classOf[AssembleExtraConfig],
663659
"test" -> classOf[TestExtraConfig],
664660
"nil" -> classOf[NilExtraConfig])

repo/src/main/scala/com/typesafe/dbuild/repo/PomHelper.scala

Lines changed: 0 additions & 81 deletions
This file was deleted.

repo/src/main/scala/com/typesafe/dbuild/repo/PomResolver.scala

Lines changed: 0 additions & 68 deletions
This file was deleted.

repo/src/main/scala/com/typesafe/dbuild/repo/package.scala

Lines changed: 0 additions & 38 deletions
This file was deleted.

repo/src/test/scala/com/typesafe/dbuild/repo/PomHelperSpec.scala

Lines changed: 0 additions & 55 deletions
This file was deleted.

support/src/main/scala/com/typesafe/dbuild/support/mvn/DependencyExtractor.scala

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)