You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/08 18:39:35 UTC
svn commit: r279580 - in /maven/maven-1/core/trunk/src:
java/org/apache/maven/project/ test/java/org/apache/maven/project/
test/test-data/pom/ test/test-data/pom/extend/
Author: brett
Date: Thu Sep 8 09:39:22 2005
New Revision: 279580
URL: http://svn.apache.org/viewcvs?rev=279580&view=rev
Log:
PR: MAVEN-1640
make id handling more consistent with 1.0.2
Added:
maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-different-ids.xml (with props)
maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-matching-ids.xml (with props)
maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml (with props)
maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml (with props)
maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only.xml (with props)
Modified:
maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java
maven/maven-1/core/trunk/src/test/test-data/pom/dependencies.xml
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java?rev=279580&r1=279579&r2=279580&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java Thu Sep 8 09:39:22 2005
@@ -795,10 +795,10 @@
setShortDescription( parent.getShortDescription() );
}
- if ( model.getGroupId() == null && parent.model.getGroupId() != null )
+ if ( model.getGroupId() == null )
{
// Don't inherit if it was from an id element
- if ( parent.model.getId() == null || !parent.model.getGroupId().equals( parent.model.getId() ) )
+ if ( model.getId() == null || parent.model.getId() == null || !parent.model.getGroupId().equals( parent.model.getId() ) )
{
model.setGroupId( parent.model.getGroupId() );
}
@@ -1419,10 +1419,9 @@
else
{
dependency.setGroupId( id );
- dependency.setArtifactId( id );
}
}
- else if ( dependency.getArtifactId() == null )
+ if ( dependency.getArtifactId() == null )
{
dependency.setArtifactId( dependency.getId() );
}
Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java?rev=279580&r1=279579&r2=279580&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java (original)
+++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java Thu Sep 8 09:39:22 2005
@@ -30,9 +30,10 @@
* @author Brett Porter <a href="mailto:brett@apache.org">brett@apache.org</a>
* @version $Id$
*/
-public class LegacyIdTest extends TestCase
+public class LegacyIdTest
+ extends TestCase
{
- /**
+ /**
* Test for legacyToStandardId
*/
public void testLegacyToStandardId()
@@ -40,22 +41,19 @@
// test 'ant' -> 'ant:ant'
String legacyId = "ant";
String standardId = "ant:ant";
- assertEquals("Single id conversion failed", standardId,
- Project.legacyToStandardId(legacyId));
-
+ assertEquals( "Single id conversion failed", standardId, Project.legacyToStandardId( legacyId ) );
+
// test 'ant:ant' unchanged
- legacyId = "ant:ant";
- assertEquals("Standard id conversion failed", standardId,
- Project.legacyToStandardId(legacyId));
+ legacyId = "ant:ant";
+ assertEquals( "Standard id conversion failed", standardId, Project.legacyToStandardId( legacyId ) );
// test 'ant+optional' -> ant:ant-optional
legacyId = "ant+optional";
standardId = "ant:ant-optional";
- assertEquals("Plus format id conversion failed", standardId,
- Project.legacyToStandardId(legacyId));
+ assertEquals( "Plus format id conversion failed", standardId, Project.legacyToStandardId( legacyId ) );
}
- /**
+ /**
* Test for legacyToDependencyKey
*/
public void testLegacyToDependencyId()
@@ -68,43 +66,36 @@
// test 'ant' -> 'ant:ant:jar'
String legacyId = "ant";
String standardId = "ant:ant:jar";
- assertEquals("Single id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
-
+ assertEquals( "Single id conversion failed", standardId, project.legacyToDependencyKey( legacyId ) );
+
// test 'ant:ant' -> 'ant:ant:jar'
- legacyId = "ant:ant";
- assertEquals("Standard id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ legacyId = "ant:ant";
+ assertEquals( "Standard id conversion failed", standardId, project.legacyToDependencyKey( legacyId ) );
// test 'ant+optional' -> ant:ant-optional:jar
legacyId = "ant+optional";
standardId = "ant:ant-optional:jar";
- assertEquals("Plus format id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ assertEquals( "Plus format id conversion failed", standardId, project.legacyToDependencyKey( legacyId ) );
// test 'ant:ant:jar' unchanged
- legacyId = "ant:ant:jar";
+ legacyId = "ant:ant:jar";
standardId = "ant:ant:jar";
- assertEquals("Standard id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ assertEquals( "Standard id conversion failed", standardId, project.legacyToDependencyKey( legacyId ) );
// test 'ant:ant:tld' unchanged
- legacyId = "ant:ant:tld";
+ legacyId = "ant:ant:tld";
standardId = "ant:ant:tld";
- assertEquals("Standard id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ assertEquals( "Standard id conversion failed", standardId, project.legacyToDependencyKey( legacyId ) );
// test 'ant:ant-windows' gets correct one
legacyId = "ant:ant-windows";
standardId = "ant:ant-windows:dll";
- assertEquals("Standard id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ assertEquals( "Standard id conversion failed", standardId, project.legacyToDependencyKey( legacyId ) );
// test 'ant:ant-windows:dll' unchanged
legacyId = "ant:ant-windows:dll";
standardId = "ant:ant-windows:dll";
- assertEquals("Standard id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ assertEquals( "Standard id conversion failed", standardId, project.legacyToDependencyKey( legacyId ) );
}
private static void addDependency( Project project, String groupId, String artifactId, String type )
@@ -118,94 +109,140 @@
project.addDependency( dep );
}
- public void testIdOnly() throws Exception
+ public void testIdOnly()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/test-id-only.xml" ) );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ), "src/test/test-data/pom/test-id-only.xml" ) );
assertEquals( "check id", "artifactId:artifactId", p.getId() );
assertEquals( "check artifact id", "artifactId", p.getArtifactId() );
assertEquals( "check group id", "artifactId", p.getGroupId() );
assertEquals( "check id", "artifactId:artifactId", p.getId() );
}
-
- public void testGroupIdAndArtifactId() throws Exception
+
+ public void testGroupIdAndArtifactId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/test-group-id-and-artifact-id.xml" ) );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ), "src/test/test-data/pom/test-group-id-and-artifact-id.xml" ) );
assertEquals( "check id", "groupId:artifactId", p.getId() );
assertEquals( "check artifact id", "artifactId", p.getArtifactId() );
assertEquals( "check group id", "groupId", p.getGroupId() );
assertEquals( "check id", "groupId:artifactId", p.getId() );
}
-
- public void testGroupIdAndIdAsArtifactId() throws Exception
+
+ public void testGroupIdAndIdAsArtifactId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/test-group-id-and-id-as-artifact-id.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
+ "src/test/test-data/pom/test-group-id-and-id-as-artifact-id.xml" ) );
assertEquals( "check id", "groupId:artifactId", p.getId() );
assertEquals( "check artifact id", "artifactId", p.getArtifactId() );
assertEquals( "check group id", "groupId", p.getGroupId() );
assertEquals( "check id", "groupId:artifactId", p.getId() );
}
-
- public void testExtendNone() throws Exception
+
+ public void testExtendNone()
+ throws Exception
+ {
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ), "src/test/test-data/pom/extend/test-none.xml" ) );
+ assertEquals( "check group id", "base-groupId", p.getGroupId() );
+ }
+
+ public void testExtendIdOnly()
+ throws Exception
+ {
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ), "src/test/test-data/pom/extend/test-id-only.xml" ) );
+ assertEquals( "check id", "base-groupId:extend-artifactId", p.getId() );
+ assertEquals( "check artifact id", "extend-artifactId", p.getArtifactId() );
+ assertEquals( "check group id", "base-groupId", p.getGroupId() );
+ assertEquals( "check id", "base-groupId:extend-artifactId", p.getId() );
+ }
+
+ public void testExtendArtifactIdOnly()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/extend/test-none.xml" ) );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ), "src/test/test-data/pom/extend/test-artifact-id-only.xml" ) );
+ assertEquals( "check id", "base-groupId:extend-artifactId", p.getId() );
+ assertEquals( "check artifact id", "extend-artifactId", p.getArtifactId() );
assertEquals( "check group id", "base-groupId", p.getGroupId() );
+ assertEquals( "check id", "base-groupId:extend-artifactId", p.getId() );
+ }
+
+ public void testExtendArtifactIdOnlyOverMatching()
+ throws Exception
+ {
+ Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
+ "src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml" ) );
+ assertEquals( "check id", "base-id:extend-artifactId", p.getId() );
+ assertEquals( "check artifact id", "extend-artifactId", p.getArtifactId() );
+ assertEquals( "check group id", "base-id", p.getGroupId() );
+ assertEquals( "check id", "base-id:extend-artifactId", p.getId() );
}
-
- public void testExtendIdOnly() throws Exception
+
+ public void testExtendArtifactIdOnlyOverDifferent()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/extend/test-id-only.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
+ "src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml" ) );
assertEquals( "check id", "base-groupId:extend-artifactId", p.getId() );
assertEquals( "check artifact id", "extend-artifactId", p.getArtifactId() );
assertEquals( "check group id", "base-groupId", p.getGroupId() );
assertEquals( "check id", "base-groupId:extend-artifactId", p.getId() );
}
-
- public void testExtendIdOverrideGroupId() throws Exception
+
+ public void testExtendIdOverrideGroupId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/extend/test-id-override-groupid.xml" ) );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ), "src/test/test-data/pom/extend/test-id-override-groupid.xml" ) );
assertEquals( "check id", "extend-artifactId:extend-artifactId", p.getId() );
assertEquals( "check artifact id", "extend-artifactId", p.getArtifactId() );
assertEquals( "check group id", "extend-artifactId", p.getGroupId() );
assertEquals( "check id", "extend-artifactId:extend-artifactId", p.getId() );
}
-
- public void testExtendGroupIdAndArtifactId() throws Exception
+
+ public void testExtendGroupIdAndArtifactId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/extend/test-group-id-and-artifact-id.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
+ "src/test/test-data/pom/extend/test-group-id-and-artifact-id.xml" ) );
assertEquals( "check id", "extend-groupId:extend-artifactId", p.getId() );
assertEquals( "check artifact id", "extend-artifactId", p.getArtifactId() );
assertEquals( "check group id", "extend-groupId", p.getGroupId() );
assertEquals( "check id", "extend-groupId:extend-artifactId", p.getId() );
}
-
- public void testExtendGroupIdAndIdAsArtifactId() throws Exception
+
+ public void testExtendGroupIdAndIdAsArtifactId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/extend/test-group-id-and-id-as-artifact-id.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
+ "src/test/test-data/pom/extend/test-group-id-and-id-as-artifact-id.xml" ) );
assertEquals( "check id", "extend-groupId:extend-artifactId", p.getId() );
assertEquals( "check artifact id", "extend-artifactId", p.getArtifactId() );
assertEquals( "check group id", "extend-groupId", p.getGroupId() );
assertEquals( "check id", "extend-groupId:extend-artifactId", p.getId() );
}
- public void testDependencies() throws Exception
+ public void testDependencies()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/dependencies.xml" ) );
- assertEquals( "check id", "ant:ant", p.getDependency("ant:ant").getId() );
- assertEquals( "check id with +", "ant:ant-optional", p.getDependency("ant:ant-optional").getId() );
- assertEquals( "check id with -", "ant-optional:ant-optional", p.getDependency("ant-optional:ant-optional").getId() );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ), "src/test/test-data/pom/dependencies.xml" ) );
+ assertEquals( "check id", "ant:ant", p.getDependency( "ant:ant" ).getId() );
+ assertEquals( "check id with +", "ant:ant-optional", p.getDependency( "ant:ant-optional" ).getId() );
+ assertEquals( "check id with -", "ant-optional:ant-optional",
+ p.getDependency( "ant-optional:ant-optional" ).getId() );
+ assertEquals( "check id with id and artifactId", "groupId:artifactId",
+ p.getDependency( "groupId:artifactId" ).getId() );
}
/**
* Generate the test suite.
+ *
* @return the test suite
*/
public static Test suite()
Modified: maven/maven-1/core/trunk/src/test/test-data/pom/dependencies.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/test-data/pom/dependencies.xml?rev=279580&r1=279579&r2=279580&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/test/test-data/pom/dependencies.xml (original)
+++ maven/maven-1/core/trunk/src/test/test-data/pom/dependencies.xml Thu Sep 8 09:39:22 2005
@@ -41,5 +41,10 @@
<classloader>root</classloader>
</properties>
</dependency>
+ <dependency>
+ <id>groupId</id>
+ <artifactId>artifactId</artifactId>
+ <version>version</version>
+ </dependency>
</dependencies>
</project>
Added: maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-different-ids.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-different-ids.xml?rev=279580&view=auto
==============================================================================
--- maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-different-ids.xml (added)
+++ maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-different-ids.xml Thu Sep 8 09:39:22 2005
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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>
+ <groupId>base-groupId</groupId>
+ <id>base-artifactId</id>
+ <name>Test Project</name>
+</project>
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-different-ids.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-different-ids.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-matching-ids.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-matching-ids.xml?rev=279580&view=auto
==============================================================================
--- maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-matching-ids.xml (added)
+++ maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-matching-ids.xml Thu Sep 8 09:39:22 2005
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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>
+ <groupId>base-id</groupId>
+ <id>base-id</id>
+ <name>Test Project</name>
+</project>
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-matching-ids.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-matching-ids.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml?rev=279580&view=auto
==============================================================================
--- maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml (added)
+++ maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml Thu Sep 8 09:39:22 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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>
+ <extend>base-different-ids.xml</extend>
+ <artifactId>extend-artifactId</artifactId>
+</project>
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml?rev=279580&view=auto
==============================================================================
--- maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml (added)
+++ maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml Thu Sep 8 09:39:22 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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>
+ <extend>base-matching-ids.xml</extend>
+ <artifactId>extend-artifactId</artifactId>
+</project>
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only.xml?rev=279580&view=auto
==============================================================================
--- maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only.xml (added)
+++ maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only.xml Thu Sep 8 09:39:22 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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>
+ <extend>base.xml</extend>
+ <artifactId>extend-artifactId</artifactId>
+</project>
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org