[osmosis] 01/01: Drop build.gradle org.postgresql group renames.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat May 23 13:09:33 UTC 2015


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

sebastic pushed a commit to branch jessie
in repository osmosis.

commit 17de5f2cf4a754ce4236ed7b0152791239792e52
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 23 13:29:43 2015 +0200

    Drop build.gradle org.postgresql group renames.
---
 ...d-to-newest-versions-of-dependent-librari.patch | 42 ----------------------
 1 file changed, 42 deletions(-)

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
index c57dc63..b44ed34 100644
--- 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
@@ -16,53 +16,11 @@ Origin: https://github.com/openstreetmap/osmosis/commit/240d95b79cdea9faed9f919a
  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

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



More information about the Pkg-grass-devel mailing list