Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Fashionbase/framework
...
head fork: lift/framework
Checking mergeability… Don't worry, you can still create the pull request.
  • 18 commits
  • 1 file changed
  • 0 commit comments
  • 3 contributors
Showing with 5 additions and 2 deletions.
  1. +5 −2 project/build/LiftFrameworkProject.scala
View
7 project/build/LiftFrameworkProject.scala
@@ -49,12 +49,15 @@ class LiftFrameworkProject(info: ProjectInfo) extends ParentProject(info) with L
// --------------------
lazy val db = persistenceProject("db")(util)
lazy val proto = persistenceProject("proto")(webkit)
- lazy val jpa = persistenceProject("jpa", scalajpa, persistence_api)(webkit)
+// FIXME: Scala 2.9.0.RC1
+// lazy val jpa = persistenceProject("jpa", scalajpa, persistence_api)(webkit)
+ lazy val jpa = persistenceProject("jpa", "org.scala-libs" %% "scalajpa" % "1.4-SNAPSHOT", persistence_api)(webkit)
lazy val mapper = persistenceProject("mapper", RuntimeScope.h2database, RuntimeScope.derby)(db, proto)
lazy val record = persistenceProject("record")(proto, db) // db to be removed in v 2.5 (ticket 997)
lazy val ldap = persistenceProject("ldap", TestScope.apacheds)(mapper)
lazy val couchdb = persistenceProject("couchdb", dispatch_http)(record)
- lazy val squeryl_record = persistenceProject("squeryl-record", RuntimeScope.h2database, squeryl)(record, db)
+// FIXME: Scala 2.9.0.RC3
+// lazy val squeryl_record = persistenceProject("squeryl-record", RuntimeScope.h2database, squeryl)(record, db)
lazy val mongodb = persistenceProject("mongodb", mongo_driver)(json_ext)
lazy val mongodb_record = persistenceProject("mongodb-record")(record, mongodb)

No commit comments for this range

Something went wrong with that request. Please try again.