[maven] branch master updated (fa97042 -> bd10f00)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven] branch master updated (fa97042 -> bd10f00)

hboutemy
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git.


    from fa97042  exclude IDE files that may pollute source archive
     new 3a80ae0  [MNG-6799] deprecate StringSearchModelInterpolator and remove @Named
     new bd10f00  [MNG-6789] upgrade and configure plugins for Reproducible Builds

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/maven/messages/build.properties     |  1 -
 .../StringSearchModelInterpolator.java             |  7 ++----
 .../StringVisitorModelInterpolator.java            |  2 ++
 pom.xml                                            | 27 +++++++++++++++-------
 4 files changed, 23 insertions(+), 14 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[maven] 01/02: [MNG-6799] deprecate StringSearchModelInterpolator and remove @Named

hboutemy
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 3a80ae08aac785deb61e417f82560cb06209d5bc
Author: Hervé Boutemy <[hidden email]>
AuthorDate: Wed Nov 6 12:13:29 2019 +0100

    [MNG-6799] deprecate StringSearchModelInterpolator and remove @Named
---
 .../maven/model/interpolation/StringSearchModelInterpolator.java   | 7 ++-----
 .../maven/model/interpolation/StringVisitorModelInterpolator.java  | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
index c5cd1d2..9b67a34 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
@@ -46,14 +46,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 /**
  * StringSearchModelInterpolator
+ * @deprecated replaced by StringVisitorModelInterpolator (MNG-6697)
  */
-@Named
-@Singleton
+@Deprecated
 public class StringSearchModelInterpolator
     extends AbstractStringBasedModelInterpolator
 {
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
index 0ae5bce..02c7c88 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
@@ -80,6 +80,8 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 /**
  * StringVisitorModelInterpolator
+ *
+ * @since 3.6.2
  */
 @Named
 @Singleton

Reply | Threaded
Open this post in threaded view
|

[maven] 02/02: [MNG-6789] upgrade and configure plugins for Reproducible Builds

hboutemy
In reply to this post by hboutemy
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git

commit bd10f00b68eb766cd239275e8504acedc2818d69
Author: Hervé Boutemy <[hidden email]>
AuthorDate: Sat Sep 21 19:17:22 2019 +0200

    [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
---
 .../org/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 d15784a..20f386b 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 c7ac485..46f4926 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>