diff --git a/bin/osmosis/bin/osmosis.bat b/bin/osmosis/bin/osmosis.bat index 7f7a773..8e31e00 100644 --- a/bin/osmosis/bin/osmosis.bat +++ b/bin/osmosis/bin/osmosis.bat @@ -35,7 +35,7 @@ REM Change back to the original directory cd /D %SAVEDIR% set MAINCLASS=org.codehaus.classworlds.Launcher -set PLEXUS_CP=%MYAPP_HOME%\lib\default\plexus-classworlds-2.4.jar +set PLEXUS_CP=%MYAPP_HOME%\lib\default\plexus-classworlds-2.5.2.jar SET EXEC="%JAVACMD%" %JAVACMD_OPTIONS% -cp "%PLEXUS_CP%" -Dapp.home="%MYAPP_HOME%" -Dclassworlds.conf="%MYAPP_HOME%\config\plexus.conf" %MAINCLASS% %OSMOSIS_OPTIONS% %* %EXEC% diff --git a/bin/osmosis/changes.txt b/bin/osmosis/changes.txt index f74e37a..3de6d38 100644 --- a/bin/osmosis/changes.txt +++ b/bin/osmosis/changes.txt @@ -1,3 +1,12 @@ +0.45 +Add postgresSchema option to pgsnapshot tasks. +Verify XML parser on startup to verify support for multi-char unicode characters. +Upgrade to latest version of Netty. +Various dependency version updates. +Fix incorrect plexus classworlds version in Windows launch script. +Upgrade to PostGIS 2.x library. +Add tests for pgsimple database. + 0.44 Improve default settings and performance of pgsnapshot load scripts. Fix remaining 64-bit id tracking problems. diff --git a/bin/osmosis/lib/default/commons-compress-1.10.jar b/bin/osmosis/lib/default/commons-compress-1.10.jar new file mode 100644 index 0000000..75ced20 Binary files /dev/null and b/bin/osmosis/lib/default/commons-compress-1.10.jar differ diff --git a/bin/osmosis/lib/default/commons-compress-1.9.jar b/bin/osmosis/lib/default/commons-compress-1.9.jar deleted file mode 100644 index 14e7e86..0000000 Binary files a/bin/osmosis/lib/default/commons-compress-1.9.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/logback-classic-1.1.3.jar b/bin/osmosis/lib/default/logback-classic-1.1.3.jar new file mode 100644 index 0000000..c5ecdeb Binary files /dev/null and b/bin/osmosis/lib/default/logback-classic-1.1.3.jar differ diff --git a/bin/osmosis/lib/default/logback-core-1.1.3.jar b/bin/osmosis/lib/default/logback-core-1.1.3.jar new file mode 100644 index 0000000..c776e4a Binary files /dev/null and b/bin/osmosis/lib/default/logback-core-1.1.3.jar differ diff --git a/bin/osmosis/lib/default/mapsforge-map-writer-0.6.1-jar-with-dependencies.jar b/bin/osmosis/lib/default/mapsforge-map-writer-0.6.1-jar-with-dependencies.jar deleted file mode 100644 index 06898d3..0000000 Binary files a/bin/osmosis/lib/default/mapsforge-map-writer-0.6.1-jar-with-dependencies.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/mapsforge-poi-writer-0.6.1-jar-with-dependencies.jar b/bin/osmosis/lib/default/mapsforge-poi-writer-0.6.1-jar-with-dependencies.jar deleted file mode 100644 index 4d2747f..0000000 Binary files a/bin/osmosis/lib/default/mapsforge-poi-writer-0.6.1-jar-with-dependencies.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/mysql-connector-java-5.1.35.jar b/bin/osmosis/lib/default/mysql-connector-java-5.1.35.jar deleted file mode 100644 index 27fbbce..0000000 Binary files a/bin/osmosis/lib/default/mysql-connector-java-5.1.35.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/mysql-connector-java-5.1.37.jar b/bin/osmosis/lib/default/mysql-connector-java-5.1.37.jar new file mode 100644 index 0000000..7a19168 Binary files /dev/null and b/bin/osmosis/lib/default/mysql-connector-java-5.1.37.jar differ diff --git a/bin/osmosis/lib/default/netty-3.10.5.Final.jar b/bin/osmosis/lib/default/netty-3.10.5.Final.jar new file mode 100644 index 0000000..14eee7e Binary files /dev/null and b/bin/osmosis/lib/default/netty-3.10.5.Final.jar differ diff --git a/bin/osmosis/lib/default/netty-3.2.10.Final.jar b/bin/osmosis/lib/default/netty-3.2.10.Final.jar deleted file mode 100644 index 8a44fd3..0000000 Binary files a/bin/osmosis/lib/default/netty-3.2.10.Final.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-apidb-0.44.1.jar b/bin/osmosis/lib/default/osmosis-apidb-0.44.1.jar deleted file mode 100644 index 4866a9b..0000000 Binary files a/bin/osmosis/lib/default/osmosis-apidb-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-apidb-0.45.jar b/bin/osmosis/lib/default/osmosis-apidb-0.45.jar new file mode 100644 index 0000000..da11f99 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-apidb-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-areafilter-0.44.1.jar b/bin/osmosis/lib/default/osmosis-areafilter-0.44.1.jar deleted file mode 100644 index 9327faf..0000000 Binary files a/bin/osmosis/lib/default/osmosis-areafilter-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-areafilter-0.45.jar b/bin/osmosis/lib/default/osmosis-areafilter-0.45.jar new file mode 100644 index 0000000..da46b63 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-areafilter-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-core-0.44.1.jar b/bin/osmosis/lib/default/osmosis-core-0.44.1.jar deleted file mode 100644 index 82fb826..0000000 Binary files a/bin/osmosis/lib/default/osmosis-core-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-core-0.45.jar b/bin/osmosis/lib/default/osmosis-core-0.45.jar new file mode 100644 index 0000000..416d0e6 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-core-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-dataset-0.44.1.jar b/bin/osmosis/lib/default/osmosis-dataset-0.44.1.jar deleted file mode 100644 index 350e2d8..0000000 Binary files a/bin/osmosis/lib/default/osmosis-dataset-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-dataset-0.45.jar b/bin/osmosis/lib/default/osmosis-dataset-0.45.jar new file mode 100644 index 0000000..4268702 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-dataset-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-extract-0.44.1.jar b/bin/osmosis/lib/default/osmosis-extract-0.44.1.jar deleted file mode 100644 index a49eecb..0000000 Binary files a/bin/osmosis/lib/default/osmosis-extract-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-extract-0.45.jar b/bin/osmosis/lib/default/osmosis-extract-0.45.jar new file mode 100644 index 0000000..9aca163 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-extract-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.44.1.jar b/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.44.1.jar deleted file mode 100644 index 2ed43f8..0000000 Binary files a/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.45.jar b/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.45.jar new file mode 100644 index 0000000..684d763 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-hstore-jdbc-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-osm-binary-0.44.1.jar b/bin/osmosis/lib/default/osmosis-osm-binary-0.44.1.jar deleted file mode 100644 index 6ce9985..0000000 Binary files a/bin/osmosis/lib/default/osmosis-osm-binary-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-osm-binary-0.45.jar b/bin/osmosis/lib/default/osmosis-osm-binary-0.45.jar new file mode 100644 index 0000000..431c917 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-osm-binary-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-pbf-0.44.1.jar b/bin/osmosis/lib/default/osmosis-pbf-0.44.1.jar deleted file mode 100644 index 9de35a5..0000000 Binary files a/bin/osmosis/lib/default/osmosis-pbf-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-pbf-0.45.jar b/bin/osmosis/lib/default/osmosis-pbf-0.45.jar new file mode 100644 index 0000000..de8a11c Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-pbf-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-pbf2-0.44.1.jar b/bin/osmosis/lib/default/osmosis-pbf2-0.44.1.jar deleted file mode 100644 index 04c1583..0000000 Binary files a/bin/osmosis/lib/default/osmosis-pbf2-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-pbf2-0.45.jar b/bin/osmosis/lib/default/osmosis-pbf2-0.45.jar new file mode 100644 index 0000000..cc36937 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-pbf2-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-pgsimple-0.44.1.jar b/bin/osmosis/lib/default/osmosis-pgsimple-0.44.1.jar deleted file mode 100644 index 1974c83..0000000 Binary files a/bin/osmosis/lib/default/osmosis-pgsimple-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-pgsimple-0.45.jar b/bin/osmosis/lib/default/osmosis-pgsimple-0.45.jar new file mode 100644 index 0000000..67e6104 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-pgsimple-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-pgsnapshot-0.44.1.jar b/bin/osmosis/lib/default/osmosis-pgsnapshot-0.44.1.jar deleted file mode 100644 index 65bc107..0000000 Binary files a/bin/osmosis/lib/default/osmosis-pgsnapshot-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-pgsnapshot-0.45.jar b/bin/osmosis/lib/default/osmosis-pgsnapshot-0.45.jar new file mode 100644 index 0000000..1a98f3c Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-pgsnapshot-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-replication-0.44.1.jar b/bin/osmosis/lib/default/osmosis-replication-0.44.1.jar deleted file mode 100644 index 736c935..0000000 Binary files a/bin/osmosis/lib/default/osmosis-replication-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-replication-0.45.jar b/bin/osmosis/lib/default/osmosis-replication-0.45.jar new file mode 100644 index 0000000..911d6b1 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-replication-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-replication-http-0.44.1.jar b/bin/osmosis/lib/default/osmosis-replication-http-0.44.1.jar deleted file mode 100644 index 3d60129..0000000 Binary files a/bin/osmosis/lib/default/osmosis-replication-http-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-replication-http-0.45.jar b/bin/osmosis/lib/default/osmosis-replication-http-0.45.jar new file mode 100644 index 0000000..3b60a02 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-replication-http-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-set-0.44.1.jar b/bin/osmosis/lib/default/osmosis-set-0.44.1.jar deleted file mode 100644 index 3d2c77a..0000000 Binary files a/bin/osmosis/lib/default/osmosis-set-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-set-0.45.jar b/bin/osmosis/lib/default/osmosis-set-0.45.jar new file mode 100644 index 0000000..20f9ebc Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-set-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-tagfilter-0.44.1.jar b/bin/osmosis/lib/default/osmosis-tagfilter-0.44.1.jar deleted file mode 100644 index 09263a4..0000000 Binary files a/bin/osmosis/lib/default/osmosis-tagfilter-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-tagfilter-0.45.jar b/bin/osmosis/lib/default/osmosis-tagfilter-0.45.jar new file mode 100644 index 0000000..5d2d5a6 Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-tagfilter-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-tagtransform-0.44.1.jar b/bin/osmosis/lib/default/osmosis-tagtransform-0.44.1.jar deleted file mode 100644 index e8917d2..0000000 Binary files a/bin/osmosis/lib/default/osmosis-tagtransform-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-tagtransform-0.45.jar b/bin/osmosis/lib/default/osmosis-tagtransform-0.45.jar new file mode 100644 index 0000000..fdb358a Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-tagtransform-0.45.jar differ diff --git a/bin/osmosis/lib/default/osmosis-xml-0.44.1.jar b/bin/osmosis/lib/default/osmosis-xml-0.44.1.jar deleted file mode 100644 index b1efd2d..0000000 Binary files a/bin/osmosis/lib/default/osmosis-xml-0.44.1.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/osmosis-xml-0.45.jar b/bin/osmosis/lib/default/osmosis-xml-0.45.jar new file mode 100644 index 0000000..401e9fd Binary files /dev/null and b/bin/osmosis/lib/default/osmosis-xml-0.45.jar differ diff --git a/bin/osmosis/lib/default/postgis-jdbc-1.3.3.jar b/bin/osmosis/lib/default/postgis-jdbc-1.3.3.jar deleted file mode 100644 index 05d7f68..0000000 Binary files a/bin/osmosis/lib/default/postgis-jdbc-1.3.3.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/postgis-jdbc-2.1.7.2.jar b/bin/osmosis/lib/default/postgis-jdbc-2.1.7.2.jar new file mode 100644 index 0000000..e63979a Binary files /dev/null and b/bin/osmosis/lib/default/postgis-jdbc-2.1.7.2.jar differ diff --git a/bin/osmosis/lib/default/postgresql-9.1-901-1.jdbc4.jar b/bin/osmosis/lib/default/postgresql-9.1-901-1.jdbc4.jar new file mode 100644 index 0000000..203d5a1 Binary files /dev/null and b/bin/osmosis/lib/default/postgresql-9.1-901-1.jdbc4.jar differ diff --git a/bin/osmosis/lib/default/postgresql-9.4-1201-jdbc4.jar b/bin/osmosis/lib/default/postgresql-9.4-1201-jdbc4.jar deleted file mode 100644 index e028f35..0000000 Binary files a/bin/osmosis/lib/default/postgresql-9.4-1201-jdbc4.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/postgresql-9.4-1204-jdbc4.jar b/bin/osmosis/lib/default/postgresql-9.4-1204-jdbc4.jar new file mode 100644 index 0000000..630ab76 Binary files /dev/null and b/bin/osmosis/lib/default/postgresql-9.4-1204-jdbc4.jar differ diff --git a/bin/osmosis/lib/default/slf4j-api-1.7.12.jar b/bin/osmosis/lib/default/slf4j-api-1.7.12.jar new file mode 100644 index 0000000..51e2fad Binary files /dev/null and b/bin/osmosis/lib/default/slf4j-api-1.7.12.jar differ diff --git a/bin/osmosis/lib/default/spring-beans-4.1.6.RELEASE.jar b/bin/osmosis/lib/default/spring-beans-4.2.2.RELEASE.jar similarity index 51% rename from bin/osmosis/lib/default/spring-beans-4.1.6.RELEASE.jar rename to bin/osmosis/lib/default/spring-beans-4.2.2.RELEASE.jar index 7206d00..7148361 100644 Binary files a/bin/osmosis/lib/default/spring-beans-4.1.6.RELEASE.jar and b/bin/osmosis/lib/default/spring-beans-4.2.2.RELEASE.jar differ diff --git a/bin/osmosis/lib/default/spring-core-4.1.6.RELEASE.jar b/bin/osmosis/lib/default/spring-core-4.2.2.RELEASE.jar similarity index 58% rename from bin/osmosis/lib/default/spring-core-4.1.6.RELEASE.jar rename to bin/osmosis/lib/default/spring-core-4.2.2.RELEASE.jar index fe5f612..3c6b3e3 100644 Binary files a/bin/osmosis/lib/default/spring-core-4.1.6.RELEASE.jar and b/bin/osmosis/lib/default/spring-core-4.2.2.RELEASE.jar differ diff --git a/bin/osmosis/lib/default/spring-jdbc-4.1.6.RELEASE.jar b/bin/osmosis/lib/default/spring-jdbc-4.2.2.RELEASE.jar similarity index 59% rename from bin/osmosis/lib/default/spring-jdbc-4.1.6.RELEASE.jar rename to bin/osmosis/lib/default/spring-jdbc-4.2.2.RELEASE.jar index ac4667f..c2b96c0 100644 Binary files a/bin/osmosis/lib/default/spring-jdbc-4.1.6.RELEASE.jar and b/bin/osmosis/lib/default/spring-jdbc-4.2.2.RELEASE.jar differ diff --git a/bin/osmosis/lib/default/spring-tx-4.1.6.RELEASE.jar b/bin/osmosis/lib/default/spring-tx-4.2.2.RELEASE.jar similarity index 62% rename from bin/osmosis/lib/default/spring-tx-4.1.6.RELEASE.jar rename to bin/osmosis/lib/default/spring-tx-4.2.2.RELEASE.jar index 28e70b0..143d717 100644 Binary files a/bin/osmosis/lib/default/spring-tx-4.1.6.RELEASE.jar and b/bin/osmosis/lib/default/spring-tx-4.2.2.RELEASE.jar differ diff --git a/bin/osmosis/lib/default/stax2-api-3.1.4.jar b/bin/osmosis/lib/default/stax2-api-3.1.4.jar deleted file mode 100644 index dded036..0000000 Binary files a/bin/osmosis/lib/default/stax2-api-3.1.4.jar and /dev/null differ diff --git a/bin/osmosis/lib/default/stax2-api-4.0.0.jar b/bin/osmosis/lib/default/stax2-api-4.0.0.jar new file mode 100644 index 0000000..00afafa Binary files /dev/null and b/bin/osmosis/lib/default/stax2-api-4.0.0.jar differ diff --git a/bin/osmosis/lib/default/woodstox-core-5.0.1.jar b/bin/osmosis/lib/default/woodstox-core-5.0.1.jar new file mode 100644 index 0000000..f2c69bf Binary files /dev/null and b/bin/osmosis/lib/default/woodstox-core-5.0.1.jar differ diff --git a/bin/osmosis/lib/default/woodstox-core-lgpl-4.4.1.jar b/bin/osmosis/lib/default/woodstox-core-lgpl-4.4.1.jar deleted file mode 100644 index d5a0083..0000000 Binary files a/bin/osmosis/lib/default/woodstox-core-lgpl-4.4.1.jar and /dev/null differ