Author: sisbell
Date: Tue Apr 21 19:49:19 2009
New Revision: 767266
URL: http://svn.apache.org/viewvc?rev=767266&view=rev
Log:
[MNG-0051] - This test was broken due to an unrelated issue on plugin
management inheritance. Fixed it and added some unit tests.
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
(contents, props changed)
- copied, changed from r766894,
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-inheritance/
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugins/
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml
Removed:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java?rev=767266&r1=767265&r2=767266&view=diff
==============================================================================
---
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
(original)
+++
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
Tue Apr 21 19:49:19 2009
@@ -74,7 +74,6 @@
copy( (Plugin) parent, targetPlugin, false );
copyDependencies( new ArrayList<Dependency>(( (Plugin)
parent).getDependencies() ), new ArrayList<Dependency>(),
targetPlugin, true );
- // copyDependencies( (Plugin) parent, targetPlugin, false );
if(isAdd) t.add( targetPlugin );
}
else
@@ -111,6 +110,28 @@
}
}
}
+
+ public void process( Plugin parent, List<Plugin> t, boolean
isChildMostSpecialized )
+ {
+ if (parent == null) {
+ return;
+ }
+
+ boolean isAdd = true;
+ Plugin targetPlugin = find((Plugin) parent, t);
+ if (targetPlugin == null) {
+ targetPlugin = new Plugin();
+ } else {
+ isAdd = false;
+ }
+
+ copy2((Plugin) parent, targetPlugin, false);
+ copyDependencies(new ArrayList<Dependency>(((Plugin) parent)
+ .getDependencies()), new
ArrayList<Dependency>(), targetPlugin,
+ true);
+ if (isAdd)
+ t.add(targetPlugin);
+ }
private static Plugin find(Plugin p1, List<Plugin> plugins)
{
@@ -132,9 +153,9 @@
private static String getId( Plugin d )
{
StringBuilder sb = new StringBuilder();
- sb.append( d.getGroupId() ).append( ":" ).append( d.getArtifactId()
).append( ":" );
+ sb.append( (d.getGroupId() != null) ? d.getGroupId() :
"org.apache.maven.plugins").append( ":" ).append( d.getArtifactId() ).append(
":" );
return sb.toString();
- }
+ }
private static void copyDependencies(List<Dependency> parent,
List<Dependency> child, Plugin target, boolean isChild)
@@ -146,7 +167,76 @@
DependenciesProcessor proc = new DependenciesProcessor();
proc.process( parent, child, target.getDependencies(), isChild );
}
-
+
+ /**
+ * Don't overwrite values
+ *
+ * @param source
+ * @param target
+ * @param isChild
+ */
+ private static void copy2(Plugin source, Plugin target, boolean isChild)
+ {
+ if(!isChild && source.getInherited() != null &&
!source.getInherited().equalsIgnoreCase( "true" ))
+ {
+ return;
+ }
+
+ if(target.getArtifactId() == null)
+ {
+ target.setArtifactId( source.getArtifactId() );
+ }
+
+ if(target.getGroupId() == null)
+ {
+ target.setGroupId( source.getGroupId() );
+ }
+
+ if(target.getInherited() == null)
+ {
+ target.setInherited( source.getInherited() );
+ }
+
+ if(target.getVersion() == null)
+ {
+ target.setVersion( source.getVersion() );
+ }
+
+ for( PluginExecution pe : source.getExecutions())
+ {
+ PluginExecution idMatch = contains(pe, target.getExecutions());
+ if(idMatch != null)//Join
+ {
+ copyPluginExecution(pe, idMatch, isChild);
+ }
+ else
+ {
+ PluginExecution targetPe = new PluginExecution();
+ copyPluginExecution(pe, targetPe, isChild);
+ target.addExecution( targetPe );
+ }
+
+ }
+
+ if(source.getConfiguration() != null)
+ {
+ //TODO: Not copying
+ if(target.getConfiguration() != null)
+ {
+ target.setConfiguration( Xpp3Dom.mergeXpp3Dom( (Xpp3Dom)
source.getConfiguration(), (Xpp3Dom) target.getConfiguration() ));
+ }
+ else
+ {
+ target.setConfiguration( source.getConfiguration() );
+ }
+
+ }
+
+ // p2.setConfiguration( configuration ) merge nodes
+ //Goals
+ target.setExtensions(source.isExtensions());
+
+ }
private static void copy(Plugin source, Plugin target, boolean isChild)
{
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java?rev=767266&r1=767265&r2=767266&view=diff
==============================================================================
---
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
(original)
+++
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
Tue Apr 21 19:49:19 2009
@@ -22,8 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
public class PluginsProcessor
@@ -56,26 +54,33 @@
if ( !c.isEmpty() )
{
List<Plugin> parentDependencies = new ArrayList<Plugin>();
- for ( Plugin d1 : c)
+ for ( Plugin childPlugin : c)
{
- for ( Plugin d2 : p)
+ for ( Plugin parentPlugin : p)
{
- if ( match( d1, d2 ) )
+ if ( match( childPlugin, parentPlugin ) )
{
- processor.process( d2, d1, plugins,
isChildMostSpecialized );// JOIN
+ processor.process( parentPlugin, childPlugin,
plugins, isChildMostSpecialized );// JOIN
}
else
{
- processor.process( null, d1, plugins,
isChildMostSpecialized );
- parentDependencies.add( d2 );
+ processor.process( null, childPlugin, plugins,
isChildMostSpecialized );
+ if(!parentDependencies.contains(parentPlugin))
+ {
+ parentDependencies.add( parentPlugin );
+ }
}
}
}
-
+
+ /**
+ * Process Parents after child to keep plugin order but don't
want to overwrite the child values. Use different method
+ */
for ( Plugin d2 : parentDependencies )
{
- processor.process( d2, null, plugins,
isChildMostSpecialized );
+ processor.process( d2, plugins, isChildMostSpecialized );
}
+
}
else if( p != null)
{
@@ -96,7 +101,7 @@
private static String getId( Plugin d )
{
StringBuilder sb = new StringBuilder();
- sb.append( d.getGroupId() ).append( ":" ).append( d.getArtifactId()
).append( ":" );
+ sb.append( (d.getGroupId() != null) ? d.getGroupId() :
"org.apache.maven.plugins").append( ":" ).append( d.getArtifactId() ).append(
":" );
return sb.toString();
}
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=767266&r1=767265&r2=767266&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Apr 21 19:49:19 2009
@@ -544,7 +544,7 @@
{
for ( String s : (List<String>) validationResult.getMessages() )
{
- logger.debug( s );
+ logger.info( s );
}
throw new InvalidProjectModelException( projectId, "Failed to
validate POM", pomFile, validationResult );
}
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=767266&r1=767265&r2=767266&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Tue Apr 21 19:49:19 2009
@@ -23,7 +23,6 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -1368,6 +1367,35 @@
pom.getValue( "distributionManagement/site/url" ) );
}
+ public void testPluginManagementInheritance()
+ throws Exception
+ {
+ PomTestWrapper pom = this.buildPom( "plugin-management-inheritance");
+ assertEquals("0.1-stub-SNAPSHOT", pom.getValue(
"build/pluginManagement/plugins[1]/version" ) );
+ }
+
+ public void testProfilePlugins()
+ throws Exception
+ {
+ PomTestWrapper pom = this.buildPom( "profile-plugins", "standard");
+ assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" )
).size() );
+ assertEquals("maven-assembly2-plugin", pom.getValue(
"build/plugins[2]/artifactId" ) );
+ }
+
+ public void testPluginInheritanceSimple()
+ throws Exception
+ {
+ PomTestWrapper pom = this.buildPom(
"plugin-inheritance-simple/sub");
+ assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" )
).size() );
+ }
+
+ public void testPluginManagementDuplicate()
+ throws Exception
+ {
+ PomTestWrapper pom = this.buildPom(
"plugin-management-duplicate/sub");
+ assertEquals( 20, ( (List<?>) pom.getValue(
"build/pluginManagement/plugins" ) ).size() );
+ }
+
private void assertPathSuffixEquals( String expected, Object actual )
{
String a = actual.toString();
@@ -1381,21 +1409,21 @@
}
private PomTestWrapper buildPom( String pomPath, Properties properties)
- throws Exception
-{
- File pomFile = new File( testDirectory , pomPath );
- if ( pomFile.isDirectory() )
- {
- pomFile = new File( pomFile, "pom.xml" );
- }
- ProjectBuilderConfiguration config = new
DefaultProjectBuilderConfiguration();
- config.setLocalRepository(new DefaultArtifactRepository("default", "", new
DefaultRepositoryLayout()));
- ProfileActivationContext pCtx = new ProfileActivationContext(null, true);
-
- config.setExecutionProperties(properties);
- config.setGlobalProfileManager(new DefaultProfileManager(pCtx));
- return new PomTestWrapper( pomFile, mavenProjectBuilder.build( pomFile,
config ) );
-}
+ throws Exception
+ {
+ File pomFile = new File( testDirectory , pomPath );
+ if ( pomFile.isDirectory() )
+ {
+ pomFile = new File( pomFile, "pom.xml" );
+ }
+ ProjectBuilderConfiguration config = new
DefaultProjectBuilderConfiguration();
+ config.setLocalRepository(new DefaultArtifactRepository("default",
"", new DefaultRepositoryLayout()));
+ ProfileActivationContext pCtx = new ProfileActivationContext(null,
true);
+
+ config.setExecutionProperties(properties);
+ config.setGlobalProfileManager(new DefaultProfileManager(pCtx));
+ return new PomTestWrapper( pomFile, mavenProjectBuilder.build(
pomFile, config ) );
+ }
private PomTestWrapper buildPom( String pomPath, String... profileIds )
throws Exception
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml?rev=767266&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
Tue Apr 21 19:49:19 2009
@@ -0,0 +1,16 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-21</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml?rev=767266&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
Tue Apr 21 19:49:19 2009
@@ -0,0 +1,20 @@
+<project>
+ <parent>
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin2</artifactId>
+ <version>1.0-alpha-21</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Modified:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml?rev=767266&r1=767265&r2=767266&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
Tue Apr 21 19:49:19 2009
@@ -1,70 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or
more
+ contributor license agreements. See the NOTICE file distributed
with
+ this work for additional information regarding copyright
ownership.
+ The ASF licenses this file to you under the Apache License,
Version
+ 2.0 (the "License"); you may not use this file except in
compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed
under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR
+ CONDITIONS OF ANY KIND, either express or implied. See the
License for
+ the specific language governing permissions and limitations
under the
+ License.
+ -->
<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mng4053</groupId>
- <artifactId>test2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <name>Maven Integration Test :: MNG-4053</name>
- <description>
- Verify that attributes in plugin configuration elements are not
erroneously duplicated to other elements when
- plugin management is used.
- </description>
- <build>
- <!-- NOTE: This test used plugin management for the IT plugin -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-configuration</artifactId>
- <version>2.1-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-configuration</artifactId>
- <version>2.1-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>config</goal>
- </goals>
- <configuration>
- <propertiesFile>target/config.properties</propertiesFile>
- <domParam>
- <copy todir="src" overwrite="true">
- <fileset dir="target"/>
- </copy>
- </domParam>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins
+ </groupId>
+
<artifactId>maven-it-plugin-configuration
+ </artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
Copied:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
(from r766894,
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml?p2=maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml&p1=maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml&r1=766894&r2=767266&rev=767266&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
Tue Apr 21 19:49:19 2009
@@ -20,51 +20,45 @@
-->
<project>
+ <parent>
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.mng4053</groupId>
<artifactId>test2</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-4053</name>
- <description>
- Verify that attributes in plugin configuration elements are not
erroneously duplicated to other elements when
- plugin management is used.
- </description>
-
<build>
- <!-- NOTE: This test used plugin management for the IT plugin -->
- <pluginManagement>
+ <pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-configuration</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-configuration</artifactId>
- <version>2.1-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>config</goal>
- </goals>
- <configuration>
- <propertiesFile>target/config.properties</propertiesFile>
- <domParam>
- <copy todir="src" overwrite="true">
- <fileset dir="target"/>
- </copy>
- </domParam>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 21 19:49:19 2009
@@ -0,0 +1,6 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:739385,741841,747468,747683,748815,749612,766523
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:738757-738972
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml?rev=767266&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
Tue Apr 21 19:49:19 2009
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.it0052</groupId>
+ <artifactId>maven-it-it0052</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: it0052</name>
+ <description>Test that source attachment doesn't take place when
-DperformRelease=true is missing.</description>
+
+ <!-- NOTE: Use stub versions of the core plugins referenced by the build -->
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml?rev=767266&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml
Tue Apr 21 19:49:19 2009
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under
+ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
+ <version>3.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>standard</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly2-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
