Skip to content
GitLab
Explore
Sign in
Register
Commits on Source
3
Use relative paths in the builddef.lst file embedded in the jar to make the builds reproducible
· 4f5d1c50
Emmanuel Bourg
authored
Sep 09, 2019
4f5d1c50
Standards-Version updated to 4.4.0
· 2a8ef333
Emmanuel Bourg
authored
Sep 09, 2019
2a8ef333
Upload to unstable
· dc3f5834
Emmanuel Bourg
authored
Sep 09, 2019
dc3f5834
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
dc3f5834
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@apache.org> Mon, 09 Sep 2019 14:00:02 +0200
aspectj-maven-plugin (1.11-1) unstable; urgency=medium
* New upstream release
...
...
debian/control
View file @
dc3f5834
...
...
@@ -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 → 100644
View file @
dc3f5834
Description: Use relative paths in the build config file embedded in the jar (builddef.lst) to make the builds reproducible
Author: Emmanuel Bourg <ebourg@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 → 100644
View file @
dc3f5834
01-relative-path-in-build-config-file.patch