diff -Nru gradle-propdeps-plugin-0.0.7/debian/changelog gradle-propdeps-plugin-0.0.7/debian/changelog
--- gradle-propdeps-plugin-0.0.7/debian/changelog	2015-09-21 13:15:47.000000000 +0000
+++ gradle-propdeps-plugin-0.0.7/debian/changelog	2021-04-09 17:25:21.000000000 +0000
@@ -1,3 +1,18 @@
+gradle-propdeps-plugin (0.0.7-3~16.04.sav0) xenial; urgency=medium
+
+  * Backport to Xenial
+
+ -- Rob Savoury <savoury@savos.tech>  Fri, 09 Apr 2021 10:25:21 -0700
+
+gradle-propdeps-plugin (0.0.7-3) unstable; urgency=medium
+
+  * Build with gradle-debian-helper
+  * Depend on groovy instead of groovy2
+  * Standards-Version updated to 3.9.8 (no changes)
+  * Use secure Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 19 May 2016 10:11:51 +0200
+
 gradle-propdeps-plugin (0.0.7-2) unstable; urgency=medium
 
   * Fixed a build failure caused by the transition to Groovy 2
diff -Nru gradle-propdeps-plugin-0.0.7/debian/control gradle-propdeps-plugin-0.0.7/debian/control
--- gradle-propdeps-plugin-0.0.7/debian/control	2015-09-21 13:15:15.000000000 +0000
+++ gradle-propdeps-plugin-0.0.7/debian/control	2016-05-19 08:10:34.000000000 +0000
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: debhelper (>= 9), gradle, groovy2, default-jdk, maven-repo-helper
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/gradle-propdeps-plugin.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/gradle-propdeps-plugin.git
+Build-Depends: debhelper (>= 9), gradle-debian-helper, groovy, default-jdk, maven-repo-helper
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/gradle-propdeps-plugin.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/gradle-propdeps-plugin.git
 Homepage: https://github.com/spring-projects/gradle-plugins
 
 Package: gradle-propdeps-plugin
diff -Nru gradle-propdeps-plugin-0.0.7/debian/gradle-propdeps-plugin.poms gradle-propdeps-plugin-0.0.7/debian/gradle-propdeps-plugin.poms
--- gradle-propdeps-plugin-0.0.7/debian/gradle-propdeps-plugin.poms	1970-01-01 00:00:00.000000000 +0000
+++ gradle-propdeps-plugin-0.0.7/debian/gradle-propdeps-plugin.poms	2015-10-16 08:54:24.000000000 +0000
@@ -0,0 +1 @@
+debian/pom.xml --has-package-version --java-lib --artifact=propdeps-plugin/build/libs/propdeps-plugin-*.jar
diff -Nru gradle-propdeps-plugin-0.0.7/debian/patches/04-groovy-compiler-dependencies.patch gradle-propdeps-plugin-0.0.7/debian/patches/04-groovy-compiler-dependencies.patch
--- gradle-propdeps-plugin-0.0.7/debian/patches/04-groovy-compiler-dependencies.patch	2015-09-21 13:12:17.000000000 +0000
+++ gradle-propdeps-plugin-0.0.7/debian/patches/04-groovy-compiler-dependencies.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Description: Add an explicit dependency on Groovy to be able to compile the .groovy files
- (why is this needed exactly?)
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: not-needed
---- a/build.gradle
-+++ b/build.gradle
-@@ -21,6 +21,7 @@
-     }
- 
-     dependencies {
-+        compile 'org.codehaus.groovy:groovy-all:2.x'
-         compile gradleApi()
-         compile localGroovy()
-     }
diff -Nru gradle-propdeps-plugin-0.0.7/debian/patches/series gradle-propdeps-plugin-0.0.7/debian/patches/series
--- gradle-propdeps-plugin-0.0.7/debian/patches/series	2014-11-26 23:54:12.000000000 +0000
+++ gradle-propdeps-plugin-0.0.7/debian/patches/series	2016-05-19 08:07:42.000000000 +0000
@@ -1,4 +1,3 @@
 01-disable-modules.patch
 02-ignore-build-info-extractor.patch
 03-use-local-repository.patch
-04-groovy-compiler-dependencies.patch
diff -Nru gradle-propdeps-plugin-0.0.7/debian/rules gradle-propdeps-plugin-0.0.7/debian/rules
--- gradle-propdeps-plugin-0.0.7/debian/rules	2014-11-26 23:54:12.000000000 +0000
+++ gradle-propdeps-plugin-0.0.7/debian/rules	2015-10-16 10:19:40.000000000 +0000
@@ -1,25 +1,9 @@
 #!/usr/bin/make -f
 
-JAVA_HOME := /usr/lib/jvm/default-java
-VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+export JAVA_HOME := /usr/lib/jvm/default-java
 
 %:
-	dh $@
-
-override_dh_auto_build:
-	dh_auto_build
-	gradle --offline --stacktrace --refresh-dependencies --gradle-user-home .gradle jar
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -Rf build .gradle buildSrc/.gradle/ buildSrc/build/
-	rm -Rf propdeps-plugin/build
-	mh_clean
-
-override_dh_auto_install:
-	dh_auto_install
-	mh_installpom -pgradle-propdeps-plugin --has-package-version -e$(VERSION) debian/pom.xml
-	mh_installjar -pgradle-propdeps-plugin -e$(VERSION) debian/pom.xml propdeps-plugin/build/libs/propdeps-plugin-$(VERSION).jar
+	dh $@ --buildsystem=gradle --with maven_repo_helper
 
 get-orig-source:
 	uscan --download-current-version --rename --force-download