[Git][java-team/aspectj-maven-plugin][master] 4 commits: Sort the parameters in the builddef.lst file embedded in the jar to make the...

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Fri Oct 11 09:22:55 BST 2024



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


Commits:
d857b98a by Emmanuel Bourg at 2024-10-11T10:11:46+02:00
Sort the parameters in the builddef.lst file embedded in the jar to make the builds reproducible (Closes: #1005954)

- - - - -
72c5541d by Emmanuel Bourg at 2024-10-11T10:12:14+02:00
Standards-Version updated to 4.7.0

- - - - -
56703e90 by Emmanuel Bourg at 2024-10-11T10:12:15+02:00
Switch to debhelper level 13

- - - - -
a306aaff by Emmanuel Bourg at 2024-10-11T10:12:32+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/02-sort-parameters-in-build-config-file.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+aspectj-maven-plugin (1.11-3) unstable; urgency=medium
+
+  * Sort the parameters in the builddef.lst file embedded in the
+    jar to make the builds reproducible (Closes: #1005954)
+  * Standards-Version updated to 4.7.0
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 11 Oct 2024 10:12:22 +0200
+
 aspectj-maven-plugin (1.11-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  junit4,
  libaspectj-java (>= 1.8.2),
@@ -17,7 +17,7 @@ Build-Depends:
  libmaven3-core-java,
  libplexus-utils2-java (>= 2.0.5),
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.4.0
+Standards-Version: 4.7.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/02-sort-parameters-in-build-config-file.patch
=====================================
@@ -0,0 +1,99 @@
+Description: Sort the parameters 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
+@@ -39,7 +39,7 @@
+ import java.io.Serializable;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+-import java.util.HashSet;
++import java.util.TreeSet;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+@@ -628,7 +628,7 @@
+ 
+     protected Set<String> getIncludedSources()
+             throws MojoExecutionException {
+-        Set<String> result = new HashSet<String>();
++        Set<String> result = new TreeSet<String>();
+         if (getJavaSources() == null) {
+             result = AjcHelper.getBuildFilesForSourceDirs(getSourceDirectories(), this.includes, this.excludes);
+         } else {
+--- a/src/main/java/org/codehaus/mojo/aspectj/AjcHelper.java
++++ b/src/main/java/org/codehaus/mojo/aspectj/AjcHelper.java
+@@ -41,6 +41,7 @@
+ import java.util.List;
+ import java.util.Properties;
+ import java.util.Set;
++import java.util.TreeSet;
+ 
+ import org.apache.maven.artifact.Artifact;
+ import org.apache.maven.plugin.MojoExecutionException;
+@@ -90,7 +91,7 @@
+     public static String createClassPath( MavenProject project, List<Artifact> pluginArtifacts, List<String> outDirs )
+     {
+         String cp = new String();
+-        Set<Artifact> classPathElements = Collections.synchronizedSet( new LinkedHashSet<Artifact>() );
++        Set<Artifact> classPathElements = Collections.synchronizedSet( new TreeSet<Artifact>() );
+         Set<Artifact> dependencyArtifacts = project.getDependencyArtifacts();
+         classPathElements.addAll( dependencyArtifacts == null ? Collections.<Artifact>emptySet() : dependencyArtifacts );
+         classPathElements.addAll( project.getArtifacts() );
+@@ -137,7 +138,7 @@
+     public static Set<String> getBuildFilesForAjdtFile( String ajdtBuildDefFile, File basedir )
+         throws MojoExecutionException
+     {
+-        Set<String> result = new LinkedHashSet<String>();
++        Set<String> result = new TreeSet<String>();
+ 
+         Properties ajdtBuildProperties = new Properties();
+         try
+@@ -172,7 +173,7 @@
+     public static Set<String> getBuildFilesForSourceDirs( List<String> sourceDirs, String[] includes, String[] excludes )
+         throws MojoExecutionException
+     {
+-        Set<String> result = new LinkedHashSet<String>();
++        Set<String> result = new TreeSet<String>();
+ 
+         for ( String sourceDir : sourceDirs )
+         {
+@@ -208,7 +209,7 @@
+     public static Set<String> getWeaveSourceFiles( String[] weaveDirs )
+         throws MojoExecutionException
+     {
+-        Set<String> result = new HashSet<String>();
++        Set<String> result = new TreeSet<String>();
+ 
+         for ( int i = 0; i < weaveDirs.length; i++ )
+         {
+@@ -331,7 +332,7 @@
+     protected static Set<String> resolveIncludeExcludeString( String input, File basedir )
+         throws MojoExecutionException
+     {
+-        Set<String> inclExlSet = new LinkedHashSet<String>();
++        Set<String> inclExlSet = new TreeSet<String>();
+         try
+         {
+             if ( null == input || input.trim().equals( "" ) )
+--- a/src/test/java/org/codehaus/mojo/aspectj/AjcHelperTest.java
++++ b/src/test/java/org/codehaus/mojo/aspectj/AjcHelperTest.java
+@@ -26,8 +26,8 @@
+ import java.io.File;
+ import java.util.ArrayList;
+ import java.util.Collections;
+-import java.util.HashSet;
+ import java.util.List;
++import java.util.Set;
+ 
+ import junit.framework.TestCase;
+ 
+@@ -62,7 +62,7 @@
+     {
+         List baseDirs = new ArrayList();
+         baseDirs.add( "src/shouldNotExist" );
+-        HashSet sources = (HashSet) AjcHelper.getBuildFilesForSourceDirs( baseDirs,
++        Set sources = (Set) AjcHelper.getBuildFilesForSourceDirs( baseDirs,
+             new String[] { AjcHelper.DEFAULT_INCLUDES },
+             new String[] { AjcHelper.DEFAULT_EXCLUDES } );
+         assertTrue( sources.isEmpty() );


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 01-relative-path-in-build-config-file.patch
+02-sort-parameters-in-build-config-file.patch



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

-- 
View it on GitLab: https://salsa.debian.org/java-team/aspectj-maven-plugin/-/compare/dc3f58345c46353369589e6357e43204e4fe5532...a306aaffe42047f15a53ce61a7d1a36c09d5ca50
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/20241011/587de662/attachment.htm>


More information about the pkg-java-commits mailing list