README.md

@@ -35,7 +35,7 @@ required to run the full build and test suite.
 
     ./docker.sh
 
-Osmosis is built using the Gradle (http://gradle.org) built tool.  Gradle itself
+Osmosis is built using the Gradle (http://gradle.org) build tool.  Gradle itself
 does not need to be installed because the gradlew script will install Gradle on
 first usage.  The only requirements are a 1.7 JDK, and an Internet connection.
 Note that in the docker environment all downloads will still occur and be cached

build-support/docker/build/Dockerfile

-FROM java:8
+FROM openjdk:11
 
 ARG CURRENT_USER_ID
 ARG CURRENT_GROUP_ID

build-support/docker/db/Dockerfile

-FROM fedora:24
+FROM fedora:28
 
 # Install UTF8 locale support
 RUN dnf install -y langpacks-en.noarch

build.gradle

-task wrapper(type: Wrapper) {
-	gradleVersion = '4.2'
-}
-
 apply plugin: 'idea'
 
 /* Build collections containing each type of project.  These collections will

debian/NEWS

+osmosis (0.46-6) unstable; urgency=medium
+
+  The HTTP replication module has been disabled, it requires Netty 3
+  which is being removed from Debian, see: https://bugs.debian.org/888255.
+
+  This affects the Server-side Streaming support, removing the following
+  options:
+
+   --receive-replication, --rr
+   --send-replication-data, --srd
+   --send-replication-sequence, --srs
+
+   --read-replication-0.6
+   --send-replication-data-0.6
+   --send-replication-sequence-0.6
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 11 Aug 2018 10:56:42 +0200

debian/changelog

+osmosis (0.47-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+  * Revert Netty 3 changes, still available in stretch.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 04 Oct 2018 06:59:30 +0200
+
+osmosis (0.47-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.2.1, no changes.
+  * Drop example-shell-script-fails-syntax-check.patch, applied upstream.
+  * Add patch to revert protobuf 3.6.1 changes.
+  * Add patch to regenerate protobuf files with protobuf 3.0.0.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 29 Sep 2018 10:55:11 +0200
+
+osmosis (0.46-7) unstable; urgency=medium
+
+  * Update watch file to use releases instead of tags.
+  * Update watch file to limit matches to archive path.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 18 Aug 2018 18:08:26 +0200
+
+osmosis (0.46-6) unstable; urgency=medium
+
+  * Bump Standards-Version to 4.2.0, no changes.
+  * Add patch to disable building osmosis-replication-http module,
+    requires Netty 3.x which is being removed from Debian.
+    (closes: #905858)
+  * Add NEWS file to document HTTP replication removal.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 11 Aug 2018 11:14:02 +0200
+
+osmosis (0.46-5) unstable; urgency=medium
+
+  * Bump Standards-Version to 4.1.5, no changes.
+  * Drop autopkgtest to test installability.
+  * Add lintian override for testsuite-autopkgtest-missing.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 01 Aug 2018 11:18:40 +0200
+
+osmosis (0.46-4) unstable; urgency=medium
+
+  * Update Vcs-* URLs for Salsa.
+  * Drop override for vcs-deprecated-in-debian-infrastructure.
+  * Bump Standards-Version to 4.1.4, no changes.
+  * Strip trailing whitespace from control & rules files.
+  * Build depend on default-jdk & default-jdk-doc, fixes FTBFS:
+    javadoc: error - Error fetching URL: file:/usr/share/doc/default-jdk/api/
+  * Add patch to fix example-shell-script-fails-syntax-check issue.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 20 Jun 2018 21:21:12 +0200
+
+osmosis (0.46-3) unstable; urgency=medium
+
+  * Update copyright-format URL to use HTTPS.
+  * Bump Standards-Version to 4.1.3, no changes.
+  * Add lintian override for vcs-deprecated-in-debian-infrastructure.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 29 Mar 2018 14:59:30 +0200
+
+osmosis (0.46-2) unstable; urgency=medium
+
+  * Fix README.md installation.
+  * Bump Standards-Version to 4.1.1, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 02 Oct 2017 08:34:57 +0200
+
 osmosis (0.46-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/control

@@ -5,7 +5,8 @@ Uploaders: David Paleino <dapal@debian.org>,
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               default-jdk-headless,
+               default-jdk,
+               default-jdk-doc,
                ant-optional,
                gradle-debian-helper,
                ivy,
@@ -32,9 +33,9 @@ Build-Depends: debhelper (>= 9),
                libxerces2-java,
                libxz-java,
                maven-repo-helper
-Standards-Version: 4.1.0
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmosis.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmosis.git -b stretch-backports
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/osmosis
+Vcs-Git: https://salsa.debian.org/debian-gis-team/osmosis.git -b stretch-backports
 Homepage: https://wiki.openstreetmap.org/wiki/Osmosis
 
 Package: osmosis
@@ -70,4 +71,3 @@ Description: Command line OpenStreetMap data processor
     them to other databases and files.
   * Sort data contained in a file.
   * Extract data contained in a bounding box or in a polygon.
-

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: Osmosis
 Upstream-Contact: Brett Henderson <brett@bretth.com>
 Source: https://github.com/openstreetmap/osmosis

debian/docs

-doc/*
 README.md

debian/maven.rules

@@ -2,6 +2,6 @@
 junit junit * s/.*/4.x/ * *
 org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
 org.springframework spring-jdbc * s/.*/debian/ * *
-s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * *
+#s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * *
 s/org.postgis/net.postgis/ postgis-jdbc * s/.*/debian/ * *
 s/com.fasterxml.woodstox/org.codehaus.woodstox/ s/woodstox-core/woodstox-core-lgpl/ * s/.*/debian/ * *

debian/patches/04-osmosis-version.patch

@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/build.gradle
 +++ b/build.gradle
-@@ -23,7 +23,7 @@ subprojects {
+@@ -19,7 +19,7 @@ subprojects {
  
  	// Load the project version dynamically from Git.  For release builds, don't add a suffix.
  	def versionSuffix = "RELEASE".equals(osmosisBuildType) ? '' : '-' + osmosisBuildType

debian/patches/series

 01-fix_launcher.patch
 02-fix_plexus.patch
 04-osmosis-version.patch
+revert-protobuf-3.6.1-changes.patch
+protobuf-3.0.0.patch

debian/rules

@@ -28,4 +28,3 @@ override_dh_installchangelogs:
 
 override_dh_compress:
 	dh_compress -X.conf -X.sql
-

debian/source/lintian-overrides

+# Not worth the effort
+testsuite-autopkgtest-missing
+

debian/tests/control

-# Test installability
-Depends: @
-Test-Command: /bin/true

debian/watch

@@ -3,5 +3,5 @@ opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
 filenamemangle=s/(?:.*?)?(?:rel|v|osmosis)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osmosis-$1.$2/ \
-https://github.com/openstreetmap/osmosis/tags \
-(?:.*?/)?(?:rel|v|osmosis)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+https://github.com/openstreetmap/osmosis/releases \
+(?:.*?/archive/)?(?:rel|v|osmosis)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

gradle.properties

@@ -5,20 +5,24 @@ org.gradle.daemon=true
 
 # 3rd Party Library Versions
 dependencyVersionClassworlds=2.5.2
-dependencyVersionCommonsCodec=1.10
-dependencyVersionCommonsCompress=1.14
+dependencyVersionCommonsCodec=1.11
+dependencyVersionCommonsCompress=1.18
+# Should we be using Dbcp2?
 dependencyVersionCommonsDbcp=1.4
+dependencyVersionGuava=26.0-jre
 dependencyVersionJpf=1.5
+# JUnit 5 is available, some re-write required
 dependencyVersionJunit=4.12
-dependencyVersionMySql=6.0.6
+dependencyVersionMySql=8.0.12
+# Need to migrate to Netty 4
 dependencyVersionNetty=3.10.6.Final
 dependencyVersionPostGis=2.2.1
-dependencyVersionPostgreSql=42.1.4
-dependencyVersionProtobuf=3.4.0
-dependencyVersionSpring=4.3.11.RELEASE
-dependencyVersionWoodstoxCore=5.0.3
-dependencyVersionWoodstoxStax2=4.0.0
-dependencyVersionXerces=2.11.0
+dependencyVersionPostgreSql=42.2.5
+dependencyVersionProtobuf=3.6.1
+dependencyVersionSpring=5.1.0.RELEASE
+dependencyVersionWoodstoxCore=5.1.0
+dependencyVersionWoodstoxStax2=4.1
+dependencyVersionXerces=2.12.0
 
 # Builds are signed if the osmosisSigningEnabled property is set to true.
 # To enable signing, it is recommended to leave this file untouched and to