From ab7cf13ba359cecf173d7c7f06868405d20b2bf2 Mon Sep 17 00:00:00 2001
From: Murray Cumming <murrayc@murrayc.com>
Date: Mon, 19 Nov 2012 07:12:36 +0100
Subject: [PATCH] Update versions of depdencies.

        * pom.xml: Increase some version numbers based on the output of
	, using mvn versions:display-dependency-updates.
        * src/test/java/org/glom/web/client/GwtTestOnlineGlom.java:
	Use the annotation instead of getModuleName().
        * src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java:
        Do not use deprecated assert() classes/methods.
---
 ChangeLog                                            | 11 +++++++++++
 pom.xml                                              | 20 ++++++++++----------
 .../java/org/glom/web/client/GwtTestOnlineGlom.java  |  7 ++-----
 .../web/server/SelfHostConfiguredDocumentTest.java   |  4 +---
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 730357d..3ed747b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2012-11-18  Murray Cumming  <murrayc@murrayc.com>
 
+        Update versions of depdencies.
+
+        * pom.xml: Increase some version numbers based on the output of
+	, using mvn versions:display-dependency-updates.
+        * src/test/java/org/glom/web/client/GwtTestOnlineGlom.java:
+	Use the annotation instead of getModuleName().
+        * src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java:
+        Do not use deprecated assert() classes/methods.
+
+2012-11-18  Murray Cumming  <murrayc@murrayc.com>
+
         Document: Correct an import to use the correct Log API.
 
         * src/main/java/org/glom/web/server/libglom/Document.java:
diff --git a/pom.xml b/pom.xml
index e0837dd..a2af24b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.3</version>
+			<version>2.4</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -86,29 +86,29 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.2.1</version>
+			<version>4.2.2</version>
 		</dependency>   
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.4</version>
+			<version>1.7</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>11.0.2</version>
+			<version>13.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq</artifactId>
-			<version>2.3.1</version>
+			<version>2.6.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.jasperreports</groupId>
 			<artifactId>jasperreports</artifactId>
-			<version>4.5.1</version>
+			<version>4.8.0</version>
 			<scope>compile</scope>
 			<exclusions>
 				<!-- There is apparently a clash between the jdtcore used by jasperreports
@@ -124,7 +124,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
+			<version>1.2.17</version>
 			<type>jar</type>
 			<scope>compile</scope> <!-- It is used for runtime and test scopes -->
 		</dependency>
@@ -133,20 +133,20 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
  			<artifactId>slf4j-simple</artifactId>
-			<version>1.6.6</version>
+			<version>1.7.2</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.10</version>
+			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.gwt-test-utils</groupId>
 			<artifactId>gwt-test-utils</artifactId>
-			<version>0.39</version>
+			<version>0.42</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/src/test/java/org/glom/web/client/GwtTestOnlineGlom.java b/src/test/java/org/glom/web/client/GwtTestOnlineGlom.java
index 2edc4dc..714f571 100644
--- a/src/test/java/org/glom/web/client/GwtTestOnlineGlom.java
+++ b/src/test/java/org/glom/web/client/GwtTestOnlineGlom.java
@@ -6,8 +6,10 @@ import org.glom.web.client.ui.DocumentSelectionView;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.googlecode.gwt.test.GwtModule;
 import com.googlecode.gwt.test.GwtTestWithEasyMock;
 
+@GwtModule("org.glom.web.OnlineGlom")
 public class GwtTestOnlineGlom extends GwtTestWithEasyMock {
 
 	/**
@@ -31,11 +33,6 @@ public class GwtTestOnlineGlom extends GwtTestWithEasyMock {
 		 */
 	}
 
-	@Override
-	public String getModuleName() {
-		return "org.glom.web.OnlineGlom";
-	}
-
 	@Before
 	public void beforeOnlineGlom() {
 		app = new OnlineGlom();
diff --git a/src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java b/src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java
index da47803..d5b137c 100644
--- a/src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java
+++ b/src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java
@@ -27,8 +27,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.apache.commons.lang3.StringUtils;
 import org.glom.web.server.libglom.Document;
 import org.glom.web.server.libglom.DocumentTest;
@@ -84,7 +82,7 @@ public class SelfHostConfiguredDocumentTest {
 	
 	public void testGetListViewLayoutGroup(final String locale, final String field0Title, final String field1Title) {
 		final LayoutGroup group = configuredDoc.getListViewLayoutGroup("albums", defaultLocale);
-		Assert.assertNotNull(group);
+		assertNotNull(group);
 		
 		List<LayoutItem> items = group.getItems();
 		assertNotNull(items);
-- 
2.1.4