.travis.yml

@@ -2,10 +2,10 @@ language: java
 jdk:
   - openjdk7
   - oraclejdk8
-  - openjdk9
-  - openjdk10
   - openjdk11
 
+dist: trusty
+
 # No need for preliminary install step.
 install: true
 #

README.md

@@ -14,6 +14,7 @@ We have changed the default branch in GitHub repository from `plexus-containers-
 
 You can find details about the different releases in the [Release Notes](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md).
 
+ * [Release 2.1.0](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md#plexus-containers-210).
  * [Release 2.0.0](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md#plexus-containers-200).
 
 ## Site publishing
@@ -21,5 +22,6 @@ You can find details about the different releases in the [Release Notes](https:/
 For publishing [the site](https://codehaus-plexus.github.io/plexus-containers/) do the following:
 
 ```
-mvn -Preporting verify site site:stage scm-publish:publish-scm
+mvn -Preporting verify site site:stage
+mvn scm-publish:publish-scm
 ```

ReleaseNotes.md

 Plexus Containers Release Notes
 =========================
 
+Plexus Containers 2.1.0
+---------------------
+
+### Improvements
+ 
+ * [Issue #27][issue-27] - Sort manually crafted descriptors files for Reproducible Builds
+
 Plexus Containers 2.0.0
 ---------------------
 
@@ -32,6 +39,7 @@ Plexus Containers 2.0.0 requires Java 6 and Maven 3.0+
 [issue-21]: https://github.com/codehaus-plexus/plexus-containers/issues/21
 [issue-22]: https://github.com/codehaus-plexus/plexus-containers/issues/22
 [issue-23]: https://github.com/codehaus-plexus/plexus-containers/issues/23
+[issue-27]: https://github.com/codehaus-plexus/plexus-containers/issues/27
 
 [pr-7]: https://github.com/codehaus-plexus/plexus-containers/pull/7
 [pr-6]: https://github.com/codehaus-plexus/plexus-containers/pull/6

debian/changelog

+plexus-containers (2.1.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Standards-Version updated to 4.5.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 27 Jan 2020 17:31:03 +0100
+
 plexus-containers (2.0.0-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -18,7 +18,7 @@ Build-Depends:
  libqdox2-java,
  libxbean-reflect-java,
  maven-debian-helper
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/java-team/plexus-containers.git
 Vcs-Browser: https://salsa.debian.org/java-team/plexus-containers
 Homepage: https://github.com/codehaus-plexus/plexus-containers

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-curent-version --force-download --rename

plexus-component-annotations/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-containers</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>plexus-component-annotations</artifactId>

plexus-component-metadata/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-containers</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>plexus-component-metadata</artifactId>

plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusDescriptorMojo.java

@@ -30,7 +30,7 @@ import org.codehaus.plexus.metadata.MetadataGenerationRequest;
 
 /**
  * Generates a Plexus <tt>components.xml</tt> component descriptor file from source (javadoc) or
- * class annotations.
+ * class annotations and manually crafted descriptor files.
  * 
  * @author Jason van Zyl
  * @author Trygve Laugst&oslash;l

plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusMergeMojo.java

@@ -79,7 +79,7 @@ public class PlexusMergeMojo
         }
         catch ( IOException e )
         {
-            throw new MojoExecutionException( "Error while executing component descritor creator.", e );
+            throw new MojoExecutionException( "Error while executing component descriptor creator.", e );
         }
     }
 }

plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusTestDescriptorMojo.java

@@ -30,7 +30,7 @@ import org.codehaus.plexus.metadata.MetadataGenerationRequest;
 
 /**
  * Generates a Plexus <tt>components.xml</tt> component descriptor file from test source (javadoc)
- * or test class annotations.
+ * or test class annotations and manually crafted descriptor files.
  * 
  * @author Jason van Zyl
  * @author Trygve Laugst&oslash;l

plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/DefaultMetadataGenerator.java

@@ -26,6 +26,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -148,13 +149,26 @@ public class DefaultMetadataGenerator
         {
             File[] files = request.componentDescriptorDirectory.listFiles();
 
+            // Sort the files by name to make the output reproducible
+            Arrays.sort( files, new Comparator<File>()
+            {
+                public int compare( File f1, File f2 )
+                {
+                    return f1.getName().compareTo( f2.getName() );
+                }
+            });
+
+            int added = 0;
             for ( File file : files )
             {
                 if ( file.getName().endsWith( ".xml" ) && !file.getName().equals( "plexus.xml" ) )
                 {
                     componentDescriptors.add( file );
+                    added++;
                 }
             }
+
+            getLogger().info( "Merging " + added + " manually-crafted descriptor file(s)" );
         }
 
         if ( componentDescriptors.size() > 0 )

plexus-component-metadata/src/site/apt/index.apt.vm

@@ -37,10 +37,12 @@ ${project.name}
   The Plexus Component Metadata Maven Plugin has 3 goals:
 
   * {{{./generate-metadata-mojo.html}plexus-component-metadata:generate-metadata}} generates
-  a Plexus components.xml component descriptor file from source (javadoc) or class annotations,
+  a Plexus components.xml component descriptor file from source (javadoc) or class annotations
+  and manually crafted descriptor files,
 
   * {{{./generate-test-metadata-mojo.html}plexus-component-metadata:generate-test-metadata}} generates
-  a Plexus components.xml component descriptor file from test source (javadoc) or class annotations,
+  a Plexus components.xml component descriptor file from test source (javadoc) or class annotations
+  and manually crafted descriptor files,
 
   * {{{./merge-metadata-mojo.html}plexus-component-metadata:merge-metadata}} merges
   a set of Plexus descriptors into one descriptor file.

plexus-container-default/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-containers</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>plexus-container-default</artifactId>

pom.xml

@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>plexus-containers</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <packaging>pom</packaging>
 
   <name>Plexus Containers</name>
@@ -27,7 +27,7 @@
     <connection>scm:git:https://github.com/codehaus-plexus/plexus-containers.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/codehaus-plexus/plexus-containers.git</developerConnection>
     <url>https://github.com/codehaus-plexus/plexus-containers</url>
-    <tag>plexus-containers-2.0.0</tag>
+    <tag>plexus-containers-2.1.0</tag>
   </scm>
   <issueManagement>
     <system>github</system>