From 351cf4d8afc5b6ee96e78ffe2d4074e4fcf45ada Mon Sep 17 00:00:00 2001 From: Petar Bozin Date: Fri, 15 Jul 2016 12:01:53 +0200 Subject: [PATCH] Upgraded to scala 2.11, maven3 and sbt 0.13.9 --- pom.xml | 74 +++++++++++++++++++++------------------- project/build.properties | 2 +- project/build.scala | 22 ++++-------- project/plugins.sbt | 20 ++++++----- 4 files changed, 58 insertions(+), 60 deletions(-) diff --git a/pom.xml b/pom.xml index 305a82c8..ffe0333b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,10 +11,9 @@ API Explorer 2015 - 2.10.5 - 2.10 - 2.6.2 - 2.6 + 2.11.8 + 2.11 + 2.6.3 UTF-8 ${project.build.sourceEncoding} @@ -31,9 +30,9 @@ https://oss.sonatype.org/content/groups/scala-tools/ - java.net.maven2 - java.net Maven2 Repository - http://download.java.net/maven/2/ + java.net.maven3 + java.net Maven3 Repository + http://download.java.net/maven/3/ scala-tools.snapshots @@ -53,56 +52,61 @@ net.liftweb - lift-mapper_${scala.baseversion} + lift-mapper_${scala.version} ${lift.version} net.liftmodules - widgets_${lift.baseversion}_${scala.baseversion} - 1.3 + widgets_2.6_${scala.version} + 1.4-SNAPSHOT net.databinder - dispatch-http_${scala.baseversion} + dispatch-http_${scala.version} 0.8.10 net.databinder - dispatch-oauth_${scala.baseversion} + dispatch-oauth_${scala.version} 0.8.10 net.databinder.dispatch - dispatch-lift-json_${scala.baseversion} - 0.11.0 + dispatch-lift-json_${scala.version} + 0.11.3 ch.qos.logback logback-classic - 0.9.30 + 1.1.7 javax.servlet - servlet-api - 2.5 + javax.servlet-api + 3.1.0 provided junit junit - 4.7 + 4.12 test org.scalatest - scalatest_${scala.baseversion} - 2.3.0-SNAP2 + scalatest_${scala.version} + 2.2.6 test - org.scala-tools.testing - specs_${scala.baseversion} - 1.6.9 + org.scalaz.stream + scalaz-stream_2.11 + 0.8.3 + + + org.specs2 + specs2_${scala.version} + 2.4.17 test @@ -115,13 +119,13 @@ org.scala-lang scala-compiler - ${scala.version} + ${scala.compiler} compile org.scala-lang scala-library - ${scala.version} + ${scala.compiler} oauth.signpost @@ -137,7 +141,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.7.2 + ${scala-version} true @@ -166,7 +170,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.7 + 1.10 generate-sources @@ -184,15 +188,15 @@ net.alchim31.maven scala-maven-plugin - 3.2.0 + 3.2.2 ${project.build.sourceEncoding} -Xmx1024m -DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties - ${scala.baseversion} - ${scala.version} + ${scala.version} + ${scala.compiler} incremental true @@ -228,7 +232,7 @@ org.apache.maven.plugins maven-resources-plugin - 2.7 + 3.0.1 default-copy-resources @@ -280,7 +284,7 @@ org.apache.maven.plugins maven-idea-plugin - 2.2 + 2.2.1 true @@ -288,7 +292,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.7 + 2.10 true @@ -306,7 +310,7 @@ pl.project13.maven git-commit-id-plugin - 2.1.0 + 2.2.1 @@ -328,7 +332,7 @@ org.scala-tools maven-scala-plugin - 2.15.2 + 3.2.2 ${project.build.sourceEncoding} diff --git a/project/build.properties b/project/build.properties index b6c3c327..f4864c14 100755 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ #Project properties -sbt.version=0.11.3 +sbt.version=0.13.9 diff --git a/project/build.scala b/project/build.scala index 9dc1a79d..a4679de0 100755 --- a/project/build.scala +++ b/project/build.scala @@ -1,29 +1,21 @@ - - import sbt._ import Keys._ -import com.github.siasia._ -import PluginKeys._ -import WebPlugin._ -import WebappPlugin._ +import com.earldouglas.xwp._ + object LiftProjectBuild extends Build { override lazy val settings = super.settings ++ buildSettings - + lazy val buildSettings = Seq( organization := pom.groupId, version := pom.version ) - def yourWebSettings = webSettings ++ Seq( - // If you are use jrebel - scanDirectories in Compile := Nil - ) - lazy val opanBank = Project( pom.artifactId, base = file("."), - settings = defaultSettings ++ yourWebSettings ++ pom.settings) + settings = defaultSettings ++ pom.settings) + .enablePlugins(JettyPlugin) object pom { @@ -66,7 +58,7 @@ object LiftProjectBuild extends Build { populateProps((rep \ "url").text) at populateProps((rep \ "url").text) } - lazy val pomScalaVersion = (pom \ "properties" \ "scala.version").text + lazy val pomScalaVersion = (pom \ "properties" \ "scala.compiler").text lazy val artifactId = (pom \ "artifactId").text lazy val groupId = (pom \ "groupId").text @@ -85,7 +77,7 @@ object LiftProjectBuild extends Build { name := pom.name, resolvers ++= Seq( "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases", - "Java.net Maven2 Repository" at "http://download.java.net/maven/2/", + "Java.net Maven3 Repository" at "http://download.java.net/maven/3/", "Scala-Tools Dependencies Repository for Releases" at "http://scala-tools.org/repo-releases", "Scala-Tools Dependencies Repository for Snapshots" at "http://scala-tools.org/repo-snapshots"), diff --git a/project/plugins.sbt b/project/plugins.sbt index 259302b1..2dcdaf79 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,14 +7,15 @@ resolvers += Classpaths.typesafeResolver //xsbt-web-plugin -resolvers += "Web plugin repo" at "http://siasia.github.com/maven2" +addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "2.1.0") -libraryDependencies <+= sbtVersion(v => v match { -case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8" -case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10" -case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.11" -case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1" -}) +//resolvers += "Web plugin repo" at "http://siasia.github.com/maven2" +//libraryDependencies <+= sbtVersion(v => v match { +//case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8" +//case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10" +//case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.11" +//case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1" +//}) //sbteclipse resolvers += { @@ -23,9 +24,10 @@ resolvers += { Resolver.url("Typesafe Repository", typesafeRepoUrl)(pattern) } -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0") +addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") //sbt-idea resolvers += "sbt-idea-repo" at "http://mpeltonen.github.com/maven/" -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0") +addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")