You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/01/04 16:28:59 UTC
svn commit: r731270 - in /maven/components/tags/3.0-alpha-1: ./
maven-compat/ maven-compat/src/main/java/org/apache/maven/settings/
maven-core/ maven-core/src/main/java/org/apache/maven/plugin/
maven-core/src/main/mdo/ maven-distribution/ maven-embedde...
Author: jvanzyl
Date: Sun Jan 4 07:28:58 2009
New Revision: 731270
URL: http://svn.apache.org/viewvc?rev=731270&view=rev
Log:
[maven-release-plugin] copy for tag 3.0-alpha-1
Added:
maven/components/tags/3.0-alpha-1/ (props changed)
- copied from r731174, maven/components/trunk/
maven/components/tags/3.0-alpha-1/maven-compat/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-compat/pom.xml
maven/components/tags/3.0-alpha-1/maven-core/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-core/pom.xml
maven/components/tags/3.0-alpha-1/maven-distribution/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-distribution/pom.xml
maven/components/tags/3.0-alpha-1/maven-embedder/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-embedder/pom.xml
maven/components/tags/3.0-alpha-1/maven-lifecycle/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-lifecycle/pom.xml
maven/components/tags/3.0-alpha-1/maven-mercury/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-mercury/pom.xml
maven/components/tags/3.0-alpha-1/maven-model/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-model/pom.xml
maven/components/tags/3.0-alpha-1/maven-plugin-api/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-plugin-api/pom.xml
maven/components/tags/3.0-alpha-1/maven-project-builder/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-project-builder/pom.xml
maven/components/tags/3.0-alpha-1/maven-project/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-project/pom.xml
maven/components/tags/3.0-alpha-1/maven-reporting-api/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-reporting-api/pom.xml
maven/components/tags/3.0-alpha-1/maven-toolchain/pom.xml
- copied unchanged from r731269, maven/components/trunk/maven-toolchain/pom.xml
maven/components/tags/3.0-alpha-1/pom.xml
- copied unchanged from r731269, maven/components/trunk/pom.xml
Modified:
maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
maven/components/tags/3.0-alpha-1/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/tags/3.0-alpha-1/maven-core/src/main/mdo/settings.mdo
Propchange: maven/components/tags/3.0-alpha-1/
------------------------------------------------------------------------------
bugtraq:append = true
Propchange: maven/components/tags/3.0-alpha-1/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/tags/3.0-alpha-1/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/tags/3.0-alpha-1/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/tags/3.0-alpha-1/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/tags/3.0-alpha-1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jan 4 07:28:58 2009
@@ -0,0 +1,19 @@
+release.properties
+deleteme.version.properties
+bootstrap
+maven.log
+target
+.classpath
+.project
+bootstrap.repo
+maven-component.i*
+.settings
+mboot.jar
+dummy
+build.ajproperties
+.generated.lst
+*.iml
+*.iws
+*.ipr
+log.txt
+setup_env.sh
Propchange: maven/components/tags/3.0-alpha-1/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jan 4 07:28:58 2009
@@ -0,0 +1,3 @@
+/maven/components/branches/maven-2.0.10-RC:680477
+/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/trunk:688587-696625,696644-699681
Propchange: maven/components/tags/3.0-alpha-1/
------------------------------------------------------------------------------
svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200
Modified: maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
URL: http://svn.apache.org/viewvc/maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java?rev=731270&r1=731174&r2=731270&view=diff
==============================================================================
--- maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java (original)
+++ maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java Sun Jan 4 07:28:58 2009
@@ -29,8 +29,19 @@
*/
public class RuntimeInfo
{
+ public static final String userHome = System.getProperty( "user.home" );
+
+ public static final File userMavenConfigurationHome = new File( userHome, ".m2" );
+
+ public static final File DEFAULT_USER_SETTINGS_FILE = new File( userMavenConfigurationHome, "settings.xml" );
+
private File settings;
-
+
+ public RuntimeInfo()
+ {
+ this.settings = DEFAULT_USER_SETTINGS_FILE;
+ }
+
public RuntimeInfo( File settings )
{
this.settings = settings;
Modified: maven/components/tags/3.0-alpha-1/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/maven/components/tags/3.0-alpha-1/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=731270&r1=731174&r2=731270&view=diff
==============================================================================
--- maven/components/tags/3.0-alpha-1/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original)
+++ maven/components/tags/3.0-alpha-1/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Sun Jan 4 07:28:58 2009
@@ -336,6 +336,7 @@
else if ( "settings".equals( expression ) )
{
value = context.getSettings();
+ System.out.println( value );
}
else if ( expression.startsWith( "settings" ) )
{
Modified: maven/components/tags/3.0-alpha-1/maven-core/src/main/mdo/settings.mdo
URL: http://svn.apache.org/viewvc/maven/components/tags/3.0-alpha-1/maven-core/src/main/mdo/settings.mdo?rev=731270&r1=731174&r2=731270&view=diff
==============================================================================
--- maven/components/tags/3.0-alpha-1/maven-core/src/main/mdo/settings.mdo (original)
+++ maven/components/tags/3.0-alpha-1/maven-core/src/main/mdo/settings.mdo Sun Jan 4 07:28:58 2009
@@ -393,6 +393,23 @@
return profileMap;
}
+
+ private RuntimeInfo runtimeInfo;
+
+ public void setRuntimeInfo( RuntimeInfo runtimeInfo )
+ {
+ this.runtimeInfo = runtimeInfo;
+ }
+
+ public RuntimeInfo getRuntimeInfo()
+ {
+ if ( runtimeInfo == null )
+ {
+ runtimeInfo = new RuntimeInfo();
+ }
+ return runtimeInfo;
+ }
+
]]>
</code>
</codeSegment>