Bas Couwenberg pushed to branch upstream at Debian GIS Project / osmosis


Commits:
d86b9be1 by Bas Couwenberg at 2020-03-11T05:54:46+01:00
New upstream version 0.47.2
- - - - -


5 changed files:

- build-support/docker/docker-compose.yml
- build-support/docker/env.sh
- osmosis-core/build.gradle
- package/changes.txt
- package/script/contrib/apidb_0.6.sql


Changes:

=====================================
build-support/docker/docker-compose.yml
=====================================
@@ -8,6 +8,7 @@ services:
       - db
     volumes:
       - ${gradleUserDir}:/gradle
+      - ${gnupgUserDir}:${gnupgUserDir}
       - ${projectDir}:/project
   db:
     image: openstreetmap.org/osmosis-db


=====================================
build-support/docker/env.sh
=====================================
@@ -1,4 +1,5 @@
 export gradleUserDir="${HOME}/.gradle"
+export gnupgUserDir="${HOME}/.gnupg"
 export userId=$(id -u)
 export groupId=$(id -g)
 export projectDir="$( cd "${scriptDir}"/../.. && pwd )"


=====================================
osmosis-core/build.gradle
=====================================
@@ -8,7 +8,6 @@ dependencies {
     compile group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: 
dependencyVersionWoodstoxCore
     compile group: 'org.codehaus.woodstox', name: 'stax2-api', version: 
dependencyVersionWoodstoxStax2
     compile group: 'org.apache.commons', name: 'commons-compress', version: 
dependencyVersionCommonsCompress
-    compile group: 'xerces', name: 'xercesImpl', version: 
dependencyVersionXerces
 }
 
 /*


=====================================
package/changes.txt
=====================================
@@ -1,3 +1,7 @@
+0.47.2
+Removed explicit dependency on xerces in favor of JDK version (PR #51)
+Added $gnupgUserDir to Docker setup (PR #56)
+
 0.47.1
 Update APIDB schema to remove users.nearby column (PR #54)
 


=====================================
package/script/contrib/apidb_0.6.sql
=====================================
@@ -4092,4 +4092,4 @@ INSERT INTO schema_migrations (version) VALUES 
('20110322001319');
 
 INSERT INTO schema_migrations (version) VALUES ('20100516124737');
 
-INSERT INTO schema_migrations (version) VALUES ('20110925112722');
\ No newline at end of file
+INSERT INTO schema_migrations (version) VALUES ('20110925112722');



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/osmosis/-/commit/d86b9be1efa3d41c44bf2f22ed3a07d4008bb542

-- 
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/osmosis/-/commit/d86b9be1efa3d41c44bf2f22ed3a07d4008bb542
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to