[Tynstep-svn] r245 - in trunk/step: step-core/src/main/java/com/tyndalehouse/step/core/data/create step-core/src/test/java/com/tyndalehouse/step/core/service/impl step-parent

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2012-04-19 06:17:59 -0700 (Thu, 19 Apr 2012)
New Revision: 245

Modified:
   trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/data/create/GeographyModuleLoader.java
   trunk/step/step-core/src/test/java/com/tyndalehouse/step/core/service/impl/JSwordServiceImplTest.java
   trunk/step/step-parent/pom.xml
Log:
more version updates

Modified: trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/data/create/GeographyModuleLoader.java
===================================================================
--- trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/data/create/GeographyModuleLoader.java	2012-04-19 13:07:52 UTC (rev 244)
+++ trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/data/create/GeographyModuleLoader.java	2012-04-19 13:17:59 UTC (rev 245)
@@ -5,6 +5,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -76,7 +77,7 @@
         try {
 
             placeFileStream = getClass().getResourceAsStream(OPENBIBLE_DATA);
-            lineIterator = IOUtils.lineIterator(placeFileStream, null);
+            lineIterator = IOUtils.lineIterator(placeFileStream, Charset.defaultCharset());
 
             for (int ii = 0; ii < IGNORE_LINES && lineIterator.hasNext(); ii++) {
                 lineIterator.next();

Modified: trunk/step/step-core/src/test/java/com/tyndalehouse/step/core/service/impl/JSwordServiceImplTest.java
===================================================================
--- trunk/step/step-core/src/test/java/com/tyndalehouse/step/core/service/impl/JSwordServiceImplTest.java	2012-04-19 13:07:52 UTC (rev 244)
+++ trunk/step/step-core/src/test/java/com/tyndalehouse/step/core/service/impl/JSwordServiceImplTest.java	2012-04-19 13:17:59 UTC (rev 245)
@@ -166,9 +166,9 @@
 
         final List<String> bibleBookNames = jsi.getBibleBookNames("Ma", "ESV");
 
-        assertTrue(bibleBookNames.contains("Malachi"));
-        assertTrue(bibleBookNames.contains("Matthew"));
-        assertTrue(bibleBookNames.contains("Mark"));
+        assertTrue(bibleBookNames.contains("Mal"));
+        assertTrue(bibleBookNames.contains("Mat"));
+        assertTrue(bibleBookNames.contains("Mar"));
     }
 
     /**

Modified: trunk/step/step-parent/pom.xml
===================================================================
--- trunk/step/step-parent/pom.xml	2012-04-19 13:07:52 UTC (rev 244)
+++ trunk/step/step-parent/pom.xml	2012-04-19 13:17:59 UTC (rev 245)
@@ -29,7 +29,7 @@
 		<jdom.version>1.1.1</jdom.version>
 		<javatar.version>2.5</javatar.version>
 
-		<jackson-mapper-asl.version>1.6.2</jackson-mapper-asl.version>
+		<jackson-mapper-asl.version>1.9.6</jackson-mapper-asl.version>
 		<org.slf4j.version>1.6.4</org.slf4j.version>
 		<servlet-api.version>2.5</servlet-api.version>
 		<jsp-api.version>2.1</jsp-api.version>
@@ -49,9 +49,9 @@
 		<commons-beanutils.version>1.8.3</commons-beanutils.version>
 		<commons-lang.version>2.6</commons-lang.version>
 		<commons-collections.version>3.2.1</commons-collections.version>
-		<commons-configuration.version>1.6</commons-configuration.version>
+		<commons-configuration.version>1.8</commons-configuration.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
-		<commons-io.version>1.4</commons-io.version>
+		<commons-io.version>2.3</commons-io.version>
 		<commons-codec.version>1.6</commons-codec.version>
 		<commons-dbutils.version>1.4</commons-dbutils.version>
 		<commons-httpclient.version>3.1</commons-httpclient.version>