Update to latest binary releases (osmosis, mapsforge)

2018-02-25 23:06:14 -05:00 · 2018-02-25 23:06:14 -05:00 · 472ddeaff3
parent 1334b8f515
commit 472ddeaff3
64 changed files with 14 additions and 15 deletions
--- a/bin/osmosis/changes.txt
+++ b/bin/osmosis/changes.txt
@ -1,3 +1,14 @@
+0.46
+Require Java 8 as a minimum.
+Leverage Java 7 Autocloseable functionality and remove Releasable interface.
+Apply minor code cleanups contributed by devfactory.com.
+Add tests for pgsimple tasks.
+Introduce docker-based build environment.
+Introduce Travis CI testing.
+Add support for reading protobuf from InputStream.  Useful when using Osmosis as a library.
+Upgrade to protobuf 3.
+Make compression optional in EntitySorter.
+
 0.45
 Add postgresSchema option to pgsnapshot tasks.
 Verify XML parser on startup to verify support for multi-char unicode characters.
--- a/bin/osmosis/lib/default/commons-compress-1.10.jar
+++ b/bin/osmosis/lib/default/commons-compress-1.10.jar
--- a/bin/osmosis/lib/default/commons-compress-1.14.jar
+++ b/bin/osmosis/lib/default/commons-compress-1.14.jar
--- a/bin/osmosis/lib/default/logback-classic-1.1.3.jar
+++ b/bin/osmosis/lib/default/logback-classic-1.1.3.jar
--- a/bin/osmosis/lib/default/logback-core-1.1.3.jar
+++ b/bin/osmosis/lib/default/logback-core-1.1.3.jar
--- a/bin/osmosis/lib/default/mapsforge-map-writer-0.9.1-jar-with-dependencies.jar
+++ b/bin/osmosis/lib/default/mapsforge-map-writer-0.9.1-jar-with-dependencies.jar
--- a/bin/osmosis/lib/default/mapsforge-poi-writer-0.7.0-jar-with-dependencies.jar
+++ b/bin/osmosis/lib/default/mapsforge-poi-writer-0.7.0-jar-with-dependencies.jar
--- a/bin/osmosis/lib/default/mapsforge-poi-writer-0.9.1-jar-with-dependencies.jar
+++ b/bin/osmosis/lib/default/mapsforge-poi-writer-0.9.1-jar-with-dependencies.jar
--- a/bin/osmosis/lib/default/mysql-connector-java-5.1.37.jar
+++ b/bin/osmosis/lib/default/mysql-connector-java-5.1.37.jar
--- a/bin/osmosis/lib/default/mysql-connector-java-6.0.6.jar
+++ b/bin/osmosis/lib/default/mysql-connector-java-6.0.6.jar
--- a/bin/osmosis/lib/default/netty-3.10.6.Final.jar
+++ b/bin/osmosis/lib/default/netty-3.10.6.Final.jar
--- a/bin/osmosis/lib/default/osmosis-apidb-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-apidb-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-apidb-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-apidb-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-areafilter-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-areafilter-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-areafilter-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-areafilter-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-core-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-core-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-core-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-core-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-dataset-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-dataset-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-dataset-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-dataset-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-extract-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-extract-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-extract-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-extract-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-osm-binary-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-osm-binary-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-osm-binary-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-osm-binary-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-pbf-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-pbf-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-pbf-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-pbf-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-pbf2-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-pbf2-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-pbf2-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-pbf2-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-pgsimple-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-pgsimple-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-pgsimple-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-pgsimple-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-pgsnapshot-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-pgsnapshot-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-pgsnapshot-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-pgsnapshot-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-replication-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-replication-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-replication-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-replication-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-replication-http-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-replication-http-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-replication-http-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-replication-http-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-set-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-set-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-set-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-set-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-tagfilter-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-tagfilter-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-tagfilter-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-tagfilter-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-tagtransform-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-tagtransform-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-tagtransform-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-tagtransform-0.46.jar
--- a/bin/osmosis/lib/default/osmosis-xml-0.45.jar
+++ b/bin/osmosis/lib/default/osmosis-xml-0.45.jar
--- a/bin/osmosis/lib/default/osmosis-xml-0.46.jar
+++ b/bin/osmosis/lib/default/osmosis-xml-0.46.jar
--- a/bin/osmosis/lib/default/postgis-jdbc-2.1.7.2.jar
+++ b/bin/osmosis/lib/default/postgis-jdbc-2.1.7.2.jar
--- a/bin/osmosis/lib/default/postgis-jdbc-2.2.1.jar
+++ b/bin/osmosis/lib/default/postgis-jdbc-2.2.1.jar
--- a/bin/osmosis/lib/default/postgresql-42.1.4.jar
+++ b/bin/osmosis/lib/default/postgresql-42.1.4.jar
--- a/bin/osmosis/lib/default/postgresql-9.1-901-1.jdbc4.jar
+++ b/bin/osmosis/lib/default/postgresql-9.1-901-1.jdbc4.jar
--- a/bin/osmosis/lib/default/postgresql-9.4-1204-jdbc4.jar
+++ b/bin/osmosis/lib/default/postgresql-9.4-1204-jdbc4.jar
--- a/bin/osmosis/lib/default/protobuf-java-2.6.1.jar
+++ b/bin/osmosis/lib/default/protobuf-java-2.6.1.jar
--- a/bin/osmosis/lib/default/protobuf-java-3.4.0.jar
+++ b/bin/osmosis/lib/default/protobuf-java-3.4.0.jar
--- a/bin/osmosis/lib/default/slf4j-api-1.7.12.jar
+++ b/bin/osmosis/lib/default/slf4j-api-1.7.12.jar
--- a/bin/osmosis/lib/default/spring-beans-4.2.2.RELEASE.jar
+++ b/bin/osmosis/lib/default/spring-beans-4.2.2.RELEASE.jar
--- a/bin/osmosis/lib/default/spring-beans-4.3.11.RELEASE.jar
+++ b/bin/osmosis/lib/default/spring-beans-4.3.11.RELEASE.jar
--- a/bin/osmosis/lib/default/spring-core-4.2.2.RELEASE.jar
+++ b/bin/osmosis/lib/default/spring-core-4.2.2.RELEASE.jar
--- a/bin/osmosis/lib/default/spring-core-4.3.11.RELEASE.jar
+++ b/bin/osmosis/lib/default/spring-core-4.3.11.RELEASE.jar
--- a/bin/osmosis/lib/default/spring-jdbc-4.3.11.RELEASE.jar
+++ b/bin/osmosis/lib/default/spring-jdbc-4.3.11.RELEASE.jar
--- a/bin/osmosis/lib/default/spring-tx-4.3.11.RELEASE.jar
+++ b/bin/osmosis/lib/default/spring-tx-4.3.11.RELEASE.jar
--- a/bin/osmosis/lib/default/woodstox-core-5.0.3.jar
+++ b/bin/osmosis/lib/default/woodstox-core-5.0.3.jar
--- a/bin/osmosis/lib/default/xercesImpl-2.11.0.jar
+++ b/bin/osmosis/lib/default/xercesImpl-2.11.0.jar
--- a/bin/osmosis/lib/default/xercesImpl-2.9.1.jar
+++ b/bin/osmosis/lib/default/xercesImpl-2.9.1.jar
--- a/bin/osmosis/lib/default/xml-apis-1.4.01.jar
+++ b/bin/osmosis/lib/default/xml-apis-1.4.01.jar
--- a/bin/osmosis/package.iml
+++ b/bin/osmosis/package.iml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>