svn commit: r744991 - /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java

[bentmann]

Author: bentmann
Date: Tue Feb 17 12:17:02 2009
New Revision: 744991

URL: http://svn.apache.org/viewvc?rev=744991view=rev
Log:
[MNG-3509] Make mvn -v output locale/encoding

o Restored after accidental removal in r64

Modified:

maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java

Modified: 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=744991r1=744990r2=744991view=diff
==
--- 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
 Tue Feb 17 12:17:02 2009
@@ -58,7 +58,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Locale;
@@ -586,6 +585,9 @@
 
 System.out.println( Java version:  + System.getProperty( 
java.version, unknown java version ) );
 
+System.out.println( Default locale:  + Locale.getDefault() + , 
platform encoding: 
++ System.getProperty( file.encoding, unknown 
encoding ) );
+
 System.out.println( OS name: \ + Os.OS_NAME + \ version: \ + 
Os.OS_VERSION +
 \ arch: \ + Os.OS_ARCH + \ Family: \ + 
Os.OS_FAMILY + \ );
 }

svn commit: r744996 - in /maven/components/branches/maven-2.0.x: ./ maven-core/src/main/java/org/apache/maven/cli/MavenCli.java

[bentmann]

Author: bentmann
Date: Tue Feb 17 12:23:30 2009
New Revision: 744996

URL: http://svn.apache.org/viewvc?rev=744996view=rev
Log:
[MNG-4037] Include Java home in version information

o Merged from r744645

Modified:
maven/components/branches/maven-2.0.x/   (props changed)

maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java

Propchange: maven/components/branches/maven-2.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 12:23:30 2009
@@ -1,3 +1,3 @@
 /maven/components/branches/maven-2.0.10-RC:708790-728809,728834
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753,739385,741507,741518,741870,742819
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753,739385,741507,741518,741870,742819,744645
 /maven/components/trunk:720001,721902,726845,729292

Modified: 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=744996r1=744995r2=744996view=diff
==
--- 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
 Tue Feb 17 12:23:30 2009
@@ -585,6 +585,8 @@
 
 System.out.println( Java version:  + System.getProperty( 
java.version, unknown java version ) );
 
+System.out.println( Java home:  + System.getProperty( java.home, 
unknown java home ) );
+
 System.out.println( Default locale:  + Locale.getDefault() + , 
platform encoding: 
 + System.getProperty( file.encoding, unknown 
encoding ) );
 

svn commit: r745040 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

[sisbell]

Author: sisbell
Date: Tue Feb 17 13:13:49 2009
New Revision: 745040

URL: http://svn.apache.org/viewvc?rev=745040view=rev
Log:
[MNG-4035] - Removing plugin manager changes. This is breaking tycho build and 
also causes a hefty performance hit. Using mixins is over-generalizing this 
solution. Only need to cleanup config merging.

Modified:

maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=745040r1=745039r2=745040view=diff
==
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Tue Feb 17 13:13:49 2009
@@ -557,13 +557,52 @@
 downloadDependencies( project, session, artifactResolver );
 }
 
-//
+String goalName = mojoDescriptor.getFullGoalName();
+
+Mojo mojo = null;
+
+PluginDescriptor pluginDescriptor = 
mojoDescriptor.getPluginDescriptor();
+
+Xpp3Dom dom = mojoExecution.getConfiguration();
+
+if ( dom != null )
+{
+try
+{
+ListInterpolatorProperty interpolatorProperties = new 
ArrayListInterpolatorProperty();
+interpolatorProperties.addAll( 
InterpolatorProperty.toInterpolatorProperties(
+
session.getProjectBuilderConfiguration().getExecutionProperties(),
+PomInterpolatorTag.EXECUTION_PROPERTIES.name()));
+interpolatorProperties.addAll( 
InterpolatorProperty.toInterpolatorProperties( 
session.getProjectBuilderConfiguration().getUserProperties(),
+PomInterpolatorTag.USER_PROPERTIES.name()));
+String interpolatedDom  =
+Interpolator.interpolateXmlString( String.valueOf( dom 
), interpolatorProperties );
+dom = Xpp3DomBuilder.build( new StringReader( interpolatedDom 
) );
+}
+catch ( XmlPullParserException e )
+{
+throw new PluginManagerException(
+  mojoDescriptor,
+  project,
+  Failed to calculate 
concrete state for configuration of: 
+  + 
mojoDescriptor.getHumanReadableKey(),
+  e );
+}
+catch ( IOException e )
+{
+throw new PluginManagerException(
+  mojoDescriptor,
+  project,
+  Failed to calculate 
concrete state for configuration of: 
+  + 
mojoDescriptor.getHumanReadableKey(),
+  e );
+}
+}
 
 // Event monitoring.
 String event = MavenEvents.MOJO_EXECUTION;
 EventDispatcher dispatcher = session.getEventDispatcher();
 
-String goalName = mojoDescriptor.getFullGoalName();
 String goalExecId = goalName;
 if ( mojoExecution.getExecutionId() != null )
 {
@@ -576,12 +615,9 @@
 ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
 
 List realmActions = new ArrayList();
-
-Mojo mojo = null;
-PluginDescriptor pluginDescriptor = 
mojoDescriptor.getPluginDescriptor();
 try
 {
-mojo = getConfiguredMojo( session, project, false, mojoExecution, 
realmActions );
+mojo = getConfiguredMojo( session, dom, project, false, 
mojoExecution, realmActions );
 
 dispatcher.dispatchStart( event, goalExecId );
 
@@ -712,7 +748,7 @@
   MavenSession session )
 throws ArtifactNotFoundException, PluginConfigurationException, 
PluginManagerException,
 ArtifactResolutionException
-{   /*
+{
 MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
 PluginDescriptor descriptor = mojoDescriptor.getPluginDescriptor();
 Xpp3Dom dom = project.getReportConfiguration( descriptor.getGroupId(),
@@ -722,8 +758,8 @@
 {
 dom = Xpp3Dom.mergeXpp3Dom( dom, mojoExecution.getConfiguration() 
);
 }
-*/
-return (MavenReport) getConfiguredMojo( session, project, true, 
mojoExecution, new ArrayList() );
+
+return 

svn commit: r745110 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/ maven-project/src/main/java/org/apache/maven/project/builder/ maven-project/src/

[sisbell]

Author: sisbell
Date: Tue Feb 17 14:56:24 2009
New Revision: 745110

URL: http://svn.apache.org/viewvc?rev=745110view=rev
Log:
[MNG-4034] - dependency version is not inherited from parent 
dependencyManagement

Modified:

maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java

maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java

Modified: 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=745110r1=745109r2=745110view=diff
==
--- 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
 (original)
+++ 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
 Tue Feb 17 14:56:24 2009
@@ -530,24 +530,27 @@
 List clearedProperties = new ArrayListModelProperty();
 
 //Default Dependency Scope Rule
-ModelDataSource s = new DefaultModelDataSource( tmp, 
Arrays.asList( new ArtifactModelContainerFactory()) );
-for(ModelContainer mc : 
s.queryFor(ProjectUri.Dependencies.Dependency.xUri))
+if(domainModelIndex == 0)
 {
-   boolean containsScope = false;
-   for(ModelProperty mp :mc.getProperties()) 
-   {
-   
if(mp.getUri().equals(ProjectUri.Dependencies.Dependency.scope)) {
-   containsScope = true;
-   break;
-   }
-   }
-
-   if(!containsScope)
-   {
-   tmp.add(tmp.indexOf(mc.getProperties().get(0)) + 1, new 
ModelProperty(ProjectUri.Dependencies.Dependency.scope, compile));
-   }
-}
+ModelDataSource s = new DefaultModelDataSource( tmp, 
Arrays.asList( new ArtifactModelContainerFactory()) );
+for(ModelContainer mc : 
s.queryFor(ProjectUri.Dependencies.Dependency.xUri))
+{
+boolean containsScope = false;
+for(ModelProperty mp :mc.getProperties())
+{
+
if(mp.getUri().equals(ProjectUri.Dependencies.Dependency.scope)) {
+containsScope = true;
+break;
+}
+}
 
+if(!containsScope)
+{
+tmp.add(tmp.indexOf(mc.getProperties().get(0)) + 1, 
new ModelProperty(ProjectUri.Dependencies.Dependency.scope, compile));
+}
+}
+}
+   
 //Remove Default Executions IDS (mng-3965)
 ListModelProperty replace = new ArrayListModelProperty();
 for(ModelProperty mp : tmp)

Modified: 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java?rev=745110r1=745109r2=745110view=diff
==
--- 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
 (original)
+++ 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
 Tue Feb 17 14:56:24 2009
@@ -1113,7 +1113,7 @@
 
 public static class Dependencies
 {
-public static String xUri = 
http://apache.org/maven/project/profiles#collection/profile/dependencies;;
+public static String xUri = 
http://apache.org/maven/project/profiles#collection/profile/dependencies#collection;;
 
 public static class Dependency
 {

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=745110r1=745109r2=745110view=diff
==
--- 

svn commit: r745193 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt

[dennisl]

Author: dennisl
Date: Tue Feb 17 19:01:13 2009
New Revision: 745193

URL: http://svn.apache.org/viewvc?rev=745193view=rev
Log:
[MWAR-182] warSourceIncludes no longer works

o Improve documentation, as suggested by Bryan Loofbourrow

Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt

Modified: 
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt?rev=745193r1=745192r2=745193view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt 
(original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt 
Tue Feb 17 19:01:13 2009
@@ -81,7 +81,7 @@
 version2.1-beta-1/version
 configuration
   !-- Use this to include a selection of jars that will be included 
in the WAR --
-  
packagingIncludesWEB-INF/lib/my-tag-library.jar,WEB-INF/web.xml/packagingIncludes
+  
packagingIncludesWEB-INF/lib/my-tag-library.jar,**/*.xml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,**/*.jsp/packagingIncludes
   archive
 manifest
   addClasspathtrue/addClasspath

svn commit: r745194 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt

[dennisl]

Author: dennisl
Date: Tue Feb 17 19:11:43 2009
New Revision: 745194

URL: http://svn.apache.org/viewvc?rev=745194view=rev
Log:
o Add a link to the user wiki that deals with 'the Skinny Wars problem'.

Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt

Modified: 
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt?rev=745194r1=745193r2=745194view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt 
(original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt 
Tue Feb 17 19:11:43 2009
@@ -155,3 +155,9 @@
  |-- war1-1.0.0.war
  `-- war2-1.0.0.war
 +-+
+
+
+* Alternatives
+
+ Our users have submitted alternatives to the above recipe on
+ 
{{{http://docs.codehaus.org/display/MAVENUSER/Solving+the+Skinny+Wars+problem}the
 Wiki}}.
\ No newline at end of file

svn commit: r745196 - in /maven/plugins/trunk: ./ maven-antrun-plugin/ maven-assembly-plugin/ maven-changelog-plugin/ maven-changes-plugin/ maven-checkstyle-plugin/ maven-clean-plugin/ maven-compiler-

[brianf]

Author: brianf
Date: Tue Feb 17 19:16:04 2009
New Revision: 745196

URL: http://svn.apache.org/viewvc?rev=745196view=rev
Log:
use the latest parents

Modified:
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-changelog-plugin/pom.xml
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-clean-plugin/pom.xml
maven/plugins/trunk/maven-compiler-plugin/pom.xml
maven/plugins/trunk/maven-deploy-plugin/pom.xml
maven/plugins/trunk/maven-doap-plugin/pom.xml
maven/plugins/trunk/maven-docck-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-ejb-plugin/pom.xml
maven/plugins/trunk/maven-gpg-plugin/pom.xml
maven/plugins/trunk/maven-help-plugin/pom.xml
maven/plugins/trunk/maven-idea-plugin/pom.xml
maven/plugins/trunk/maven-install-plugin/pom.xml
maven/plugins/trunk/maven-invoker-plugin/pom.xml
maven/plugins/trunk/maven-jar-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
maven/plugins/trunk/maven-one-plugin/pom.xml
maven/plugins/trunk/maven-patch-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/trunk/maven-rar-plugin/pom.xml
maven/plugins/trunk/maven-reactor-plugin/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
maven/plugins/trunk/maven-repository-plugin/pom.xml
maven/plugins/trunk/maven-resources-plugin/pom.xml
maven/plugins/trunk/maven-shade-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-source-plugin/pom.xml
maven/plugins/trunk/maven-stage-plugin/pom.xml
maven/plugins/trunk/maven-toolchains-plugin/pom.xml
maven/plugins/trunk/maven-verifier-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/pom.xml

Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=745196r1=745195r2=745196view=diff
==
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Tue Feb 17 19:16:04 2009
@@ -25,7 +25,7 @@
   parent
 artifactIdmaven-plugins/artifactId
 groupIdorg.apache.maven.plugins/groupId
-version12/version
+version13-SNAPSHOT/version
   /parent
 
   artifactIdmaven-antrun-plugin/artifactId

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=745196r1=745195r2=745196view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Feb 17 19:16:04 2009
@@ -25,7 +25,7 @@
   parent
 artifactIdmaven-plugins/artifactId
 groupIdorg.apache.maven.plugins/groupId
-version12/version
+version13-SNAPSHOT/version
   /parent
 
   artifactIdmaven-assembly-plugin/artifactId

Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?rev=745196r1=745195r2=745196view=diff
==
--- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Tue Feb 17 19:16:04 2009
@@ -25,7 +25,7 @@
   parent
 artifactIdmaven-plugins/artifactId
 groupIdorg.apache.maven.plugins/groupId
-version12/version
+version13-SNAPSHOT/version
   /parent
 
   artifactIdmaven-changelog-plugin/artifactId

Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=745196r1=745195r2=745196view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Feb 17 19:16:04 2009
@@ -25,7 +25,7 @@
   parent
 artifactIdmaven-plugins/artifactId
 groupIdorg.apache.maven.plugins/groupId
-version12/version
+version13-SNAPSHOT/version
   /parent
 
   artifactIdmaven-changes-plugin/artifactId

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=745196r1=745195r2=745196view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)

svn commit: r745216 - in /maven/components/branches/maven-2.1.x: ./ maven-model/src/main/mdo/ maven-plugin-descriptor/src/main/mdo/ maven-plugin-parameter-documenter/src/main/mdo/ maven-plugin-registr

[hboutemy]

Author: hboutemy
Date: Tue Feb 17 19:44:23 2009
New Revision: 745216

URL: http://svn.apache.org/viewvc?rev=745216view=rev
Log:
o upgraded Modello version to 1.0
o improved models to use Modello new features

Modified:
maven/components/branches/maven-2.1.x/build.xml
maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo

maven/components/branches/maven-2.1.x/maven-plugin-descriptor/src/main/mdo/lifecycle.mdo

maven/components/branches/maven-2.1.x/maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo

maven/components/branches/maven-2.1.x/maven-plugin-registry/plugin-registry.mdo

maven/components/branches/maven-2.1.x/maven-profile/src/main/mdo/profiles.mdo

maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo

maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/plugins.mdo

maven/components/branches/maven-2.1.x/maven-settings/src/main/mdo/settings.mdo

maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.xml
maven/components/branches/maven-2.1.x/pom.xml

Modified: maven/components/branches/maven-2.1.x/build.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/build.xml?rev=745216r1=745215r2=745216view=diff
==
--- maven/components/branches/maven-2.1.x/build.xml (original)
+++ maven/components/branches/maven-2.1.x/build.xml Tue Feb 17 19:44:23 2009
@@ -19,7 +19,7 @@
 
 !--
 
-By default the bootstrap will use ~/.m2/repository as the integration 
repository but you can define the integration repository by 
+By default the bootstrap will use ~/.m2/repository as the integration 
repository but you can define the integration repository by
 specifying a property on the command line:
 
 ant -Dmaven.repo.local=/my/integration/repository
@@ -34,14 +34,14 @@
 --
 
 project default=all basedir=. xmlns:artifact=urn:maven-artifact-ant
-  
+
   target name=initTaskDefs unless=taskdefs.inited
 xmlproperty file=pom.xml prefix=pom.xml /
 path id=maven-ant-tasks.classpath path=maven-ant-tasks-2.0.8.jar/
 typedef resource=org/apache/maven/artifact/ant/antlib.xml 
uri=urn:maven-artifact-ant classpathref=maven-ant-tasks.classpath/
 property name=taskdefs.inited value=true/
   /target
-  
+
   target name=initLocalRepo
 property name=maven.repo.local location=${user.home}/.m2/repository/
 echoUsing the local repository at: ${maven.repo.local}/echo
@@ -64,7 +64,7 @@
 /fail
 echoUsing Maven home at: ${maven.home}/echo
   /target
-  
+
   target name=read-poms depends=initTaskDefs,initLocalRepo 
unless=pom.version
 copy file=pom.xml tofile=dependencies.xml/
 replace file=${basedir}/dependencies.xml token=lt;!--start--gt; 
value=lt;!--/
@@ -73,7 +73,7 @@
   localRepository path=${maven.repo.local}/
 /artifact:pom
 delete file=${basedir}/dependencies.xml/
-
+
 artifact:pom file=${basedir}/maven-integration-tests/pom.xml id=itPom
   localRepository path=${maven.repo.local}/
 /artifact:pom
@@ -102,12 +102,12 @@
localRepository path=${maven.repo.local}/
pom refid=pom/
 /artifact:dependencies
-
+
 !-- Pull the dependencies for Modello --
 artifact:dependencies pathId=modello.pathid filesetId=modello.fileset 
verbose=${verbose}
localRepository path=${maven.repo.local}/
-   dependency groupId=org.codehaus.modello 
artifactId=modello-maven-plugin version=1.0-alpha-20/
-   dependency groupId=org.codehaus.modello artifactId=modello-core 
version=1.0-alpha-20/
+   dependency groupId=org.codehaus.modello 
artifactId=modello-maven-plugin version=1.0/
+   dependency groupId=org.codehaus.modello artifactId=modello-core 
version=1.0/
 /artifact:dependencies
   /target
 
@@ -122,11 +122,13 @@
   sequential
 java fork=fork classname=org.codehaus.modello.ModelloCli 
failonerror=true
   classpath refid=modello.pathid/
-  arg file=@{file}/
-  arg value=@{mode}/
-  arg file=bootstrap/target/generated-sources/
-  arg value=@{version}/
-  arg value=false/
+  arg file=@{file}/ !-- model file --
+  arg value=@{mode}/ !-- output type --
+  arg file=bootstrap/target/generated-sources/ !-- output 
directory --
+  arg value=@{version}/ !-- model version --
+  arg value=false/ !-- package with version --
+  arg value=false/ !-- use Java 5 --
+  arg value=UTF-8/ !-- encoding --
 /java
   /sequential
 /macrodef
@@ -196,7 +198,7 @@
 
   target name=maven-assembly depends=maven-compile description=generates 
the Maven installation assembly using the bootstrap Maven
 echo
-The new Maven distribution was created as part of the MAVEN-COMPILE step, 
above. 
+The new Maven distribution was created as part of the MAVEN-COMPILE step, 
above.
 This goal 

svn commit: r745218 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4040/ resources/mng-4040/sub/

[bentmann]

Author: bentmann
Date: Tue Feb 17 19:51:19 2009
New Revision: 745218

URL: http://svn.apache.org/viewvc?rev=745218view=rev
Log:
[MNG-4040] Tycho build fails with PluginDescriptor for the plugin was not found

o Added IT

Added:

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4040/

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4040/pom.xml
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4040/sub/

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4040/sub/pom.xml
   (with props)
Modified:

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=745218r1=745217r2=745218view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
 Tue Feb 17 19:51:19 2009
@@ -90,6 +90,7 @@
 // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng4040ProfileInjectedModulesTest.class );
 suite.addTestSuite( 
MavenITmng4036ParentResolutionFromSettingsRepoTest.class );
 suite.addTestSuite( MavenITmng4034ManagedProfileDependencyTest.class );
 suite.addTestSuite( MavenITmng4026ReactorDependenciesOrderTest.class );

Added: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java?rev=745218view=auto
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
 (added)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
 Tue Feb 17 19:51:19 2009
@@ -0,0 +1,57 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * This is a test set for a 
href=http://jira.codehaus.org/browse/MNG-4040;MNG-4040/a.
+ * 
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4040ProfileInjectedModulesTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng4040ProfileInjectedModulesTest()
+{
+super( ALL_MAVEN_VERSIONS );
+}
+
+/**
+ * Verify that modules inside profiles are not accidentally inherited by 
the children.
+ */
+public void testit()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
/mng-4040 );
+
+Verifier verifier = new Verifier( new File( testDir, sub 
).getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.deleteDirectory( target );
+verifier.executeGoal( validate );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+}
+
+}

Propchange: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
--
svn:eol-style = native

Propchange: 

svn commit: r745219 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/ maven-project/src/main/java/org/apache/maven/project/builder/ maven-project/src/

[sisbell]

Author: sisbell
Date: Tue Feb 17 19:54:35 2009
New Revision: 745219

URL: http://svn.apache.org/viewvc?rev=745219view=rev
Log:
[MNG-4040] - Profile module inheritance.

Added:

maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module-inheritance/

maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml

maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module-inheritance/sub/

maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml
Modified:

maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java

maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java

Modified: 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java?rev=745219r1=745218r2=745219view=diff
==
--- 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
 (original)
+++ 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
 Tue Feb 17 19:54:35 2009
@@ -1002,7 +1002,7 @@
 }
 }
 
-public static String modules = 
http://apache.org/maven/project/profiles#collection/profile/modules;;
+public static String modules = 
http://apache.org/maven/project/profiles#collection/profile/modules#collection;;
 
 public static class Repositories
 {

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=745219r1=745218r2=745219view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
 Tue Feb 17 19:54:35 2009
@@ -307,6 +307,7 @@
 
s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
 
s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.configuration);
 //TODO: More profile info
+s.add(ProjectUri.Profiles.Profile.modules);
 s.add(ProjectUri.Profiles.Profile.Dependencies.xUri);
 
s.add(ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri);
 
s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.configuration);

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=745219r1=745218r2=745219view=diff
==
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
 Tue Feb 17 19:54:35 2009
@@ -846,6 +846,15 @@
 }
 //*/
 
+
+/** MNG-4040 */
+public void testProfileModuleInheritance()
+throws Exception
+{
+PomTestWrapper pom = this.buildPomFromMavenProject( 
profile-module-inheritance/sub, dist );
+assertEquals(0, ( (List?) pom.getValue( modules ) ).size());
+
+}
 private void assertPathWithNormalizedFileSeparators( Object value )
 {
 assertEquals( new File( value.toString() ).getPath(), value.toString() 
);

Added: 
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml?rev=745219view=auto
==
--- 
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml
 (added)
+++ 
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml
 Tue Feb 17 19:54:35 2009
@@ -0,0 +1,18 @@
+project
+  modelVersion4.0.0/modelVersion
+  

svn commit: r745244 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java maven-project/src/main/java/org/apache/maven/project/builder/PomC

[sisbell]

Author: sisbell
Date: Tue Feb 17 20:30:03 2009
New Revision: 745244

URL: http://svn.apache.org/viewvc?rev=745244view=rev
Log:
Updated profiles with collection information.

Modified:

maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java

maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java

Modified: 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java?rev=745244r1=745243r2=745244view=diff
==
--- 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
 (original)
+++ 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
 Tue Feb 17 20:30:03 2009
@@ -1160,7 +1160,7 @@
 }
 
 public static String optional =
-
http://apache.org/maven/project/profiles#collection/profile/dependencies/dependency/optional;;
+
http://apache.org/maven/project/profiles#collection/profile/dependencies#collection/dependency/optional;;
 }
 }
 
@@ -1179,49 +1179,49 @@
 public static class Plugins
 {
 public static String xUri =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection;;
 
 public static class Plugin
 {
 public static String xUri =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin;;
 
 public static String groupId =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/groupId;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/groupId;;
 
 public static String artifactId =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/artifactId;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/artifactId;;
 
 public static String version =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/version;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/version;;
 
 public static String inherited =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/inherited;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/inherited;;
 
 public static String configuration =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/configuration#set;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/configuration#set;;
 
 public static class ReportSets
 {
 public static String xUri =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection;;
 
 public static class ReportSet
 {
 public static String xUri =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet;;
+
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet;;
 
 public static String id =
-
http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/id;;
+

svn commit: r745259 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java

[bentmann]

Author: bentmann
Date: Tue Feb 17 21:21:35 2009
New Revision: 745259

URL: http://svn.apache.org/viewvc?rev=745259view=rev
Log:
[MNG-3732] [regression] project.getActiveProfiles() has not the same behaviour

Modified:

maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java?rev=745259r1=745258r2=745259view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
 Tue Feb 17 21:21:35 2009
@@ -229,12 +229,15 @@
 
 if ( root != null )
 {
-List active = root.getActiveProfiles();
+ListString active = root.getActiveProfiles();
 
 if ( ( active != null )  !active.isEmpty() )
 {
 ProfileActivationContext ctx = 
profileManager.getProfileActivationContext();
-ctx.setExplicitlyActiveProfileIds( 
root.getActiveProfiles() );
+for ( String profileId : active )
+{
+ctx.setActive( profileId );
+}
 }
 
 for ( Iterator it = root.getProfiles().iterator(); 
it.hasNext(); )

svn commit: r745260 - in /maven/components/trunk: ./ maven-compat/src/main/mdo/ maven-core/src/main/mdo/ maven-lifecycle/src/main/mdo/ maven-model/src/main/mdo/ maven-plugin-api/src/main/mdo/ maven-pr

[hboutemy]

Author: hboutemy
Date: Tue Feb 17 21:46:38 2009
New Revision: 745260

URL: http://svn.apache.org/viewvc?rev=745260view=rev
Log:
o upgraded Modello version to 1.0
o improved models to use Modello new features (merged from 2.1.x branch r745216)

Modified:
maven/components/trunk/build.xml
maven/components/trunk/maven-compat/src/main/mdo/metadata.mdo
maven/components/trunk/maven-core/src/main/mdo/settings.mdo
maven/components/trunk/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
maven/components/trunk/maven-model/src/main/mdo/maven.mdo
maven/components/trunk/maven-plugin-api/src/main/mdo/lifecycle.mdo
maven/components/trunk/maven-project/src/main/mdo/profiles.mdo
maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml
maven/components/trunk/pom.xml

Modified: maven/components/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=745260r1=745259r2=745260view=diff
==
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Tue Feb 17 21:46:38 2009
@@ -19,18 +19,18 @@
 
 !-- START SNIPPET: ant-bootstrap
 
-By default the bootstrap will use ~/.m2/repository as the integration 
repository but you can define the integration 
+By default the bootstrap will use ~/.m2/repository as the integration 
repository but you can define the integration
 repository by specifying a property on the command line:
 
 ant -Dmaven.repo.local=/my/integration/repository
 
-Those familiar with Maven will note this is the same way the local repository 
can be set from the command-line. 
+Those familiar with Maven will note this is the same way the local repository 
can be set from the command-line.
 This facilitates having a set of builds converge on the same repository for 
integration purposes.
 
 END SNIPPET: ant-bootstrap --
 
 project default=all basedir=. xmlns:artifact=urn:maven-artifact-ant
-  
+
   property name=it.workdir.version value=3.0.x/
 
   target name=initTaskDefs
@@ -57,14 +57,14 @@
   /target
 
   target name=init depends=isMavenHomeSet
-xmlproperty prefix=pom file=pom.xml/
+xmlproperty prefix=pom file=pom.xml/
 dirname file=${maven.home} property=maven.home.dirname/
 !-- Initialize properties --
 property name=maven.home.basename.expected 
value=apache-maven-${pom.project.version}/
 property name=maven.home.effective 
location=${maven.home.dirname}/${maven.home.basename.expected}/
 property name=maven.assembly 
location=apache-maven/target/${maven.home.basename.expected}-bin.zip/
 property name=maven.repo.local value=${user.home}/.m2/repository/
-property name=surefire.useFile value=true/
+property name=surefire.useFile value=true/
 echomaven.home = ${maven.home.effective}/echo
   /target
 
@@ -72,45 +72,45 @@
 delete dir=bootstrap/
   /target
 
-  target name=pull depends=init unless=skip.pull
-property name=verbose value=false/
+  target name=pull depends=init unless=skip.pull
+property name=verbose value=false/
 !-- Pull the dependencies that Maven needs to build --
 copy file=pom.xml tofile=dependencies.xml/
 replace file=${basedir}/dependencies.xml token=lt;!--start--gt; 
value=lt;!--/
 replace file=${basedir}/dependencies.xml token=lt;!--end--gt; 
value=--gt;/
-artifact:pom file=${basedir}/dependencies.xml id=pom/

 
+artifact:pom file=${basedir}/dependencies.xml id=pom/
 artifact:dependencies pathId=pom.pathid filesetId=pom.fileset 
verbose=${verbose} useScope=compile
localRepository path=${maven.repo.local}/
-   pom refid=pom/  

 
-/artifact:dependencies  
+   pom refid=pom/
+/artifact:dependencies
 delete file=${basedir}/dependencies.xml/
-
+
 !-- Pull the dependencies for Modello --
 artifact:dependencies pathId=modello.pathid filesetId=modello.fileset 
verbose=${verbose}
localRepository path=${maven.repo.local}/
dependency groupId=org.codehaus.modello 
artifactId=modello-maven-plugin version=${pom.properties.modelloVersion}/
 /artifact:dependencies
-
+
 !-- Pull the dependencies for the MetadataGenerator CLI --
 artifact:dependencies pathId=pmdg.pathid filesetId=pmdg.fileset 
verbose=${verbose}
-   localRepository path=${maven.repo.local}/   
+   localRepository path=${maven.repo.local}/
dependency groupId=org.codehaus.plexus 
artifactId=plexus-component-metadata 
version=${pom.properties.plexusVersion}/
-/artifact:dependencies  
-
+/artifact:dependencies
+
   /target
 
   target name=process-classes depends=pull description=generates plexus 
component metadata.
 mkdir 

svn commit: r745304 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/site/apt/examples/war-manifest-guide.apt

[dennisl]

Author: dennisl
Date: Wed Feb 18 00:02:24 2009
New Revision: 745304

URL: http://svn.apache.org/viewvc?rev=745304view=rev
Log:
[MWAR-185] Upgrade to Maven Archiver 2.4

Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml

maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=745304r1=745303r2=745304view=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Feb 18 00:02:24 2009
@@ -34,16 +34,16 @@
 
   nameMaven WAR Plugin/name
   descriptionBuilds a Web Application Archive (WAR) file from the project 
output and its dependencies./description
-  
+
   prerequisites
 maven2.0.6/maven
   /prerequisites
-  
+
   scm
 
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//connection
 
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin//developerConnection
 
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin//url
-  /scm  
+  /scm
   issueManagement
 systemJIRA/system
 urlhttp://jira.codehaus.org/browse/MWAR/url
@@ -63,7 +63,7 @@
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-archiver/artifactId
-  version2.3/version
+  version2.4/version
 /dependency
 dependency
   groupIdorg.codehaus.plexus/groupId
@@ -94,7 +94,7 @@
   artifactIdplexus-component-api/artifactId
 /exclusion
   /exclusions
-/dependency
+/dependency
 
 dependency
   groupIdcom.thoughtworks.xstream/groupId
@@ -106,14 +106,14 @@
   groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-utils/artifactId
   version1.5.5/version
-/dependency
-
+/dependency
+
 dependency
   groupIdorg.apache.maven.shared/groupId
   artifactIdmaven-filtering/artifactId
-  version1.0-beta-2/version
+  version1.0-beta-2/version
 /dependency
-   
+
 dependency
   groupIdjunit/groupId
   artifactIdjunit/artifactId

Modified: 
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt?rev=745304r1=745303r2=745304view=diff
==
--- 
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
 Wed Feb 18 00:02:24 2009
@@ -31,6 +31,7 @@
  The manifest can be customized by configuring the war plugin's archiver. For 
full information on the different
  configuration options available check the documentation for
  {{{http://maven.apache.org/shared/maven-archiver/index.html}Maven Archiver}}.
+ This version of Maven WAR Plugin uses Maven Archiver 2.4.
 
 ++
 project

svn commit: r745311 - in /maven/components/trunk: build-mercury.xml mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar

[ogusakov]

Author: ogusakov
Date: Wed Feb 18 00:25:15 2009
New Revision: 745311

URL: http://svn.apache.org/viewvc?rev=745311view=rev
Log:
[MNG-3969] intermediate commit - need help to identify stax problem

Added:
maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar   (with 
props)
Modified:
maven/components/trunk/build-mercury.xml

Modified: maven/components/trunk/build-mercury.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/build-mercury.xml?rev=745311r1=745310r2=745311view=diff
==
--- maven/components/trunk/build-mercury.xml (original)
+++ maven/components/trunk/build-mercury.xml Wed Feb 18 00:25:15 2009
@@ -35,7 +35,7 @@
 
   target name=initTaskDefs
 xmlproperty file=pom.xml prefix=pom.xml /
-path id=mercury-ant-tasks.classpath 
path=mercury-ant-tasks-1.0.0-alpha-4-SNAPSHOT.jar/
+path id=mercury-ant-tasks.classpath 
path=mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar/
 typedef resource=org/apache/maven/mercury/ant/tasks/antlib.xml 
uri=urn:mercury-ant-tasks classpathref=mercury-ant-tasks.classpath/
   /target
 
@@ -78,24 +78,29 @@
 copy file=pom.xml tofile=dependencies.xml/
 replace file=${basedir}/dependencies.xml token=lt;!--start--gt; 
value=lt;!--/
 replace file=${basedir}/dependencies.xml token=lt;!--end--gt; 
value=--gt;/
+
+   delete file=${basedir}/dependencies.xml/
 
-mercury:resolve-dependencies source=maven:pom.xml id=pom
-  mercury:local-repository location=${maven.repo.local}/
-/mercury:resolve-dependencies
+mercury:local-repository location=${maven.repo.local}/
 
-delete file=${basedir}/dependencies.xml/
+mercury:resolve-dependencies
+  mercury:dependency id=org.apache.maven:maven:3.0-SNAPSHOT::pom 
source=maven:${basedir}/pom.xml/
+/mercury:resolve-dependencies
 
-!-- Pull the dependencies for Modello --
-mercury:resolve-dependencies id=modello
-  mercury:local-repository location=${maven.repo.local}/
+mercury:resolve-dependencies
+  mercury:dependency 
id=org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}/
+/mercury:resolve-dependencies
+   
+!-- Pull the dependencies for Modello 
   mercury:dependency groupId=org.codehaus.modello 
artifactId=modello-maven-plugin version=${pom.properties.modelloVersion}/
 /mercury:resolve-dependencies
+--
 
-!-- Pull the dependencies for the MetadataGenerator CLI --
+!-- Pull the dependencies for the MetadataGenerator CLI
 mercury:resolve-dependencies id=pmdg
-  mercury:local-repository path=${maven.repo.local}/   
   mercury:dependency groupId=org.codehaus.plexus 
artifactId=plexus-component-metadata 
version=${pom.properties.plexusVersion}/
-/mercury:resolve-dependencies  
+/mercury:resolve-dependencies
+--
   /target
 
   target name=process-classes depends=pull description=generates plexus 
component metadata.
@@ -104,9 +109,8 @@

 path id=maven.classpath
   pathelement location=bootstrap/target/classes/
-  path refid=sources/  
-  path refid=pom.pathid/
-  path refid=pmdg.pathid/
+  path refid=sources/ 
+  path refid=mercury.classpath/ 
 /path
 
 echoUsing plexus version ${pom.properties.plexusVersion}/echo 
@@ -136,8 +140,7 @@
   attribute name=mode/
   attribute name=version/
   sequential
-java fork=fork classname=org.codehaus.modello.ModelloCli 
failonerror=true
-  classpath refid=modello.pathid/
+java fork=fork classname=org.codehaus.modello.ModelloCli 
failonerror=true classpathref=mercury.classpath
   arg file=@{file}/
   arg value=@{mode}/
   arg file=bootstrap/target/generated-sources/

Added: maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar?rev=745311view=auto
==
Binary file - no diff available.

Propchange: maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
--
svn:mime-type = application/octet-stream

svn commit: r745312 - in /maven/mercury/trunk: mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-logging/src/main/java/org/apache/maven/mercury/logging/ mercury-logging/src/m

[ogusakov]

Author: ogusakov
Date: Wed Feb 18 00:26:59 2009
New Revision: 745312

URL: http://svn.apache.org/viewvc?rev=745312view=rev
Log:
[MNG-3969] intermediate commit - need help to identify stax problem

Modified:

maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java

maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java

maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java

maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java

maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReaderMap.java

maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java

Modified: 
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java?rev=745312r1=745311r2=745312view=diff
==
--- 
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
 (original)
+++ 
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
 Wed Feb 18 00:26:59 2009
@@ -41,6 +41,7 @@
 /** dependency processor type, if any */
 String _processor;
 
+
 public void setName( String name )
 {
 _amd = new ArtifactBasicMetadata( name );
@@ -78,6 +79,11 @@
 }
 }
 
+public void setSource( String pom )
+{
+setPom( pom );
+}
+
 public void setGroupId( String groupId )
 {
 if ( _amd == null )

Modified: 
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java?rev=745312r1=745311r2=745312view=diff
==
--- 
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
 (original)
+++ 
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
 Wed Feb 18 00:26:59 2009
@@ -33,7 +33,9 @@
   public static final String _loggerFactoryClassName = System.getProperty( 
SYSTEM_PROPERTY_MERCURY_LOG_FACTORY, 
MercuryConsoleLoggerFactory.class.getName() );
   
   public static final String SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD = 
maven.mercury.log.threshold;
-  public static final String _loggerThresholdName = System.getProperty( 
SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD, MercuryLoggingLevelEnum.error.name() );
+  public static final String _loggerThresholdName = System.getProperty( 
SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD
+, 
MercuryLoggingLevelEnum.DEFAULT_LEVEL.name()
+  );
   
   static MercuryLoggingLevelEnum _threshold = MercuryLoggingLevelEnum.valueOf( 
_loggerThresholdName );
 
@@ -51,7 +53,7 @@
   catch( Exception e )
   {
 _loggerFactory = new MercuryConsoleLoggerFactory();
-_loggerFactory.getLogger( MercuryLoggerManager.class ).error( cannot 
load logger for +_loggerFactoryClassName, e );
+_loggerFactory.getLogger( MercuryLoggerManager.class ).error( cannot 
create logger factory +_loggerFactoryClassName, e );
   }
 }
 

Modified: 
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java?rev=745312r1=745311r2=745312view=diff
==
--- 
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
 (original)
+++ 
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
 Wed Feb 18 00:26:59 2009
@@ -35,7 +35,7 @@
   , disabled(5)
   ;
 
-  public static final MercuryLoggingLevelEnum DEFAULT_LEVEL = error;
+  public static final MercuryLoggingLevelEnum DEFAULT_LEVEL = warn;
 
   private int id;
 

Modified: 
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
URL: 

svn commit: r745316 - /maven/pom/trunk/asf/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:39:26 2009
New Revision: 745316

URL: http://svn.apache.org/viewvc?rev=745316view=rev
Log:
remove the plugin snapshot repo

Modified:
maven/pom/trunk/asf/pom.xml

Modified: maven/pom/trunk/asf/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=745316r1=745315r2=745316view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Feb 18 00:39:26 2009
@@ -58,16 +58,7 @@
   /releases
 /repository
   /repositories
-  pluginRepositories
-pluginRepository
-  idapache.snapshots/id
-  nameApache Snapshot Repository/name
-  urlhttp://repository.apache.org/snapshots//url
-  releases
-enabledfalse/enabled
-  /releases
-/pluginRepository
-  /pluginRepositories
+
   distributionManagement
 !-- Site omitted - each project must provide their own --
 repository

svn commit: r745318 - /maven/pom/trunk/asf/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:42:01 2009
New Revision: 745318

URL: http://svn.apache.org/viewvc?rev=745318view=rev
Log:
[maven-release-plugin] prepare release apache-5

Modified:
maven/pom/trunk/asf/pom.xml

Modified: maven/pom/trunk/asf/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=745318r1=745317r2=745318view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Feb 18 00:42:01 2009
@@ -26,7 +26,7 @@
define the settings common to all projects at Apache --
   groupIdorg.apache/groupId
   artifactIdapache/artifactId
-  version5-SNAPSHOT/version
+  version5/version
   packagingpom/packaging
   nameThe Apache Software Foundation/name
   description
@@ -87,9 +87,9 @@
 
organization.logohttp://www.apache.org/images/asf_logo_wide.gif/organization.logo
   /properties
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf/developerConnection
-urlhttp://svn.apache.org/viewvc/maven/pom/trunk/asf/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-5/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-5/developerConnection
+urlhttp://svn.apache.org/viewvc/maven/pom/tags/apache-5/url
   /scm
 /project
 

svn commit: r745319 - in /maven/pom/tags/apache-5: ./ pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:42:05 2009
New Revision: 745319

URL: http://svn.apache.org/viewvc?rev=745319view=rev
Log:
[maven-release-plugin]  copy for tag apache-5

Added:
maven/pom/tags/apache-5/
  - copied from r742802, maven/pom/trunk/asf/
maven/pom/tags/apache-5/pom.xml
  - copied unchanged from r745318, maven/pom/trunk/asf/pom.xml

svn commit: r745320 - /maven/pom/trunk/asf/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:42:08 2009
New Revision: 745320

URL: http://svn.apache.org/viewvc?rev=745320view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/pom/trunk/asf/pom.xml

Modified: maven/pom/trunk/asf/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=745320r1=745319r2=745320view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Feb 18 00:42:08 2009
@@ -26,7 +26,7 @@
define the settings common to all projects at Apache --
   groupIdorg.apache/groupId
   artifactIdapache/artifactId
-  version5/version
+  version6-SNAPSHOT/version
   packagingpom/packaging
   nameThe Apache Software Foundation/name
   description
@@ -87,9 +87,9 @@
 
organization.logohttp://www.apache.org/images/asf_logo_wide.gif/organization.logo
   /properties
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-5/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-5/developerConnection
-urlhttp://svn.apache.org/viewvc/maven/pom/tags/apache-5/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf/developerConnection
+urlhttp://svn.apache.org/viewvc/maven/pom/trunk/asf/url
   /scm
 /project
 

svn commit: r745321 - /maven/pom/trunk/asf/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:43:25 2009
New Revision: 745321

URL: http://svn.apache.org/viewvc?rev=745321view=rev
Log:
rollback

Modified:
maven/pom/trunk/asf/pom.xml

Modified: maven/pom/trunk/asf/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=745321r1=745320r2=745321view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Feb 18 00:43:25 2009
@@ -26,7 +26,7 @@
define the settings common to all projects at Apache --
   groupIdorg.apache/groupId
   artifactIdapache/artifactId
-  version6-SNAPSHOT/version
+  version5-SNAPSHOT/version
   packagingpom/packaging
   nameThe Apache Software Foundation/name
   description

svn commit: r745322 - /maven/pom/trunk/asf/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:44:26 2009
New Revision: 745322

URL: http://svn.apache.org/viewvc?rev=745322view=rev
Log:
folders are supposed to end in / but maven always appends another / so 
stripping this one.

Modified:
maven/pom/trunk/asf/pom.xml

Modified: maven/pom/trunk/asf/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=745322r1=745321r2=745322view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Feb 18 00:44:26 2009
@@ -64,7 +64,7 @@
 repository
   idapache.releases.https/id
   nameApache Release Distribution Repository/name
-  
urlhttps://repository.apache.org/service/local/staging/deploy/maven2//url
+  
urlhttps://repository.apache.org/service/local/staging/deploy/maven2/url
 /repository
 snapshotRepository
   idapache.snapshots.https/id

svn commit: r745323 - /maven/pom/tags/apache-5/

[brianf]

Author: brianf
Date: Wed Feb 18 00:45:03 2009
New Revision: 745323

URL: http://svn.apache.org/viewvc?rev=745323view=rev
Log:
Removed file/folder

Removed:
maven/pom/tags/apache-5/

svn commit: r745324 - /maven/pom/trunk/asf/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:45:16 2009
New Revision: 745324

URL: http://svn.apache.org/viewvc?rev=745324view=rev
Log:
[maven-release-plugin] prepare release apache-5

Modified:
maven/pom/trunk/asf/pom.xml

Modified: maven/pom/trunk/asf/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=745324r1=745323r2=745324view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Feb 18 00:45:16 2009
@@ -26,7 +26,7 @@
define the settings common to all projects at Apache --
   groupIdorg.apache/groupId
   artifactIdapache/artifactId
-  version5-SNAPSHOT/version
+  version5/version
   packagingpom/packaging
   nameThe Apache Software Foundation/name
   description
@@ -87,9 +87,9 @@
 
organization.logohttp://www.apache.org/images/asf_logo_wide.gif/organization.logo
   /properties
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf/developerConnection
-urlhttp://svn.apache.org/viewvc/maven/pom/trunk/asf/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-5/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-5/developerConnection
+urlhttp://svn.apache.org/viewvc/maven/pom/tags/apache-5/url
   /scm
 /project
 

svn commit: r745325 - in /maven/pom/tags/apache-5: ./ pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:45:21 2009
New Revision: 745325

URL: http://svn.apache.org/viewvc?rev=745325view=rev
Log:
[maven-release-plugin]  copy for tag apache-5

Added:
maven/pom/tags/apache-5/
  - copied from r742802, maven/pom/trunk/asf/
maven/pom/tags/apache-5/pom.xml
  - copied unchanged from r745324, maven/pom/trunk/asf/pom.xml

svn commit: r745326 - /maven/pom/trunk/asf/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:45:23 2009
New Revision: 745326

URL: http://svn.apache.org/viewvc?rev=745326view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/pom/trunk/asf/pom.xml

Modified: maven/pom/trunk/asf/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=745326r1=745325r2=745326view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Feb 18 00:45:23 2009
@@ -26,7 +26,7 @@
define the settings common to all projects at Apache --
   groupIdorg.apache/groupId
   artifactIdapache/artifactId
-  version5/version
+  version6-SNAPSHOT/version
   packagingpom/packaging
   nameThe Apache Software Foundation/name
   description
@@ -87,9 +87,9 @@
 
organization.logohttp://www.apache.org/images/asf_logo_wide.gif/organization.logo
   /properties
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-5/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-5/developerConnection
-urlhttp://svn.apache.org/viewvc/maven/pom/tags/apache-5/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf/developerConnection
+urlhttp://svn.apache.org/viewvc/maven/pom/trunk/asf/url
   /scm
 /project
 

svn commit: r745327 - /maven/pom/trunk/maven/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:48:33 2009
New Revision: 745327

URL: http://svn.apache.org/viewvc?rev=745327view=rev
Log:
use new released version

Modified:
maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=745327r1=745326r2=745327view=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Wed Feb 18 00:48:33 2009
@@ -25,7 +25,7 @@
   parent
 groupIdorg.apache/groupId
 artifactIdapache/artifactId
-version5-SNAPSHOT/version
+version5/version
 relativePath../asf/pom.xml/relativePath
   /parent
 

svn commit: r745328 - /maven/pom/trunk/maven/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:49:49 2009
New Revision: 745328

URL: http://svn.apache.org/viewvc?rev=745328view=rev
Log:
[maven-release-plugin] prepare release maven-parent-11

Modified:
maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=745328r1=745327r2=745328view=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Wed Feb 18 00:49:49 2009
@@ -31,7 +31,7 @@
 
   groupIdorg.apache.maven/groupId
   artifactIdmaven-parent/artifactId
-  version11-SNAPSHOT/version
+  version11/version
   packagingpom/packaging
 
   nameApache Maven/name
@@ -504,9 +504,9 @@
   /mailingLists
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection
-urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-11/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-11/developerConnection
+urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-11/url
   /scm
   ciManagement
 systemHudson/system

svn commit: r745330 - in /maven/pom/tags/maven-parent-11: ./ pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:49:53 2009
New Revision: 745330

URL: http://svn.apache.org/viewvc?rev=745330view=rev
Log:
[maven-release-plugin]  copy for tag maven-parent-11

Added:
maven/pom/tags/maven-parent-11/
  - copied from r742802, maven/pom/trunk/maven/
maven/pom/tags/maven-parent-11/pom.xml
  - copied unchanged from r745328, maven/pom/trunk/maven/pom.xml

svn commit: r745331 - /maven/pom/trunk/maven/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:49:57 2009
New Revision: 745331

URL: http://svn.apache.org/viewvc?rev=745331view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=745331r1=745330r2=745331view=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Wed Feb 18 00:49:57 2009
@@ -31,7 +31,7 @@
 
   groupIdorg.apache.maven/groupId
   artifactIdmaven-parent/artifactId
-  version11/version
+  version12-SNAPSHOT/version
   packagingpom/packaging
 
   nameApache Maven/name
@@ -504,9 +504,9 @@
   /mailingLists
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-11/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-11/developerConnection
-urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-11/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection
+urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url
   /scm
   ciManagement
 systemHudson/system

svn commit: r745333 - /maven/plugins/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:52:03 2009
New Revision: 745333

URL: http://svn.apache.org/viewvc?rev=745333view=rev
Log:
use new released version

Modified:
maven/plugins/trunk/pom.xml

Modified: maven/plugins/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=745333r1=745332r2=745333view=diff
==
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Wed Feb 18 00:52:03 2009
@@ -29,7 +29,7 @@
 
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-plugins/artifactId
-  version13-SNAPSHOT/version
+  version13/version
   packagingpom/packaging
 
   nameMaven Plugins/name

svn commit: r745334 - /maven/plugins/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 00:53:48 2009
New Revision: 745334

URL: http://svn.apache.org/viewvc?rev=745334view=rev
Log:
switched the wrong versions

Modified:
maven/plugins/trunk/pom.xml

Modified: maven/plugins/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=745334r1=745333r2=745334view=diff
==
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Wed Feb 18 00:53:48 2009
@@ -23,13 +23,13 @@
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven-parent/artifactId
-version11-SNAPSHOT/version
+version11/version
 relativePath../pom/maven/pom.xml/relativePath
   /parent
 
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-plugins/artifactId
-  version13/version
+  version13-SNAPSHOT/version
   packagingpom/packaging
 
   nameMaven Plugins/name

svn commit: r745336 - /maven/plugins/trunk/maven-gpg-plugin/

[brianf]

Author: brianf
Date: Wed Feb 18 00:56:05 2009
New Revision: 745336

URL: http://svn.apache.org/viewvc?rev=745336view=rev
Log: (empty)

Modified:
maven/plugins/trunk/maven-gpg-plugin/   (props changed)

Propchange: maven/plugins/trunk/maven-gpg-plugin/
--
--- svn:ignore (original)
+++ svn:ignore Wed Feb 18 00:56:05 2009
@@ -9,3 +9,4 @@
 .pmd
 .ruleset
 bin
+cobertura.ser

svn commit: r745339 - /maven/plugins/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:00:01 2009
New Revision: 745339

URL: http://svn.apache.org/viewvc?rev=745339view=rev
Log:
temporarily remove the modules to avoid a cyclic dependency

Modified:
maven/plugins/trunk/pom.xml

Modified: maven/plugins/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=745339r1=745338r2=745339view=diff
==
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Wed Feb 18 01:00:01 2009
@@ -109,7 +109,7 @@
   /otherArchives
 /mailingList
   /mailingLists
-
+!--
   modules
 modulemaven-ant-plugin/module
 modulemaven-antrun-plugin/module
@@ -137,10 +137,10 @@
 modulemaven-one-plugin/module
 modulemaven-patch-plugin/module
 modulemaven-pmd-plugin/module
-!-- Excluded as a workaround for MNG-3814
+ Excluded as a workaround for MNG-3814
 modulemaven-project-info-reports-plugin/module
---
-modulemaven-rar-plugin/module
+
+   modulemaven-rar-plugin/module
 modulemaven-reactor-plugin/module
 modulemaven-remote-resources-plugin/module
 modulemaven-repository-plugin/module
@@ -152,7 +152,7 @@
 modulemaven-toolchains-plugin/module
 modulemaven-verifier-plugin/module
 modulemaven-war-plugin/module
-  /modules
+  /modules --
 
   scm
 
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk//connection

svn commit: r745340 - in /maven/plugins/tags/maven-plugins-13: ./ maven-antrun-plugin/ maven-assembly-plugin/ maven-changelog-plugin/ maven-changes-plugin/ maven-checkstyle-plugin/ maven-clean-plugin/

[brianf]

Author: brianf
Date: Wed Feb 18 01:00:51 2009
New Revision: 745340

URL: http://svn.apache.org/viewvc?rev=745340view=rev
Log:
[maven-release-plugin]  copy for tag maven-plugins-13

Added:
maven/plugins/tags/maven-plugins-13/
  - copied from r745195, maven/plugins/trunk/
maven/plugins/tags/maven-plugins-13/maven-antrun-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-assembly-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-changelog-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-changelog-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-changes-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-checkstyle-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-clean-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-clean-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-compiler-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-compiler-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-deploy-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-deploy-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-doap-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-doap-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-docck-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-docck-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-ear-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-eclipse-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-ejb-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-ejb-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-gpg-plugin/
  - copied from r745336, maven/plugins/trunk/maven-gpg-plugin/
maven/plugins/tags/maven-plugins-13/maven-gpg-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-gpg-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-gpg-plugin/src/
  - copied from r745195, maven/plugins/trunk/maven-gpg-plugin/src/
maven/plugins/tags/maven-plugins-13/maven-help-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-help-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-idea-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-idea-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-install-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-install-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-invoker-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-invoker-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-jar-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-jar-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-javadoc-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-linkcheck-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-one-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-one-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-patch-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-patch-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-pmd-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-pmd-plugin/pom.xml

maven/plugins/tags/maven-plugins-13/maven-project-info-reports-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-rar-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-rar-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-reactor-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-reactor-plugin/pom.xml
maven/plugins/tags/maven-plugins-13/maven-remote-resources-plugin/pom.xml
  - copied unchanged from r745196, 
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml

svn commit: r745341 - /maven/plugins/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:01:55 2009
New Revision: 745341

URL: http://svn.apache.org/viewvc?rev=745341view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/pom.xml

Modified: maven/plugins/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=745341r1=745340r2=745341view=diff
==
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Wed Feb 18 01:01:55 2009
@@ -29,7 +29,7 @@
 
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-plugins/artifactId
-  version13-SNAPSHOT/version
+  version14-SNAPSHOT/version
   packagingpom/packaging
 
   nameMaven Plugins/name

svn commit: r745342 - /maven/plugins/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:08:18 2009
New Revision: 745342

URL: http://svn.apache.org/viewvc?rev=745342view=rev
Log:
put the modules back

Modified:
maven/plugins/trunk/pom.xml

Modified: maven/plugins/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=745342r1=745341r2=745342view=diff
==
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Wed Feb 18 01:08:18 2009
@@ -109,7 +109,7 @@
   /otherArchives
 /mailingList
   /mailingLists
-!--
+
   modules
 modulemaven-ant-plugin/module
 modulemaven-antrun-plugin/module
@@ -137,8 +137,8 @@
 modulemaven-one-plugin/module
 modulemaven-patch-plugin/module
 modulemaven-pmd-plugin/module
- Excluded as a workaround for MNG-3814
-modulemaven-project-info-reports-plugin/module
+ !--Excluded as a workaround for MNG-3814
+modulemaven-project-info-reports-plugin/module--
 
modulemaven-rar-plugin/module
 modulemaven-reactor-plugin/module
@@ -152,7 +152,7 @@
 modulemaven-toolchains-plugin/module
 modulemaven-verifier-plugin/module
 modulemaven-war-plugin/module
-  /modules --
+  /modules
 
   scm
 
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk//connection

svn commit: r745343 - /maven/shared/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:13:58 2009
New Revision: 745343

URL: http://svn.apache.org/viewvc?rev=745343view=rev
Log:
use new released version

Modified:
maven/shared/trunk/pom.xml

Modified: maven/shared/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=745343r1=745342r2=745343view=diff
==
--- maven/shared/trunk/pom.xml (original)
+++ maven/shared/trunk/pom.xml Wed Feb 18 01:13:58 2009
@@ -25,7 +25,7 @@
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven-parent/artifactId
-version11-SNAPSHOT/version
+version11/version
 relativePath../pom/maven/pom.xml/relativePath
   /parent
 

svn commit: r745344 - /maven/shared/trunk/maven-downloader/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:15:14 2009
New Revision: 745344

URL: http://svn.apache.org/viewvc?rev=745344view=rev
Log:
use released parent

Modified:
maven/shared/trunk/maven-downloader/pom.xml

Modified: maven/shared/trunk/maven-downloader/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/pom.xml?rev=745344r1=745343r2=745344view=diff
==
--- maven/shared/trunk/maven-downloader/pom.xml (original)
+++ maven/shared/trunk/maven-downloader/pom.xml Wed Feb 18 01:15:14 2009
@@ -21,7 +21,7 @@
   parent
 artifactIdmaven-shared-components/artifactId
 groupIdorg.apache.maven.shared/groupId
-version10/version
+version11-SNAPSHOT/version
   /parent
   modelVersion4.0.0/modelVersion
   groupIdorg.apache.maven.shared/groupId

svn commit: r745345 - /maven/shared/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:18:28 2009
New Revision: 745345

URL: http://svn.apache.org/viewvc?rev=745345view=rev
Log:
does it have to be this hard?

Modified:
maven/shared/trunk/pom.xml

Modified: maven/shared/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=745345r1=745344r2=745345view=diff
==
--- maven/shared/trunk/pom.xml (original)
+++ maven/shared/trunk/pom.xml Wed Feb 18 01:18:28 2009
@@ -110,7 +110,7 @@
   /otherArchives
 /mailingList
   /mailingLists
-
+!--
   modules
 modulefile-management/module
 modulemaven-ant/module
@@ -135,7 +135,7 @@
 modulemaven-verifier/module
 modulemaven-web-ui-tests/module
   /modules
-
+--
   scm
 
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection
 
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk//developerConnection

svn commit: r745346 - /maven/shared/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:18:56 2009
New Revision: 745346

URL: http://svn.apache.org/viewvc?rev=745346view=rev
Log:
[maven-release-plugin] prepare release maven-shared-components-11

Modified:
maven/shared/trunk/pom.xml

Modified: maven/shared/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=745346r1=745345r2=745346view=diff
==
--- maven/shared/trunk/pom.xml (original)
+++ maven/shared/trunk/pom.xml Wed Feb 18 01:18:56 2009
@@ -31,7 +31,7 @@
 
   groupIdorg.apache.maven.shared/groupId
   artifactIdmaven-shared-components/artifactId
-  version11-SNAPSHOT/version
+  version11/version
   packagingpom/packaging
 
   nameMaven Shared Components/name
@@ -137,9 +137,9 @@
   /modules
 --
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk//developerConnection
-urlhttp://svn.apache.org/viewvc/maven/shared/trunk//url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-11/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-11/developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-components-11/url
   /scm
   issueManagement
 systemjira/system

svn commit: r745347 - in /maven/shared/tags/maven-shared-components-11: ./ file-management/ maven-ant/ maven-app-configuration/ maven-archiver/ maven-common-artifact-filters/ maven-common-artifact-fil

[brianf]

Author: brianf
Date: Wed Feb 18 01:19:18 2009
New Revision: 745347

URL: http://svn.apache.org/viewvc?rev=745347view=rev
Log:
[maven-release-plugin]  copy for tag maven-shared-components-11

Added:
maven/shared/tags/maven-shared-components-11/
  - copied from r744230, maven/shared/trunk/
maven/shared/tags/maven-shared-components-11/file-management/pom.xml
  - copied unchanged from r744315, 
maven/shared/trunk/file-management/pom.xml
maven/shared/tags/maven-shared-components-11/maven-ant/pom.xml
  - copied unchanged from r744323, maven/shared/trunk/maven-ant/pom.xml
maven/shared/tags/maven-shared-components-11/maven-app-configuration/pom.xml
  - copied unchanged from r744324, 
maven/shared/trunk/maven-app-configuration/pom.xml
maven/shared/tags/maven-shared-components-11/maven-archiver/pom.xml
  - copied unchanged from r744325, maven/shared/trunk/maven-archiver/pom.xml

maven/shared/tags/maven-shared-components-11/maven-common-artifact-filters/pom.xml
  - copied unchanged from r744326, 
maven/shared/trunk/maven-common-artifact-filters/pom.xml

maven/shared/tags/maven-shared-components-11/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
  - copied unchanged from r744326, 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java

maven/shared/tags/maven-shared-components-11/maven-dependency-analyzer/pom.xml
  - copied unchanged from r744329, 
maven/shared/trunk/maven-dependency-analyzer/pom.xml
maven/shared/tags/maven-shared-components-11/maven-dependency-tree/pom.xml
  - copied unchanged from r744330, 
maven/shared/trunk/maven-dependency-tree/pom.xml
maven/shared/tags/maven-shared-components-11/maven-downloader/pom.xml
  - copied unchanged from r745344, 
maven/shared/trunk/maven-downloader/pom.xml
maven/shared/tags/maven-shared-components-11/maven-doxia-tools/pom.xml
  - copied unchanged from r744332, 
maven/shared/trunk/maven-doxia-tools/pom.xml
maven/shared/tags/maven-shared-components-11/maven-filtering/pom.xml
  - copied unchanged from r744333, 
maven/shared/trunk/maven-filtering/pom.xml
maven/shared/tags/maven-shared-components-11/maven-invoker/pom.xml
  - copied unchanged from r744334, maven/shared/trunk/maven-invoker/pom.xml
maven/shared/tags/maven-shared-components-11/maven-model-converter/pom.xml
  - copied unchanged from r744335, 
maven/shared/trunk/maven-model-converter/pom.xml
maven/shared/tags/maven-shared-components-11/maven-osgi/pom.xml
  - copied unchanged from r744336, maven/shared/trunk/maven-osgi/pom.xml
maven/shared/tags/maven-shared-components-11/maven-reporting-impl/pom.xml
  - copied unchanged from r744337, 
maven/shared/trunk/maven-reporting-impl/pom.xml

maven/shared/tags/maven-shared-components-11/maven-repository-builder/pom.xml
  - copied unchanged from r744338, 
maven/shared/trunk/maven-repository-builder/pom.xml
maven/shared/tags/maven-shared-components-11/maven-runtime/pom.xml
  - copied unchanged from r744339, maven/shared/trunk/maven-runtime/pom.xml
maven/shared/tags/maven-shared-components-11/maven-script/pom.xml
  - copied unchanged from r744340, maven/shared/trunk/maven-script/pom.xml
maven/shared/tags/maven-shared-components-11/maven-shared-io/pom.xml
  - copied unchanged from r744341, 
maven/shared/trunk/maven-shared-io/pom.xml
maven/shared/tags/maven-shared-components-11/maven-shared-jar/pom.xml
  - copied unchanged from r744342, 
maven/shared/trunk/maven-shared-jar/pom.xml
maven/shared/tags/maven-shared-components-11/maven-shared-monitor/pom.xml
  - copied unchanged from r744343, 
maven/shared/trunk/maven-shared-monitor/pom.xml
maven/shared/tags/maven-shared-components-11/maven-verifier/pom.xml
  - copied unchanged from r744344, maven/shared/trunk/maven-verifier/pom.xml
maven/shared/tags/maven-shared-components-11/maven-web-ui-tests/pom.xml
  - copied unchanged from r744345, 
maven/shared/trunk/maven-web-ui-tests/pom.xml
maven/shared/tags/maven-shared-components-11/pom.xml
  - copied unchanged from r745346, maven/shared/trunk/pom.xml

svn commit: r745349 - /maven/shared/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:23:08 2009
New Revision: 745349

URL: http://svn.apache.org/viewvc?rev=745349view=rev
Log:
rollback

Modified:
maven/shared/trunk/pom.xml

Modified: maven/shared/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=745349r1=745348r2=745349view=diff
==
--- maven/shared/trunk/pom.xml (original)
+++ maven/shared/trunk/pom.xml Wed Feb 18 01:23:08 2009
@@ -31,7 +31,7 @@
 
   groupIdorg.apache.maven.shared/groupId
   artifactIdmaven-shared-components/artifactId
-  version11/version
+  version11-SNAPSHOT/version
   packagingpom/packaging
 
   nameMaven Shared Components/name
@@ -137,9 +137,9 @@
   /modules
 --
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-11/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-11/developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-components-11/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk//developerConnection
+urlhttp://svn.apache.org/viewvc/maven/shared/trunk//url
   /scm
   issueManagement
 systemjira/system

svn commit: r745350 - /maven/shared/tags/maven-shared-components-11/

[brianf]

Author: brianf
Date: Wed Feb 18 01:24:19 2009
New Revision: 745350

URL: http://svn.apache.org/viewvc?rev=745350view=rev
Log:
Removed file/folder

Removed:
maven/shared/tags/maven-shared-components-11/

svn commit: r745351 - /maven/shared/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:25:08 2009
New Revision: 745351

URL: http://svn.apache.org/viewvc?rev=745351view=rev
Log:
[maven-release-plugin] prepare release maven-shared-components-11

Modified:
maven/shared/trunk/pom.xml

Modified: maven/shared/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=745351r1=745350r2=745351view=diff
==
--- maven/shared/trunk/pom.xml (original)
+++ maven/shared/trunk/pom.xml Wed Feb 18 01:25:08 2009
@@ -31,7 +31,7 @@
 
   groupIdorg.apache.maven.shared/groupId
   artifactIdmaven-shared-components/artifactId
-  version11-SNAPSHOT/version
+  version11/version
   packagingpom/packaging
 
   nameMaven Shared Components/name
@@ -137,9 +137,9 @@
   /modules
 --
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk//developerConnection
-urlhttp://svn.apache.org/viewvc/maven/shared/trunk//url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-11/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-11/developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-components-11/url
   /scm
   issueManagement
 systemjira/system

svn commit: r745352 - in /maven/shared/tags/maven-shared-components-11: ./ file-management/ maven-ant/ maven-app-configuration/ maven-archiver/ maven-common-artifact-filters/ maven-common-artifact-fil

[brianf]

Author: brianf
Date: Wed Feb 18 01:25:30 2009
New Revision: 745352

URL: http://svn.apache.org/viewvc?rev=745352view=rev
Log:
[maven-release-plugin]  copy for tag maven-shared-components-11

Added:
maven/shared/tags/maven-shared-components-11/
  - copied from r744230, maven/shared/trunk/
maven/shared/tags/maven-shared-components-11/file-management/pom.xml
  - copied unchanged from r744315, 
maven/shared/trunk/file-management/pom.xml
maven/shared/tags/maven-shared-components-11/maven-ant/pom.xml
  - copied unchanged from r744323, maven/shared/trunk/maven-ant/pom.xml
maven/shared/tags/maven-shared-components-11/maven-app-configuration/pom.xml
  - copied unchanged from r744324, 
maven/shared/trunk/maven-app-configuration/pom.xml
maven/shared/tags/maven-shared-components-11/maven-archiver/pom.xml
  - copied unchanged from r744325, maven/shared/trunk/maven-archiver/pom.xml

maven/shared/tags/maven-shared-components-11/maven-common-artifact-filters/pom.xml
  - copied unchanged from r744326, 
maven/shared/trunk/maven-common-artifact-filters/pom.xml

maven/shared/tags/maven-shared-components-11/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
  - copied unchanged from r744326, 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java

maven/shared/tags/maven-shared-components-11/maven-dependency-analyzer/pom.xml
  - copied unchanged from r744329, 
maven/shared/trunk/maven-dependency-analyzer/pom.xml
maven/shared/tags/maven-shared-components-11/maven-dependency-tree/pom.xml
  - copied unchanged from r744330, 
maven/shared/trunk/maven-dependency-tree/pom.xml
maven/shared/tags/maven-shared-components-11/maven-downloader/pom.xml
  - copied unchanged from r745344, 
maven/shared/trunk/maven-downloader/pom.xml
maven/shared/tags/maven-shared-components-11/maven-doxia-tools/pom.xml
  - copied unchanged from r744332, 
maven/shared/trunk/maven-doxia-tools/pom.xml
maven/shared/tags/maven-shared-components-11/maven-filtering/pom.xml
  - copied unchanged from r744333, 
maven/shared/trunk/maven-filtering/pom.xml
maven/shared/tags/maven-shared-components-11/maven-invoker/pom.xml
  - copied unchanged from r744334, maven/shared/trunk/maven-invoker/pom.xml
maven/shared/tags/maven-shared-components-11/maven-model-converter/pom.xml
  - copied unchanged from r744335, 
maven/shared/trunk/maven-model-converter/pom.xml
maven/shared/tags/maven-shared-components-11/maven-osgi/pom.xml
  - copied unchanged from r744336, maven/shared/trunk/maven-osgi/pom.xml
maven/shared/tags/maven-shared-components-11/maven-reporting-impl/pom.xml
  - copied unchanged from r744337, 
maven/shared/trunk/maven-reporting-impl/pom.xml

maven/shared/tags/maven-shared-components-11/maven-repository-builder/pom.xml
  - copied unchanged from r744338, 
maven/shared/trunk/maven-repository-builder/pom.xml
maven/shared/tags/maven-shared-components-11/maven-runtime/pom.xml
  - copied unchanged from r744339, maven/shared/trunk/maven-runtime/pom.xml
maven/shared/tags/maven-shared-components-11/maven-script/pom.xml
  - copied unchanged from r744340, maven/shared/trunk/maven-script/pom.xml
maven/shared/tags/maven-shared-components-11/maven-shared-io/pom.xml
  - copied unchanged from r744341, 
maven/shared/trunk/maven-shared-io/pom.xml
maven/shared/tags/maven-shared-components-11/maven-shared-jar/pom.xml
  - copied unchanged from r744342, 
maven/shared/trunk/maven-shared-jar/pom.xml
maven/shared/tags/maven-shared-components-11/maven-shared-monitor/pom.xml
  - copied unchanged from r744343, 
maven/shared/trunk/maven-shared-monitor/pom.xml
maven/shared/tags/maven-shared-components-11/maven-verifier/pom.xml
  - copied unchanged from r744344, maven/shared/trunk/maven-verifier/pom.xml
maven/shared/tags/maven-shared-components-11/maven-web-ui-tests/pom.xml
  - copied unchanged from r744345, 
maven/shared/trunk/maven-web-ui-tests/pom.xml
maven/shared/tags/maven-shared-components-11/pom.xml
  - copied unchanged from r745351, maven/shared/trunk/pom.xml

svn commit: r745353 - /maven/shared/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:25:36 2009
New Revision: 745353

URL: http://svn.apache.org/viewvc?rev=745353view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/shared/trunk/pom.xml

Modified: maven/shared/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=745353r1=745352r2=745353view=diff
==
--- maven/shared/trunk/pom.xml (original)
+++ maven/shared/trunk/pom.xml Wed Feb 18 01:25:36 2009
@@ -31,7 +31,7 @@
 
   groupIdorg.apache.maven.shared/groupId
   artifactIdmaven-shared-components/artifactId
-  version11/version
+  version12-SNAPSHOT/version
   packagingpom/packaging
 
   nameMaven Shared Components/name
@@ -137,9 +137,9 @@
   /modules
 --
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-11/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-11/developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-components-11/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk//developerConnection
+urlhttp://svn.apache.org/viewvc/maven/shared/trunk//url
   /scm
   issueManagement
 systemjira/system

svn commit: r745355 - /maven/shared/trunk/pom.xml

[brianf]

Author: brianf
Date: Wed Feb 18 01:44:37 2009
New Revision: 745355

URL: http://svn.apache.org/viewvc?rev=745355view=rev
Log:
put the modules back

Modified:
maven/shared/trunk/pom.xml

Modified: maven/shared/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=745355r1=745354r2=745355view=diff
==
--- maven/shared/trunk/pom.xml (original)
+++ maven/shared/trunk/pom.xml Wed Feb 18 01:44:37 2009
@@ -31,7 +31,7 @@
 
   groupIdorg.apache.maven.shared/groupId
   artifactIdmaven-shared-components/artifactId
-  version12-SNAPSHOT/version
+  version11/version
   packagingpom/packaging
 
   nameMaven Shared Components/name
@@ -110,7 +110,7 @@
   /otherArchives
 /mailingList
   /mailingLists
-!--
+
   modules
 modulefile-management/module
 modulemaven-ant/module
@@ -135,7 +135,7 @@
 modulemaven-verifier/module
 modulemaven-web-ui-tests/module
   /modules
---
+
   scm
 
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection
 
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk//developerConnection

svn commit: r745363 - in /maven/site/trunk/src/site/apt: encryption.apt guides/mini/encryption.apt

[brianf]

Author: brianf
Date: Wed Feb 18 02:51:04 2009
New Revision: 745363

URL: http://svn.apache.org/viewvc?rev=745363view=rev
Log:
move the encryption page

Added:
maven/site/trunk/src/site/apt/guides/mini/encryption.apt
  - copied unchanged from r744230, 
maven/site/trunk/src/site/apt/encryption.apt
Removed:
maven/site/trunk/src/site/apt/encryption.apt

svn commit: r745364 - in /maven/site/trunk: ./ src/site/ src/site/apt/ src/site/apt/guides/ src/site/apt/guides/mini/ src/site/xdoc/

[brianf]

Author: brianf
Date: Wed Feb 18 02:59:40 2009
New Revision: 745364

URL: http://svn.apache.org/viewvc?rev=745364view=rev
Log:
2.0.10 site updates

Added:
maven/site/trunk/src/site/apt/guides/mini/guide-encryption.apt
  - copied, changed from r745363, 
maven/site/trunk/src/site/apt/guides/mini/encryption.apt
Removed:
maven/site/trunk/src/site/apt/guides/mini/encryption.apt
Modified:
maven/site/trunk/pom.xml
maven/site/trunk/src/site/apt/guides/index.apt
maven/site/trunk/src/site/apt/release-notes-older.apt.vm
maven/site/trunk/src/site/apt/release-notes.apt.vm
maven/site/trunk/src/site/apt/settings.apt
maven/site/trunk/src/site/site.xml
maven/site/trunk/src/site/xdoc/index.xml.vm

Modified: maven/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=745364r1=745363r2=745364view=diff
==
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Wed Feb 18 02:59:40 2009
@@ -23,7 +23,7 @@
   parent
 artifactIdmaven-parent/artifactId
 groupIdorg.apache.maven/groupId
-version11-SNAPSHOT/version
+version11/version
 relativePath../pom/maven/pom.xml/relativePath
   /parent
 
@@ -36,7 +36,7 @@
   urlhttp://maven.apache.org//url
 
   properties
-currentVersion2.0.9/currentVersion
+currentVersion2.0.10/currentVersion
 currentPreviewVersion2.1.0-M1/currentPreviewVersion
   /properties
 

Modified: maven/site/trunk/src/site/apt/guides/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/index.apt?rev=745364r1=745363r2=745364view=diff
==
--- maven/site/trunk/src/site/apt/guides/index.apt (original)
+++ maven/site/trunk/src/site/apt/guides/index.apt Wed Feb 18 02:59:40 2009
@@ -118,6 +118,8 @@
 
  * {{{./mini/guide-using-toolchains.html}Using Toolchains}}
  
+ * {{{./mini/guide-encryption.html} Encrypting passwords in settings.xml}}
+ 
 
 ** Testing
 

Copied: maven/site/trunk/src/site/apt/guides/mini/guide-encryption.apt (from 
r745363, maven/site/trunk/src/site/apt/guides/mini/encryption.apt)
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-encryption.apt?p2=maven/site/trunk/src/site/apt/guides/mini/guide-encryption.aptp1=maven/site/trunk/src/site/apt/guides/mini/encryption.aptr1=745363r2=745364rev=745364view=diff
==
--- maven/site/trunk/src/site/apt/guides/mini/encryption.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-encryption.apt Wed Feb 18 
02:59:40 2009
@@ -10,16 +10,16 @@
 
   [[1]] {{{Introduction}Introduction}}
 
-  [[2]] {{{How_to_create_master_password}How to create master password}}
+  [[2]] {{{How_to_create_master_password}How to create a master password}}
 
   [[3]] {{{How_to_encrypt_server_passwords}How to encrypt server passwords}}
 
-  [[4]] {{{How_to_keep_master_password_on_removable_drive}How to keep master 
password on removable drive}}
+  [[4]] {{{How_to_keep_master_password_on_removable_drive}How to keep the 
master password on removable drive}}
   
 
 * {Introduction}
 
- Maven 2.1.x trunk now supports server password decryption. This solution is a 
+ Maven 2.1.x trunk now supports server password encryption. This solution is a 
  first implementation and will be enhanced and made more user-friendly in the 
  nearest future. What is described here is working, but not too user-friendly, 
  a Maven plugin to address password maintenance is in the works.
@@ -48,7 +48,7 @@
 
   ** for now - this is done via CLI after master password has been 
created and stored in appropriate location
 
-* {How to create master password}
+* {How to create a master password}
 
  All necessary classes are in the maven uber jar which is in 
$\{maven.home}/lib  
 
@@ -77,7 +77,7 @@
 
 * {How to encrypt server passwords}
 
- You will have to use the same command line tool as for master password (see 
above), but parameter is different: -p
+ You will have to use the same command line tool as used for the master 
password (see above), but the parameter is different: -p
 
  Use the following command line:
  
@@ -92,7 +92,7 @@
 {COQLCE6DU6GtcS5P=}
 ++
 
- Cut-n-paste it into you settings.xml file in the server section. This 
will look like:
+ Cut-n-paste it into your settings.xml file in the server section. This 
will look like:
  
 ++
 settings
@@ -120,7 +120,7 @@
 
 
 
-* {How to keep master password on removable drive}
+* {How to keep the master password on removable drive}
 
  Create the master password exactly as described above, and store it on a 
  removable drive, for instance on OSX, my USB drive mounts as 
/Volumes/mySecureUsb, 
@@ -134,12 +134,11 @@
 
  in the file /Volumes/mySecureUsb/secure/settings-security.xml
 
- And