diff -Nru maven-compiler-plugin-3.6.2/debian/changelog maven-compiler-plugin-3.6.2/debian/changelog --- maven-compiler-plugin-3.6.2/debian/changelog 2017-08-30 23:38:55.000000000 +0000 +++ maven-compiler-plugin-3.6.2/debian/changelog 2017-09-08 18:32:01.000000000 +0000 @@ -1,3 +1,28 @@ +maven-compiler-plugin (3.6.2-2ubuntu2) artful; urgency=medium + + * Remove dh_auto_configure override, no longer required after + the 3.6.1 -> 3.6.2 relocate done in 3.6.2-2ubuntu1. + + -- Tiago Stürmer Daitx Sat, 08 Sep 2017 18:32:01 +0000 + +maven-compiler-plugin (3.6.2-2ubuntu1) artful; urgency=medium + + * Copy libmaven-compiler-plugin version 3.2 over 3.6.1 to fix build. + LP: #1716095. + * Relocate libmaven-compiler-plugin version 3.6.1 to version 3.6.2 + to fix future builds for this and all other maven dependent packages. + * Set JAVA_HOME to prevent compiler test failure. + * Patch wrong junit path in compiler test. + + -- Tiago Stürmer Daitx Fri, 08 Sep 2017 17:59:07 +0000 + +maven-compiler-plugin (3.6.2-2) unstable; urgency=medium + + * Team upload. + * Removed the -java-doc package + + -- Emmanuel Bourg Thu, 07 Sep 2017 09:54:02 +0200 + maven-compiler-plugin (3.6.2-1) unstable; urgency=medium * Team upload. diff -Nru maven-compiler-plugin-3.6.2/debian/control maven-compiler-plugin-3.6.2/debian/control --- maven-compiler-plugin-3.6.2/debian/control 2017-08-30 23:33:15.000000000 +0000 +++ maven-compiler-plugin-3.6.2/debian/control 2017-09-08 18:32:01.000000000 +0000 @@ -1,24 +1,24 @@ Source: maven-compiler-plugin Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Torsten Werner -Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: default-jdk-doc, - libasm-java (>= 6.0~), - libmaven-javadoc-plugin-java, - libmaven-plugin-testing-java, - libmaven-plugin-tools-java, - libmaven3-core-java, - libplexus-compiler-java (>= 2.8.1), - libplexus-component-metadata-java, - libplexus-utils-java, - libplexus-utils-java-doc, - libqdox2-java (>= 2.0~M5), - junit4, - libmockito-java, - libmaven-shared-utils-java, - libmaven-shared-incremental-java +Build-Depends: + debhelper (>= 10), + default-jdk, + junit4, + libmaven-plugin-testing-java, + libmaven-plugin-tools-java, + libmaven-shared-incremental-java, + libmaven-shared-utils-java, + libmaven3-core-java, + libmockito-java, + libplexus-compiler-java (>= 2.8.1), + libplexus-component-metadata-java, + libplexus-utils-java, + libqdox2-java (>= 2.0~M5), + maven-debian-helper (>= 1.4) Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-compiler-plugin.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-compiler-plugin.git @@ -28,7 +28,6 @@ Architecture: all Depends: ${maven:Depends}, ${misc:Depends} Recommends: ${maven:OptionalDepends} -Suggests: libmaven-compiler-plugin-java-doc Description: Maven Compiler plugin Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, @@ -47,30 +46,3 @@ . The Compiler Plugin is used to compile the sources of your project. The default compiler is javac and is used to compile Java sources. - -Package: libmaven-compiler-plugin-java-doc -Architecture: all -Section: doc -Depends: ${maven:DocDepends}, ${misc:Depends} -Recommends: ${maven:DocOptionalDepends} -Suggests: libmaven-compiler-plugin-java -Description: Documentation for Maven Compiler Plugin - Maven is a software project management and comprehension tool. Based on the - concept of a project object model (POM), Maven can manage a project's build, - reporting and documentation from a central piece of information. - . - Maven's primary goal is to allow a developer to comprehend the complete - state of a development effort in the shortest period of time. In order to - attain this goal there are several areas of concern that Maven attempts - to deal with: - . - * Making the build process easy - * Providing a uniform build system - * Providing quality project information - * Providing guidelines for best practices development - * Allowing transparent migration to new features - . - The Compiler Plugin is used to compile the sources of your project. The - default compiler is javac and is used to compile Java sources. - . - This package contains the API documentation of libmaven-compiler-plugin-java. diff -Nru maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java-doc.doc-base.api maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java-doc.doc-base.api --- maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java-doc.doc-base.api 2017-08-30 23:33:15.000000000 +0000 +++ maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java-doc.doc-base.api 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Document: libmaven-compiler-plugin-java -Title: API Javadoc for Maven Compiler Plugin -Author: Maven Compiler Plugin developers -Abstract: This is the API Javadoc provided for the - libmaven-compiler-plugin-java library. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libmaven-compiler-plugin-java/api/index.html -Files: /usr/share/doc/libmaven-compiler-plugin-java/api/* diff -Nru maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java-doc.install maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java-doc.install --- maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java-doc.install 2017-08-30 23:33:15.000000000 +0000 +++ maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java-doc.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -target/apidocs/* usr/share/doc/libmaven-compiler-plugin-java/api - diff -Nru maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java.poms maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java.poms --- maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java.poms 2017-08-30 23:33:15.000000000 +0000 +++ maven-compiler-plugin-3.6.2/debian/libmaven-compiler-plugin-java.poms 2017-09-08 18:32:01.000000000 +0000 @@ -25,4 +25,4 @@ # --site-xml=: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] # -pom.xml --no-parent --has-package-version --relocate=org.apache.maven.plugins:maven-compiler-plugin:3.1,org.apache.maven.plugins:maven-compiler-plugin:3.2 +pom.xml --no-parent --has-package-version --relocate=org.apache.maven.plugins:maven-compiler-plugin:3.1,org.apache.maven.plugins:maven-compiler-plugin:3.2,org.apache.maven.plugins:maven-compiler-plugin:3.6.1 diff -Nru maven-compiler-plugin-3.6.2/debian/patches/01-fix-wrong-junit-path.patch maven-compiler-plugin-3.6.2/debian/patches/01-fix-wrong-junit-path.patch --- maven-compiler-plugin-3.6.2/debian/patches/01-fix-wrong-junit-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-3.6.2/debian/patches/01-fix-wrong-junit-path.patch 2017-09-08 18:32:01.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fix wrong junit patch in Compiler test. + The compiler testcase sets an absolute path to junit's jar file + version 3.8.1 even though the pom.xml file now depends on 4.12 + (4.x on Debian). + . + This patch fixes it and set the fixed path to a current junit jar + file. +Author: Tiago Stürmer Daitx +Last-Update: 2017-09-08 + +--- maven-compiler-plugin-3.6.2.orig/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java ++++ maven-compiler-plugin-3.6.2/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java +@@ -397,7 +397,7 @@ public class CompilerMojoTestCase + String localRepository = System.getProperty( "localRepository" ); + if ( localRepository != null ) + { +- artifactFile = new File( localRepository, "junit/junit/3.8.1/junit-3.8.1.jar" ); ++ artifactFile = new File( localRepository, "junit/junit/4.x/junit-4.x.jar" ); + } + else + { diff -Nru maven-compiler-plugin-3.6.2/debian/patches/series maven-compiler-plugin-3.6.2/debian/patches/series --- maven-compiler-plugin-3.6.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-3.6.2/debian/patches/series 2017-09-08 18:32:01.000000000 +0000 @@ -0,0 +1 @@ +01-fix-wrong-junit-path.patch diff -Nru maven-compiler-plugin-3.6.2/debian/rules maven-compiler-plugin-3.6.2/debian/rules --- maven-compiler-plugin-3.6.2/debian/rules 2017-08-30 23:33:15.000000000 +0000 +++ maven-compiler-plugin-3.6.2/debian/rules 2017-09-08 18:32:01.000000000 +0000 @@ -1,4 +1,5 @@ #!/usr/bin/make -f +export JAVA_HOME=/usr/lib/jvm/default-java %: dh $@