[sisu-ioc] 01/03: Sort the classes by name in META-INF/sisu/javax.inject.Named

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository sisu-ioc.

commit e5b228a690a3d12d9f305ab4fb6b548aeffdc3f3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 31 10:12:20 2016 +0200

    Sort the classes by name in META-INF/sisu/javax.inject.Named
---
 debian/changelog                        |  8 ++++++++
 debian/patches/reproducible-index.patch | 14 ++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 413ae54..0a74508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sisu-ioc (2.3.0-9) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Sort the classes by name in META-INF/sisu/javax.inject.Named to make
+    the output reproducible
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 31 Aug 2016 10:10:37 +0200
+
 sisu-ioc (2.3.0-8) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/reproducible-index.patch b/debian/patches/reproducible-index.patch
new file mode 100644
index 0000000..7e29b44
--- /dev/null
+++ b/debian/patches/reproducible-index.patch
@@ -0,0 +1,14 @@
+Description: Sort the classes by name in META-INF/sisu/javax.inject.Named to make the output reproducible
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/sisu-inject/containers/guice-bean/guice-bean-scanners/src/main/java/org/sonatype/guice/bean/scanners/index/AbstractSisuIndex.java
++++ b/sisu-inject/containers/guice-bean/guice-bean-scanners/src/main/java/org/sonatype/guice/bean/scanners/index/AbstractSisuIndex.java
+@@ -149,7 +149,7 @@
+             final BufferedWriter writer = new BufferedWriter( getWriter( "META-INF/sisu/" + name ) );
+             try
+             {
+-                for ( final String line : table )
++                for ( final String line : new java.util.TreeSet<String>( table ) )
+                 {
+                     writer.write( line );
+                     writer.newLine();
diff --git a/debian/patches/series b/debian/patches/series
index 3b4de2b..0f0d67e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ javac_apt_scanner.diff
 plexus-utils-compatibility.patch
 felix-compatibility.patch
 bnd-compatibility.patch
+reproducible-index.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git