Permalink
Browse files

Upgrade to 2.8.1 / 2.2

  • Loading branch information...
1 parent 5ae9eaf commit 2653ffb7c81e8f685785094d5a604cef83fe1fd3 paul bernet committed Feb 25, 2011
Showing with 18 additions and 24 deletions.
  1. +10 −5 pom.xml
  2. +5 −16 web/pom.xml
  3. +3 −3 web/src/main/scala/TravelCompanionScala/snippet/BlogSnippet.scala
View
15 pom.xml
@@ -9,9 +9,9 @@
<version>1.0</version>
<name>TravelCompanionScala Master</name>
<packaging>pom</packaging>
- <inceptionYear>2010</inceptionYear>
+ <inceptionYear>2011</inceptionYear>
<properties>
- <scala.version>2.8.0</scala.version>
+ <scala.version>2.8.1</scala.version>
</properties>
<!-- Set up repo for ScalaJPA -->
@@ -75,12 +75,17 @@
<version>4.7</version>
<scope>test</scope>
</dependency>
- <!-- TODO Add newer version, was not available but this seems to work with 2.8 final -->
<dependency>
<groupId>net.databinder</groupId>
- <artifactId>dispatch-http_2.8.0.RC3</artifactId>
- <version>0.7.4</version>
+ <artifactId>dispatch-http_2.8.1</artifactId>
+ <version>0.7.8</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+
</dependencies>
<build>
View
@@ -58,12 +58,12 @@
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-jpa_${scala.version}</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-widgets_${scala.version}</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -73,7 +73,7 @@
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-imaging_${scala.version}</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -175,19 +175,8 @@
</plugins>
</build>
<dependencies>
- <!-- logging ...
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <scope>runtime</scope>
- </dependency>
- -->
+
+
<!-- embedded jetty -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -232,7 +232,7 @@ class BlogSnippet {
entries.flatMap(entry => bind("entry", html,
// The FuncAttrBindParam binds a attribute of a xhtml element
// the entry div id is bound to the right entry id
- FuncAttrBindParam("id", _ => Text(blogEntryDivId + entry.id), "id"),
+ FuncAttrBindParam("id", {html :NodeSeq => Text(blogEntryDivId + entry.id)}, "id"),
"title" -> entry.title,
"tour" -> belongsTo(entry),
"content" -> entry.content,
@@ -245,10 +245,10 @@ class BlogSnippet {
"creator" -> entry.owner.name,
// The FuncAttrBindParam binds a attribute of a xhtml element
// the comments div is bound to the right entry id
- FuncAttrBindParam("commentsId", _ => Text(commentDivId + entry.id), "id"),
+ FuncAttrBindParam("commentsId", {html :NodeSeq => Text(commentDivId + entry.id)}, "id"),
// The FuncAttrBindParam binds a attribute of a xhtml element
// the comments form div is bound to the right entry id
- FuncAttrBindParam("commentFormId", _ => Text(commentFormDivId + entry.id), "id")))
+ FuncAttrBindParam("commentFormId", {html :NodeSeq => Text(commentFormDivId + entry.id)}, "id")))
}
/**

0 comments on commit 2653ffb

Please sign in to comment.