Completed ESME-371: Upgrade to Lift 2.4-RC1 and SBT 0.11.2 versions
git-svn-id: https://svn.apache.org/repos/asf/esme/trunk@1226875 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/server/build.sbt b/server/build.sbt
index a3b8861..387c0b3 100644
--- a/server/build.sbt
+++ b/server/build.sbt
@@ -21,7 +21,7 @@
libraryDependencies ++= {
val scalaVersion = "2.9.1"
- val liftVersion = "2.4-M5"
+ val liftVersion = "2.4-RC1"
val compassVersion = "2.1.1"
val luceneVersion = "2.4.0"
val scalazVersion = "6.0.3"
diff --git a/server/pom.xml b/server/pom.xml
index 6b01d9c..720c6c9 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -73,7 +73,7 @@
</developer>
</developers>
<properties>
- <lift.version>2.4-M5</lift.version>
+ <lift.version>2.4-RC1</lift.version>
<scala.version>2.9.1</scala.version>
<scalaz.version>6.0.3</scalaz.version>
<compass.version>2.1.1</compass.version>
diff --git a/server/project/build.properties b/server/project/build.properties
index e4a82f8..fdfc61f 100644
--- a/server/project/build.properties
+++ b/server/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.1
\ No newline at end of file
+sbt.version=0.11.2
\ No newline at end of file
diff --git a/server/project/plugins/build.sbt b/server/project/plugins.sbt
similarity index 92%
rename from server/project/plugins/build.sbt
rename to server/project/plugins.sbt
index 34ea598..07dd6d2 100644
--- a/server/project/plugins/build.sbt
+++ b/server/project/plugins.sbt
@@ -1,10 +1,10 @@
-resolvers ++= Seq(
- "Web plugin repo" at "http://siasia.github.com/maven2",
- Resolver.url("Typesafe repository", new java.net.URL("http://typesafe.artifactoryonline.com/typesafe/ivy-releases/"))(Resolver.defaultIvyPatterns)
-)
-
-libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.9"))
-
-resolvers += Classpaths.typesafeResolver
-
+resolvers ++= Seq(
+ "Web plugin repo" at "http://siasia.github.com/maven2",
+ Resolver.url("Typesafe repository", new java.net.URL("http://typesafe.artifactoryonline.com/typesafe/ivy-releases/"))(Resolver.defaultIvyPatterns)
+)
+
+libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.10"))
+
+resolvers += Classpaths.typesafeResolver
+
addSbtPlugin("com.typesafe.startscript" % "xsbt-start-script-plugin" % "0.5.0")
\ No newline at end of file
