parent 657d493

author Thorsten Heit <theit@gmx.de> 1530186251 +0200 committer Thorsten Heit <theit@gmx.de> 1576873523 +0100 parent 657d493 author Thorsten Heit <theit@gmx.de> 1530186251 +0200 committer Thorsten Heit <theit@gmx.de> 1576873428 +0100 parent 657d493 author Thorsten Heit <theit@gmx.de> 1530186251 +0200 committer Thorsten Heit <theit@gmx.de> 1576873366 +0100 parent 657d493 author Thorsten Heit <theit@gmx.de> 1530186251 +0200 committer Thorsten Heit <theit@gmx.de> 1576873234 +0100 parent 657d493 author Thorsten Heit <theit@gmx.de> 1530186251 +0200 committer Thorsten Heit <theit@gmx.de> 1576873185 +0100 Fixes for MRELEASE-1009: - clean up ambigous reference in JUnit test - upgrade Surefire to 2.22.0 to avoid a NullPointerException under Java 10 when executing "mvn package" Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare [MRELEASE-956] Release Strategy Interface [MRELEASE-998] Add ability to create custom phases Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare [MRELEASE-998] Add ability to create custom phases Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare [MRELEASE-998] Add ability to create custom phases Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare [MRELEASE-998] Add ability to create custom phases Fixed improper merge with upstream [MRELEASE-998] Add ability to create custom phases Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare [MRELEASE-998] Add ability to create custom phases Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare [MRELEASE-998] Add ability to create custom phases Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare Fix for MRELEASE-835: Automatically resolve snapshot dependencies in release:prepare [MRELEASE-998] Add ability to create custom phases Fixed improper merge with upstream Fixed improper merge with upstream Fixed Checkstyle error Javadoc comment improved [MRELEASE-1010] - Update parent to 32 o Fixed checkstyle reported errors based on upgrade. o Switch to asfMavenTlpPlgnBuild o Support https.protocols for JDK 7 o Removed hard coded version for maven-invoker-plugin now using 3.0.1 instead of inherited 3.1.0 o Changed scm version to release 1.10.0 instead of old snapshot version. [INFRA-16467] move components documentation out of CMS space [MPOM-205] use sha512 checksums instead of sha1 removed version already inherited from parent Updated to correct URL. [MRELEASE-1024] Upgrade to SCM 1.11.2 MRELEASE-985 Override snapshot dependencies from command line - Copy properties to the correct release descriptor in DefaultReleaseManager. - Do not fail the build if the property is resolved from the comand-line (in CheckDependencySnapshotsPhase). See https://issues.apache.org/jira/browse/MRELEASE-985 [MRELEASE-1023] Minor code cleanups This closes apache#22 Expose dependency.dev and dependency.rel properties As part of this: apache#18 and this: https://issues.apache.org/jira/browse/MRELEASE-985 we need to check if the command line property starts with dependency.dev or dependency.rel to be able to override the value of the property. [MRELEASE-985] Add integration test improve documentation site Verify that schemaLocation keeps its original value Codehaus Jira moved to ASF Jira switch to https [MRELEASE-1031] log info on release goals/phases progress improve landing page [MRELEASE-1032] add https://m.a.o/xsd/maven-4.0.0.xsd [MRELEASE-229] implementation of RemoveScmTagPhase, with unit test this closes apache#29 remove extraneous commas @hboutemy changed error to warn if tag is not present at rollback; fixed typos Remove unused import MRELEASE-980 Allow commit comments to be controlled [maven-release-plugin] prepare release maven-release-3.0.0-M1 [maven-release-plugin] prepare for next development iteration MRELEASE-1035 upgraded maven-plugin-tools and plexus-component-metadata to reproducible versions Merge with master
theit · Dec 20, 2019 · 42611be · 42611be
1 parent 657d493
commit 42611be
Show file tree

Hide file tree

Showing 103 changed files with 2,891 additions and 405 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-asfMavenTlpStdBuild()
+asfMavenTlpPlgnBuild()
diff --git a/...n-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java b/...n-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -110,7 +110,7 @@ public interface ReleaseDescriptor
 
     /**
      * Get nOTE : currently only implemented with svn scm. Enable a workaround to prevent issue due to svn client >
-     * 1.5.0 (http://jira.codehaus.org/browse/SCM-406).
+     * 1.5.0 (https://issues.apache.org/jira/browse/SCM-406).
      * 
      * @return boolean
      */
@@ -133,6 +133,18 @@ public interface ReleaseDescriptor
      */
     boolean isPushChanges();
 
+    /**
+     * Get default version to use for new working copy.
+     * 
+     * Some SCMs may require a Work Item or a Task to allow the
+     * changes to be pushed or delivered.
+     * This field allows you to specify that Work Item
+     * or Task. It is optional, and only relevant if pushChanges is true.
+     *  
+     * @return String
+     */
+    String getWorkItem();
+
     /**
      * Get default version to use for new working copy.
      * 
@@ -207,6 +219,12 @@ public interface ReleaseDescriptor
      */
     boolean isScmUseEditMode();
 
+    /**
+     * 
+     * @return list of profiles to activate
+     */
+    List<String> getActivateProfiles();
+
     /**
      * Get the last completed phase.
      * 
@@ -256,6 +274,38 @@ public interface ReleaseDescriptor
      */
     String getScmCommentPrefix();
 
+    /**
+     * Get the SCM commit comment when setting pom.xml to release.
+     * 
+     * @return String
+     * @since 3.0.0-M1
+     */
+    String getScmReleaseCommitComment();
+
+    /**
+     * Get the SCM commit comment when setting pom.xml back to development.
+     * 
+     * @return String
+     * @since 3.0.0-M1
+     */
+    String getScmDevelopmentCommitComment();
+
+    /**
+     * Get the SCM commit comment when branching.
+     * 
+     * @return String
+     * @since 3.0.0-M1
+     */
+    String getScmBranchCommitComment();
+
+    /**
+     * Get the SCM commit comment when rolling back.
+     * 
+     * @return String
+     * @since 3.0.0-M1
+     */
+    String getScmRollbackCommitComment();
+
     /**
      * Get pass phrase for the private key.
      * 
@@ -415,5 +465,20 @@ public interface ReleaseDescriptor
 
     void setScmSourceUrl( String scmUrl );
 
-
+    /**
+     * Returns whether unresolved SNAPSHOT dependencies should automatically be resolved.
+     * If this is set, then this specifies the default answer to be used when unresolved SNAPSHOT
+     * dependencies should automatically be resolved ( 0:All 1:Project Dependencies 2:Plugins
+     * 3:Reports 4:Extensions ). Possible values are:
+     * <ul>
+     * <li>"all" or "0": resolve all kinds of snapshots, ie. project, plugin, report and extension dependencies </li>
+     * <li>"dependencies" or "1": resolve project dependencies</li>
+     * <li>"plugins" or "2": resolve plugin dependencis</li>
+     * <li>"reports" or "3": resolve report dependencies</li>
+     * <li>"extensions" or "4": resolve extension dependencies</li>
+     * </ul>
+     * 
+     * @return String
+     */
+    String getAutoResolveSnapshots();
 }
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/AetherVersion.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/AetherVersion.java
@@ -27,7 +27,7 @@ class AetherVersion
 {
     private final org.eclipse.aether.version.Version version;
 
-    public AetherVersion( String version )
+    AetherVersion( String version )
         throws VersionParseException
     {
         try

diff --git a/...ease-api/src/main/java/org/apache/maven/shared/release/versions/MavenArtifactVersion.java b/...ease-api/src/main/java/org/apache/maven/shared/release/versions/MavenArtifactVersion.java
@@ -27,7 +27,7 @@ class MavenArtifactVersion
 {
     private final ArtifactVersion version;
 
-    public MavenArtifactVersion( String version )
+    MavenArtifactVersion( String version )
     {
         this.version = new DefaultArtifactVersion( version );
     }

diff --git a/maven-release-api/src/site/site.xml b/maven-release-api/src/site/site.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+  <body>
+    <menu name="Overview">
+      <item name="Introduction" href="index.html"/>
+      <item name="JavaDocs" href="apidocs/index.html"/>
+      <item name="Source Xref" href="xref/index.html"/>
+      <!--item name="FAQ" href="faq.html"/-->
+    </menu>
+
+    <menu ref="parent" inherit="top" />
+  </body>
+</project>
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
@@ -200,7 +200,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.9.1</version>
         <executions>
           <execution>
             <goals>

diff --git a/maven-release-manager/src/main/components-fragment.xml b/maven-release-manager/src/main/components-fragment.xml
@@ -20,6 +20,7 @@
 
 <component-set>
   <components>
+<!-- START SNIPPET: default-strategy -->
     <component>
       <role>org.apache.maven.shared.release.strategy.Strategy</role>
       <role-hint>default</role-hint>
@@ -76,6 +77,7 @@
         </updateVersionsPhases>
       </configuration>
     </component>
+<!-- END SNIPPET: default-strategy -->
     <component>
       <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
       <role-hint>map-release-versions</role-hint>
@@ -141,7 +143,7 @@
         </requirement>
       </requirements>
       <configuration>
-        <messageFormat>prepare release {0}</messageFormat>
+        <descriptorCommentGetter>getScmReleaseCommitComment</descriptorCommentGetter>
       </configuration>
     </component>
     <component>
@@ -154,7 +156,7 @@
         </requirement>
       </requirements>
       <configuration>
-        <messageFormat>prepare for next development iteration</messageFormat>
+        <descriptorCommentGetter>getScmDevelopmentCommitComment</descriptorCommentGetter>
         <rollbackMessageFormat>rollback changes from release preparation of {0}</rollbackMessageFormat>
       </configuration>
     </component>
@@ -168,7 +170,7 @@
         </requirement>
       </requirements>
       <configuration>
-        <messageFormat>prepare branch {0}</messageFormat>
+        <descriptorCommentGetter>getScmBranchCommitComment</descriptorCommentGetter>
       </configuration>
     </component>
     <component>
@@ -181,7 +183,7 @@
         </requirement>
       </requirements>
       <configuration>
-        <messageFormat>rollback the release of {0}</messageFormat>
+        <descriptorCommentGetter>getScmRollbackCommitComment</descriptorCommentGetter>
       </configuration>
     </component>
     <component>

diff --git a/...-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java b/...-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -108,22 +108,36 @@ private void prepare( ReleasePrepareRequest prepareRequest, ReleaseResult result
 
         // Create a config containing values from the session properties (ie command line properties with cli).
         ReleaseUtils.copyPropertiesToReleaseDescriptor( prepareRequest.getUserProperties(),
-                                        new ReleaseDescriptorBuilder()
-                                        {
-                                            public ReleaseDescriptorBuilder addDevelopmentVersion( String key,
-                                                                                                   String value )
-                                            {
-                                                builder.addDevelopmentVersion( key, value );
-                                                return this;
-                                            }
-
-                                            public ReleaseDescriptorBuilder addReleaseVersion( String key,
-                                                                                               String value )
-                                            {
-                                                builder.addReleaseVersion( key, value );
-                                                return this;
-                                            };
-                                        } );
+                new ReleaseDescriptorBuilder()
+                {
+                    public ReleaseDescriptorBuilder addDevelopmentVersion( String key,
+                                                                           String value )
+                    {
+                        builder.addDevelopmentVersion( key, value );
+                        return this;
+                    }
+
+                    public ReleaseDescriptorBuilder addReleaseVersion( String key,
+                                                                       String value )
+                    {
+                        builder.addReleaseVersion( key, value );
+                        return this;
+                    }
+
+                    public ReleaseDescriptorBuilder addDependencyReleaseVersion( String dependencyKey,
+                                                                                String version )
+                    {
+                        builder.addDependencyReleaseVersion( dependencyKey, version );
+                        return this;
+                    }
+
+                    public ReleaseDescriptorBuilder addDependencyDevelopmentVersion( String dependencyKey,
+                                                                                    String version )
+                    {
+                        builder.addDependencyDevelopmentVersion( dependencyKey, version );
+                        return this;
+                    }
+                } );
 
         BuilderReleaseDescriptor config;
         if ( BooleanUtils.isNotFalse( prepareRequest.getResume() ) )
@@ -132,7 +146,7 @@ public ReleaseDescriptorBuilder addReleaseVersion( String key,
         }
         else
         {
-            config = ReleaseUtils.buildReleaseDescriptor( prepareRequest.getReleaseDescriptorBuilder() );
+            config = ReleaseUtils.buildReleaseDescriptor( builder );
         }
 
         Strategy releaseStrategy = getStrategy( config.getReleaseStrategyId() );
@@ -667,4 +681,4 @@ private void captureException( ReleaseResult result, ReleaseManagerListener list
 
         result.setResultCode( ReleaseResult.ERROR );
     }
-}
+}