Permalink
Browse files

Updated the build to use 1.2.0 release of shiro and 2.4 release of Lift

  • Loading branch information...
1 parent 6466023 commit 6ca41654bb665214255693ceeb0c5d3712bafc9f @timperrett committed Jan 24, 2012
Showing with 17 additions and 11 deletions.
  1. +4 −4 library/src/main/scala/shiro/sitemap/locs.scala
  2. +13 −7 project/build.scala
@@ -29,19 +29,19 @@ object Locs {
private def DisplayError(message: String) = () =>
RedirectWithState(indexURL, RedirectState(() => S.error(message)))
- val RequireAuthentication = If(
+ def RequireAuthentication = If(
() => isAuthenticated,
() => RedirectBackToReferrer)
- val RequireNoAuthentication = If(
+ def RequireNoAuthentication = If(
() => !isAuthenticated,
() => RedirectToIndexURL)
- val RequireRemembered = If(
+ def RequireRemembered = If(
() => isAuthenticatedOrRemembered,
() => RedirectBackToReferrer)
- val RequireNotRemembered = If(
+ def RequireNotRemembered = If(
() => !isAuthenticatedOrRemembered,
() => RedirectToIndexURL)
View
@@ -2,7 +2,7 @@ import sbt._, Keys._
object BuildSettings {
val buildOrganization = "eu.getintheloop"
- val buildVersion = "0.0.5-SNAPSHOT"
+ val buildVersion = "0.0.5"
val buildScalaVersion = "2.9.1"
val buildSettings = Defaults.defaultSettings ++ Seq (
@@ -14,8 +14,8 @@ object BuildSettings {
crossScalaVersions := Seq("2.8.1", "2.9.0", "2.9.0-1", "2.9.1"),
resolvers ++= Seq(
ScalaToolsReleases,
- "Shiro Snapshots" at "https://repository.apache.org/content/repositories/snapshots/"//,
- // ".m2" at "file://"+Path.userHome+"/.m2/repository"
+ "Shiro Releases" at "https://repository.apache.org/content/repositories/releases/",
+ "Shiro Snapshots" at "https://repository.apache.org/content/repositories/snapshots/"
),
publishTo := Some("Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"),
credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
@@ -24,15 +24,21 @@ object BuildSettings {
object LiftShiroBuild extends Build {
lazy val root = Project("lift-shiro-root", file("."),
- settings = BuildSettings.buildSettings
+ settings = BuildSettings.buildSettings ++ Seq(
+ // the root is just an aggregator so dont publish a JAR
+ publishArtifact in (Compile, packageBin) := false,
+ publishArtifact in (Test, packageBin) := false,
+ publishArtifact in (Compile, packageDoc) := false,
+ publishArtifact in (Compile, packageSrc) := false
+ )
) aggregate(library, example)
lazy val library: Project = Project("lift-shiro", file("library"),
settings = BuildSettings.buildSettings ++ (
libraryDependencies ++= Seq(
- "net.liftweb" %% "lift-webkit" % "2.4-M5" % "compile",
- "org.apache.shiro" % "shiro-core" % "1.2.0-SNAPSHOT",
- "org.apache.shiro" % "shiro-web" % "1.2.0-SNAPSHOT",
+ "net.liftweb" %% "lift-webkit" % "2.4" % "compile",
+ "org.apache.shiro" % "shiro-core" % "1.2.0",
+ "org.apache.shiro" % "shiro-web" % "1.2.0",
"commons-beanutils" % "commons-beanutils" % "20030211.134440"
)
)

0 comments on commit 6ca4165

Please sign in to comment.