This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-maven-plugin.
commit 46dbfcbfa4deb1f5f7a8af59760315d5b954c714 Author: Emmanuel Bourg <[email protected]> Date: Sat Feb 27 23:31:04 2016 +0100 Sort the components in the components.xml files generated by the plugin --- debian/changelog | 2 ++ debian/patches/0005-reproducible-metadata.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4f9c98a..b9f64ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ plexus-maven-plugin (1.3.8-10) UNRELEASED; urgency=medium * Team upload. + * Sort the components in the components.xml files generated by the plugin. + This should improve the reproducibility of the packages using this plugin. * Build with the DH sequencer instead of CDBS * Standards-Version updated to 3.9.7 (no changes) * Removed the javadoc package diff --git a/debian/patches/0005-reproducible-metadata.patch b/debian/patches/0005-reproducible-metadata.patch new file mode 100644 index 0000000..b5eae2e --- /dev/null +++ b/debian/patches/0005-reproducible-metadata.patch @@ -0,0 +1,19 @@ +Description: Sort the components to make the metadata reproducible +Author: Emmanuel Bourg <[email protected]> +Forwarded: no + +--- a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java +@@ -144,6 +144,12 @@ + else { + getLog().info("Discovered " + descriptors.size() + " component descriptors(s)"); + ++ Collections.sort(descriptors, new java.util.Comparator<ComponentDescriptor>() { ++ public int compare(ComponentDescriptor d1, ComponentDescriptor d2) { ++ return d1.getHumanReadableKey().compareTo(d2.getHumanReadableKey()); ++ } ++ }); ++ + ComponentSetDescriptor set = new ComponentSetDescriptor(); + set.setComponents(descriptors); + set.setDependencies(Collections.EMPTY_LIST); diff --git a/debian/patches/series b/debian/patches/series index e4095c6..37535dd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-fix-plexus-descriptor.patch 0003-add-missing-dependency.patch 0004-fix-filename-parameter-default-value.patch +0005-reproducible-metadata.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-maven-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
