[maven] branch reproducible updated (5c5d30f -> 16961b3)

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

[maven] branch reproducible updated (5c5d30f -> 16961b3)

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

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


 discard 5c5d30f  temporary hack: disable sisu-maven-plugin
 discard 1979d19  use packaging plugins' RB versions + plexus-metadata 2.1.0
     new 5759bc1  [MNG-6789] use packaging plugins' RB versions + plexus-metadata 2.1.0
     new 24d15c0  [MNG-6789] sisu.inject 3.3.4 produces Reproducible output
     new 16961b3  [MNG-6799] deprecate StringSearchModelInterpolator and remove @Named

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5c5d30f)
            \
             N -- N -- N   refs/heads/reproducible (16961b3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 3 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:
 maven-core/pom.xml                                 |  4 +---
 .../resources/META-INF/sisu/javax.inject.Named     | 13 -----------
 maven-embedder/pom.xml                             |  4 +---
 .../resources/META-INF/sisu/javax.inject.Named     |  2 --
 maven-model-builder/pom.xml                        |  4 +---
 .../StringSearchModelInterpolator.java             |  7 ++----
 .../StringVisitorModelInterpolator.java            |  2 ++
 .../resources/META-INF/sisu/javax.inject.Named     | 27 ----------------------
 maven-resolver-provider/pom.xml                    |  4 +---
 .../resources/META-INF/sisu/javax.inject.Named     |  5 ----
 maven-settings-builder/pom.xml                     |  4 +---
 .../resources/META-INF/sisu/javax.inject.Named     |  5 ----
 pom.xml                                            |  3 +--
 13 files changed, 10 insertions(+), 74 deletions(-)
 delete mode 100644 maven-core/src/main/resources/META-INF/sisu/javax.inject.Named
 delete mode 100644 maven-embedder/src/main/resources/META-INF/sisu/javax.inject.Named
 delete mode 100644 maven-model-builder/src/main/resources/META-INF/sisu/javax.inject.Named
 delete mode 100644 maven-resolver-provider/src/main/resources/META-INF/sisu/javax.inject.Named
 delete mode 100644 maven-settings-builder/src/main/resources/META-INF/sisu/javax.inject.Named

Reply | Threaded
Open this post in threaded view
|

[maven] 01/03: [MNG-6789] use packaging plugins' RB versions + plexus-metadata 2.1.0

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

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

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

    [MNG-6789] use packaging plugins' RB versions + plexus-metadata 2.1.0
---
 .../org/apache/maven/messages/build.properties     |  1 -
 pom.xml                                            | 25 ++++++++++++++++------
 2 files changed, 18 insertions(+), 8 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 49f6566..b3cd742 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@ 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>
@@ -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-09-21T16:17:18Z</project.build.outputTimestamp>
     <buildId>${os.name}-jdk${java.version}</buildId>
   </properties>
 
@@ -455,6 +456,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>
@@ -568,12 +585,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>

Reply | Threaded
Open this post in threaded view
|

[maven] 02/03: [MNG-6789] sisu.inject 3.3.4 produces Reproducible output

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 reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 24d15c0207f14c26a8f8ee4142ffc95f9e7d0c2d
Author: Hervé Boutemy <[hidden email]>
AuthorDate: Wed Nov 6 11:15:31 2019 +0100

    [MNG-6789] sisu.inject 3.3.4 produces Reproducible output
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b3cd742..b514433 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@ under the License.
     <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>

Reply | Threaded
Open this post in threaded view
|

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

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 reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 16961b32b7dccbc9447ed4e18b4e0949d5fe3b56
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