This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie
in repository osmosis.

commit 982c7ada7104a6faa0ec7c0d515898b0b4507352
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Thu May 14 14:07:30 2015 +0200

    Add patch from upstream to fix java.lang.ClassCastException for 
java.util.HashMap to org.openstreetmap.osmosis.hstore.PGHStore.
---
 debian/changelog                                   |   8 ++
 ...d-to-newest-versions-of-dependent-librari.patch | 138 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 3 files changed, 147 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 57f238b..20f950a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+osmosis (0.43.1-3+deb8u1) UNRELEASED; urgency=medium
+
+  * Add patch from upstream to fix java.lang.ClassCastException for
+    java.util.HashMap to org.openstreetmap.osmosis.hstore.PGHStore.
+    (closes: #785257)
+
+ -- Bas Couwenberg <sebas...@debian.org>  Thu, 14 May 2015 14:03:39 +0200
+
 osmosis (0.43.1-3) unstable; urgency=medium
 
   * Update 02-fix_plexus.patch to also load Xerces to fix data corruption.
diff --git 
a/debian/patches/0001-Update-build-to-newest-versions-of-dependent-librari.patch
 
b/debian/patches/0001-Update-build-to-newest-versions-of-dependent-librari.patch
new file mode 100644
index 0000000..c57dc63
--- /dev/null
+++ 
b/debian/patches/0001-Update-build-to-newest-versions-of-dependent-librari.patch
@@ -0,0 +1,138 @@
+From 240d95b79cdea9faed9f919a1e2024c04199c1ba Mon Sep 17 00:00:00 2001
+From: Brett Henderson <br...@bretth.com>
+Date: Tue, 30 Sep 2014 21:26:20 +1000
+Subject: Update build to newest versions of dependent libraries
+Origin: 
https://github.com/openstreetmap/osmosis/commit/240d95b79cdea9faed9f919a1e2024c04199c1ba
+
+---
+ gradle.properties                                  | 23 +++++++++++-----------
+ osmosis-apidb/build.gradle                         |  2 +-
+ osmosis-hstore-jdbc/build.gradle                   |  2 +-
+ .../org/postgresql/driverconfig.properties         |  1 -
+ osmosis-pgsimple/build.gradle                      |  2 +-
+ osmosis-pgsnapshot/build.gradle                    |  2 +-
+ .../osmosis/pgsnapshot/v0_6/impl/EntityMapper.java |  6 +++---
+ .../pgsnapshot/v0_6/impl/EntityRowMapper.java      |  7 ++++---
+ 8 files changed, 22 insertions(+), 23 deletions(-)
+ delete mode 100644 
osmosis-hstore-jdbc/src/main/resources/org/postgresql/driverconfig.properties
+
+--- a/osmosis-apidb/build.gradle
++++ b/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')
+ }
+--- a/osmosis-hstore-jdbc/build.gradle
++++ b/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.
+--- 
a/osmosis-hstore-jdbc/src/main/resources/org/postgresql/driverconfig.properties
++++ /dev/null
+@@ -1 +0,0 @@
+-datatype.hstore=org.openstreetmap.osmosis.hstore.PGHStore
+\ No newline at end of file
+--- a/osmosis-pgsimple/build.gradle
++++ b/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')
+--- a/osmosis-pgsnapshot/build.gradle
++++ b/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')
+--- 
a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityMapper.java
++++ 
b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityMapper.java
+@@ -3,12 +3,12 @@ package org.openstreetmap.osmosis.pgsnap
+ 
+ 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,7 +226,7 @@ public abstract class EntityMapper<T ext
+        *            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) {
+@@ -234,7 +234,7 @@ public abstract class EntityMapper<T ext
+                                       "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());
+               }
+--- 
a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityRowMapper.java
++++ 
b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityRowMapper.java
+@@ -5,6 +5,7 @@ import java.sql.ResultSet;
+ 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;
+@@ -12,7 +13,6 @@ import org.openstreetmap.osmosis.core.do
+ 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 @@ public abstract class EntityRowMapper<T
+        *             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 @@ public abstract class EntityRowMapper<T
+                       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()) {
diff --git a/debian/patches/series b/debian/patches/series
index ac571d9..32c82d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 0001-Set-User-Agent-header-on-HTTP-connections.patch
 0001-apidb-Support-importing-negative-ids.patch
 0001-apidb-Fix-one-off-error-in-current-way-relation-load.patch
+0001-Update-build-to-newest-versions-of-dependent-librari.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osmosis.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to