From bd10f00b68eb766cd239275e8504acedc2818d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Sat, 21 Sep 2019 19:17:22 +0200
Subject: [PATCH] [MNG-6789] upgrade and configure plugins for Reproducible
 Builds

- packaging plugins (source, jar, assembly) 3.2.0
- plexus-metadata 2.1.0
- sisu.inject 3.3.4
---
 .../apache/maven/messages/build.properties    |  1 -
 pom.xml                                       | 27 +++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/maven-core/src/main/resources/org/apache/maven/messages/build.properties b/maven-core/src/main/resources/org/apache/maven/messages/build.properties
index d15784a789..20f386ba0e 100644
--- a/maven-core/src/main/resources/org/apache/maven/messages/build.properties
+++ b/maven-core/src/main/resources/org/apache/maven/messages/build.properties
@@ -16,7 +16,6 @@
 # under the License.
 
 buildNumber=${buildNumber}
-timestamp=${timestamp}
 version=${project.version}
 distributionId=${distributionId}
 distributionShortName=${distributionShortName}
diff --git a/pom.xml b/pom.xml
index c7ac485bbb..46f4926f7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,11 +54,11 @@ under the License.
     <commonsLangVersion>3.8.1</commonsLangVersion>
     <junitVersion>4.12</junitVersion>
     <mockitoVersion>2.21.0</mockitoVersion>
-    <plexusVersion>2.0.0</plexusVersion>
+    <plexusVersion>2.1.0</plexusVersion>
     <plexusInterpolationVersion>1.25</plexusInterpolationVersion>
     <plexusUtilsVersion>3.2.1</plexusUtilsVersion>
     <guiceVersion>4.2.1</guiceVersion>
-    <sisuInjectVersion>0.3.3</sisuInjectVersion>
+    <sisuInjectVersion>0.3.4</sisuInjectVersion>
     <wagonVersion>3.3.3</wagonVersion>
     <securityDispatcherVersion>1.4</securityDispatcherVersion>
     <cipherVersion>1.7</cipherVersion>
@@ -76,6 +76,7 @@ under the License.
     <maven.site.path>ref/3-LATEST</maven.site.path>
     <checkstyle.violation.ignore>None</checkstyle.violation.ignore>
     <checkstyle.excludes>**/package-info.java</checkstyle.excludes>
+    <project.build.outputTimestamp>2019-11-07T12:32:18Z</project.build.outputTimestamp>
   </properties>
 
   <modules>
@@ -454,6 +455,22 @@ under the License.
   <build>
     <pluginManagement>
       <plugins>
+        <!-- TODO remove source/jar/assembly versions when parent upgraded to 34 -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-metadata</artifactId>
@@ -567,12 +584,6 @@ under the License.
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <!-- TODO remove when upgrade to apache-22 parent pom -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.1.1</version>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>