[Git][java-team/aspectj-maven-plugin][master] 3 commits: Use relative paths in the builddef.lst file embedded in the jar to make the builds reproducible

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / aspectj-maven-plugin


Commits:
4f5d1c50 by Emmanuel Bourg at 2019-09-09T11:59:29Z
Use relative paths in the builddef.lst file embedded in the jar to make the builds reproducible

- - - - -
2a8ef333 by Emmanuel Bourg at 2019-09-09T11:59:41Z
Standards-Version updated to 4.4.0

- - - - -
dc3f5834 by Emmanuel Bourg at 2019-09-09T12:00:08Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/01-relative-path-in-build-config-file.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+aspectj-maven-plugin (1.11-2) unstable; urgency=medium
+
+  * Team upload.
+  * Use relative paths in the builddef.lst file embedded in the jar
+    to make the builds reproducible
+  * Standards-Version updated to 4.4.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 09 Sep 2019 14:00:02 +0200
+
 aspectj-maven-plugin (1.11-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends:
  libmaven3-core-java,
  libplexus-utils2-java (>= 2.0.5),
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Vcs-Git: https://salsa.debian.org/java-team/aspectj-maven-plugin.git
 Vcs-Browser: https://salsa.debian.org/java-team/aspectj-maven-plugin
 Homepage: http://www.mojohaus.org/aspectj-maven-plugin/


=====================================
debian/patches/01-relative-path-in-build-config-file.patch
=====================================
@@ -0,0 +1,32 @@
+Description: Use relative paths in the build config file embedded in the jar (builddef.lst) to make the builds reproducible
+Author: Emmanuel Bourg <ebourg at apache.org>
+Bug: https://github.com/mojohaus/aspectj-maven-plugin/issues/52
+--- a/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java
++++ b/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java
+@@ -615,7 +615,7 @@
+ 
+         // add target dir argument
+         ajcOptions.add("-d");
+-        ajcOptions.add(getOutputDirectory().getAbsolutePath());
++        ajcOptions.add(getOutputDirectory().getAbsolutePath().replaceAll( new File("").getAbsolutePath(), "." ));
+ 
+         // Add all the files to be included in the build,
+         if (null != ajdtBuildDefFile) {
+--- a/src/main/java/org/codehaus/mojo/aspectj/AjcHelper.java
++++ b/src/main/java/org/codehaus/mojo/aspectj/AjcHelper.java
+@@ -120,6 +120,7 @@
+         }
+ 
+         cp = StringUtils.replace( cp, "//", "/" );
++        cp = cp.replaceAll( new File("").getAbsolutePath(), "." );
+         return cp;
+     }
+ 
+@@ -175,6 +176,7 @@
+ 
+         for ( String sourceDir : sourceDirs )
+         {
++            sourceDir = sourceDir.replaceAll( new File("").getAbsolutePath(), "." );
+             try
+             {
+                 if ( FileUtils.fileExists( sourceDir ) )


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+01-relative-path-in-build-config-file.patch



View it on GitLab: https://salsa.debian.org/java-team/aspectj-maven-plugin/compare/c722d365e1ad671df90ec6db2e7e8dbd04077bca...dc3f58345c46353369589e6357e43204e4fe5532

-- 
View it on GitLab: https://salsa.debian.org/java-team/aspectj-maven-plugin/compare/c722d365e1ad671df90ec6db2e7e8dbd04077bca...dc3f58345c46353369589e6357e43204e4fe5532
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/20190909/6d3ab920/attachment.html>