Update build to newest versions of dependent libraries

gradle.properties

@@ -4,21 +4,20 @@
 org.gradle.daemon=true
 
 # 3rd Party Library Versions
-dependencyVersionClassworlds=2.4
-dependencyVersionCommonsCodec=1.7
-dependencyVersionCommonsCompress=1.4.1
+dependencyVersionClassworlds=2.5.2
+dependencyVersionCommonsCodec=1.9
+dependencyVersionCommonsCompress=1.8.1
 dependencyVersionCommonsDbcp=1.4
 dependencyVersionJpf=1.5
-dependencyVersionJunit=4.10
-dependencyVersionMySql=5.1.21
-dependencyVersionNetty=3.2.7.Final
-dependencyVersionOsmPbf=1.1.1-754a33af
+dependencyVersionJunit=4.11
+dependencyVersionMySql=5.1.33
+dependencyVersionNetty=3.2.10.Final
 dependencyVersionPostGis=1.3.3
-dependencyVersionPostgreSql=9.1-901-1.jdbc4
-dependencyVersionProtobuf=2.4.1
-dependencyVersionSpring=3.1.2.RELEASE
-dependencyVersionWoodstoxCore=4.1.4
-dependencyVersionWoodstoxStax2=3.1.1
+dependencyVersionPostgreSql=9.3-1102-jdbc4
+dependencyVersionProtobuf=2.5.0
+dependencyVersionSpring=4.1.0.RELEASE
+dependencyVersionWoodstoxCore=4.4.1
+dependencyVersionWoodstoxStax2=3.1.4
 # Remaining on 2.9.1 instead of 2.10.0 for now because the newer version
 # depends on org.w3c.dom.ElementTraversal which is not being transitively
 # included. This could be possibly be fixed by including a newer version

osmosis-apidb/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     compile project(':osmosis-xml')
     compile group: 'commons-dbcp', name: 'commons-dbcp', version: dependencyVersionCommonsDbcp
     compile group: 'org.springframework', name: 'spring-jdbc', version: dependencyVersionSpring
-    runtime group: 'postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
+    runtime group: 'org.postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
     runtime group: 'mysql', name: 'mysql-connector-java', version: dependencyVersionMySql
     testCompile project(':osmosis-testutil')
 }

osmosis-hstore-jdbc/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    compile group: 'postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
+    compile group: 'org.postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
 }
 
 // Disable checkstyle because this is external code.

osmosis-pgsimple/build.gradle

@@ -6,7 +6,7 @@ configurations {
 dependencies {
     compile project(':osmosis-core')
     compile group: 'org.postgis', name: 'postgis-jdbc', version: dependencyVersionPostGis
-    compile group: 'postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
+    compile group: 'org.postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
     testCompile project(':osmosis-dataset')
     testCompile project(':osmosis-testutil')
     testCompile project(':osmosis-xml')

osmosis-pgsnapshot/build.gradle

@@ -9,7 +9,7 @@ dependencies {
     compile group: 'commons-dbcp', name: 'commons-dbcp', version: dependencyVersionCommonsDbcp
     compile group: 'org.postgis', name: 'postgis-jdbc', version: dependencyVersionPostGis
     compile group: 'org.springframework', name: 'spring-jdbc', version: dependencyVersionSpring
-    compile group: 'postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
+    compile group: 'org.postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
     testCompile project(':osmosis-dataset')
     testCompile project(':osmosis-testutil')
     testCompile project(':osmosis-xml')

osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityMapper.java

@@ -3,12 +3,12 @@
 
 import java.sql.Timestamp;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
 import org.openstreetmap.osmosis.core.domain.v0_6.Entity;
 import org.openstreetmap.osmosis.core.domain.v0_6.Tag;
-import org.openstreetmap.osmosis.hstore.PGHStore;
 import org.springframework.jdbc.core.RowMapper;
 
 
@@ -226,15 +226,15 @@ public String getSqlDelete(boolean filterByEntityId) {
 	 *            The entity containing the data to be inserted.
 	 */
 	protected void populateCommonEntityParameters(Map<String, Object> args, Entity entity) {
-		PGHStore tags;
+		Map<String, String> tags;
 
 		// We can't write an entity with a null timestamp.
 		if (entity.getTimestamp() == null) {
 			throw new OsmosisRuntimeException(
 					"Entity(" + entity.getType() + ") " + entity.getId() + " does not have a timestamp set.");
 		}
 
-		tags = new PGHStore();
+		tags = new HashMap<String, String>(entity.getTags().size());
 		for (Tag tag : entity.getTags()) {
 			tags.put(tag.getKey(), tag.getValue());
 		}

osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityRowMapper.java

@@ -5,14 +5,14 @@
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
 import org.openstreetmap.osmosis.core.domain.v0_6.CommonEntityData;
 import org.openstreetmap.osmosis.core.domain.v0_6.Entity;
 import org.openstreetmap.osmosis.core.domain.v0_6.OsmUser;
 import org.openstreetmap.osmosis.core.domain.v0_6.Tag;
-import org.openstreetmap.osmosis.hstore.PGHStore;
 import org.springframework.jdbc.core.RowMapper;
 
 
@@ -64,9 +64,10 @@ private OsmUser buildUser(ResultSet resultSet) {
 	 *             if a database error is encountered.
 	 * @return The common entity data.
 	 */
+	@SuppressWarnings("unchecked")
 	protected CommonEntityData mapCommonEntityData(ResultSet rs) throws SQLException {
 		CommonEntityData entityData;
-		PGHStore dbTags;
+		Map<String, String> dbTags;
 		Collection<Tag> tags;
 
 		entityData = new CommonEntityData(
@@ -77,7 +78,7 @@ protected CommonEntityData mapCommonEntityData(ResultSet rs) throws SQLException
 			rs.getLong("changeset_id")
 		);
 
-		dbTags = (PGHStore) rs.getObject("tags");
+		dbTags = (Map<String, String>) rs.getObject("tags");
 		if (dbTags != null) {
 			tags = entityData.getTags();
 			for (Entry<String, String> tagEntry : dbTags.entrySet()) {