diff -Nru maven-plugin-tools-3.5/debian/changelog maven-plugin-tools-3.5/debian/changelog
--- maven-plugin-tools-3.5/debian/changelog	2017-09-03 23:31:05.000000000 +0000
+++ maven-plugin-tools-3.5/debian/changelog	2019-02-21 16:29:30.000000000 +0000
@@ -1,3 +1,15 @@
+maven-plugin-tools (3.5-6ubuntu1~18.04.1) bionic; urgency=medium
+
+  [ Tiago Stürmer Daitx ]
+  * Backport changes from 3.6.0-1. (LP: #1814133)
+  * Set compiler release level to 7.
+  * Build depend on libmaven-enforcer-plugin-java.
+
+  [ Emmanuel Bourg ]
+  * No longer build the maven-plugin-tools-javadoc module. (Closes: #898821)
+
+ -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com>  Thu, 21 Feb 2019 16:29:30 +0000
+
 maven-plugin-tools (3.5-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru maven-plugin-tools-3.5/debian/control maven-plugin-tools-3.5/debian/control
--- maven-plugin-tools-3.5/debian/control	2017-09-03 23:29:18.000000000 +0000
+++ maven-plugin-tools-3.5/debian/control	2019-02-21 16:29:30.000000000 +0000
@@ -1,7 +1,8 @@
 Source: maven-plugin-tools
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner@debian.org>,
            Ludovic Claude <ludovic.claude@laposte.net>
 Build-Depends: debhelper (>= 10), default-jdk
@@ -13,6 +14,7 @@
                      libdoxia-sitetools-java,
                      libeasymock-java,
                      libjtidy-java,
+                     libmaven-enforcer-plugin-java,
                      libmaven-reporting-api-java,
                      libmaven-reporting-impl-java,
                      libmaven3-core-java,
diff -Nru maven-plugin-tools-3.5/debian/libmaven-plugin-tools-java.poms maven-plugin-tools-3.5/debian/libmaven-plugin-tools-java.poms
--- maven-plugin-tools-3.5/debian/libmaven-plugin-tools-java.poms	2017-07-17 12:48:02.000000000 +0000
+++ maven-plugin-tools-3.5/debian/libmaven-plugin-tools-java.poms	2019-02-21 16:29:10.000000000 +0000
@@ -32,7 +32,6 @@
 maven-plugin-tools-api/pom.xml --has-package-version
 maven-plugin-tools-generators/pom.xml --has-package-version
 maven-plugin-tools-java/pom.xml --has-package-version
-maven-plugin-tools-javadoc/pom.xml --has-package-version
 maven-script/pom.xml --has-package-version
 maven-script/maven-plugin-tools-ant/pom.xml --has-package-version
 maven-script/maven-plugin-tools-beanshell/pom.xml --has-package-version
diff -Nru maven-plugin-tools-3.5/debian/maven.ignoreRules maven-plugin-tools-3.5/debian/maven.ignoreRules
--- maven-plugin-tools-3.5/debian/maven.ignoreRules	2017-09-03 22:20:31.000000000 +0000
+++ maven-plugin-tools-3.5/debian/maven.ignoreRules	2019-02-21 16:29:30.000000000 +0000
@@ -1,8 +1,10 @@
 
 org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.apache.maven.plugins maven-invoker-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugin-tools maven-plugin-tools-javadoc * * * *
 org.easytesting fest-assert * * * *
 xmlunit xmlunit * * * *
 org.apache.maven.plugin-testing maven-plugin-testing-harness * * * *
diff -Nru maven-plugin-tools-3.5/debian/maven.properties maven-plugin-tools-3.5/debian/maven.properties
--- maven-plugin-tools-3.5/debian/maven.properties	2017-06-26 09:29:21.000000000 +0000
+++ maven-plugin-tools-3.5/debian/maven.properties	2019-02-21 16:29:30.000000000 +0000
@@ -3,3 +3,4 @@
 # maven.test.skip=true
 
 maven.test.skip=true
+maven.compiler.release=7
diff -Nru maven-plugin-tools-3.5/debian/patches/07-maven-compatibility.patch maven-plugin-tools-3.5/debian/patches/07-maven-compatibility.patch
--- maven-plugin-tools-3.5/debian/patches/07-maven-compatibility.patch	2017-09-03 22:23:33.000000000 +0000
+++ maven-plugin-tools-3.5/debian/patches/07-maven-compatibility.patch	2019-02-21 16:29:30.000000000 +0000
@@ -3,7 +3,7 @@
 Forwarded: no
 --- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
 +++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
-@@ -733,9 +733,9 @@
+@@ -733,9 +733,9 @@ public class PluginReport
              return "Unknown";
          }
  
@@ -32,3 +32,13 @@
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-enforcer-plugin</artifactId>
          <executions>
+--- a/pom.xml
++++ b/pom.xml
+@@ -67,7 +67,6 @@
+     <module>maven-plugin-tools-api</module>
+     <module>maven-plugin-tools-java</module>
+     <module>maven-plugin-tools-annotations</module>
+-    <module>maven-plugin-tools-javadoc</module>
+     <module>maven-plugin-annotations</module>
+     <module>maven-script</module>
+     <module>maven-plugin-plugin</module><!-- keep at end since ITs require every extractors -->