Author: olamy
Date: Thu Aug 27 23:22:58 2009
New Revision: 808677
URL: http://svn.apache.org/viewvc?rev=808677&view=rev
Log:
prefer session.getExecutionProperties() than System.getProperties() (as it can
cause issue in a multithreaded env)
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=808677&r1=808676&r2=808677&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Thu Aug 27 23:22:58 2009
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -151,6 +152,14 @@
private boolean remoteTagging;
/**
+ * @parameter expression="${session}"
+ * @readonly
+ * @required
+ * @since 2.0-beta-10
+ */
+ protected MavenSession session;
+
+ /**
* {...@inheritdoc}
*/
public void execute()
@@ -172,9 +181,9 @@
config.setDefaultDevelopmentVersion( developmentVersion );
config.setRemoteTagging( remoteTagging );
- // Create a config containing values from the system properties
(command line properties).
+ // Create a config containing values from the session properties (ie
command line properties with cli).
ReleaseDescriptor sysPropertiesConfig
- = ReleaseUtils.copyPropertiesToReleaseDescriptor(
System.getProperties() );
+ = ReleaseUtils.copyPropertiesToReleaseDescriptor(
session.getExecutionProperties() );
mergeCommandLineConfig( config, sysPropertiesConfig );
try
