[Git][java-team/maven-compiler-plugin][master] 4 commits: Apply patch for Debian 910093

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / maven-compiler-plugin


Commits:
645a49ce by tony mancill at 2018-11-20T05:36:56Z
Apply patch for Debian 910093

- - - - -
67d19ed7 by tony mancill at 2018-11-21T05:10:25Z
Update Homepage URL to use https

- - - - -
c9ba1fad by tony mancill at 2018-11-21T05:10:46Z
Bump Standards-Version to 4.2.1

- - - - -
ae7f24d3 by tony mancill at 2018-11-21T05:24:42Z
prepare changelog for upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/01-fix-wrong-junit-path.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+maven-compiler-plugin (3.8.0-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Tiago Stürmer Daitx ]
+  * Fix tests: (Closes: #910093)
+    - debian/rules: set JAVA_HOME to prevent compiler test failure.
+    - debian/patches/01-fix-wrong-junit-path.patch: patch wrong junit path in
+      compiler test.
+
+  [ tony mancill ]
+  * Update Homepage URL to use https
+  * Bump Standards-Version to 4.2.1
+
+ -- tony mancill <tmancill at debian.org>  Tue, 20 Nov 2018 21:13:36 -0800
+
 maven-compiler-plugin (3.8.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -19,10 +19,10 @@ Build-Depends:
  libplexus-utils-java,
  libqdox2-java (>= 2.0~M5),
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/maven-compiler-plugin.git
 Vcs-Browser: https://salsa.debian.org/java-team/maven-compiler-plugin
-Homepage: http://maven.apache.org/plugins/maven-compiler-plugin/
+Homepage: https://maven.apache.org/plugins/maven-compiler-plugin/
 
 Package: libmaven-compiler-plugin-java
 Architecture: all


=====================================
debian/patches/01-fix-wrong-junit-path.patch
=====================================
@@ -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 <tiago.daitx at ubuntu.com>
+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
+         {


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+01-fix-wrong-junit-path.patch


=====================================
debian/rules
=====================================
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
 	dh $@



View it on GitLab: https://salsa.debian.org/java-team/maven-compiler-plugin/compare/35d11deec5a0e09c732467369c387c9813b319b6...ae7f24d379bc74b139fc4c1d0b4dc799a181a048

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-compiler-plugin/compare/35d11deec5a0e09c732467369c387c9813b319b6...ae7f24d379bc74b139fc4c1d0b4dc799a181a048
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181223/dd36eb29/attachment.html>