Author: jvanzyl
Date: Wed Oct 25 06:41:43 2006
New Revision: 467652
URL: http://svn.apache.org/viewvc?view=rev&rev=467652
Log:
o lots of fixes that I missed because I fixed the copy and not the source
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0040/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0041/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml
Wed Oct 25 06:41:43 2006
@@ -1,7 +1,7 @@
<model>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-core-it0012-child-project</artifactId>
+ <artifactId>child-project</artifactId>
<packaging>jar</packaging>
<version>3.0.3</version>
<build>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
Wed Oct 25 06:41:43 2006
@@ -1,7 +1,7 @@
<model>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.it0039</groupId>
- <artifactId>maven-core-it0039-p1</artifactId>
+ <artifactId>maven-it-it0039-p1</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<dependencies>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
Wed Oct 25 06:41:43 2006
@@ -1,7 +1,7 @@
<model>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.it0039</groupId>
- <artifactId>maven-core-it0039-p1</artifactId>
+ <artifactId>maven-it-it0039-p1</artifactId>
<packaging>jar</packaging>
<version>1.0</version>
<dependencies>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
Wed Oct 25 06:41:43 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.it0000;
+package org.apache.maven.it0039;
public class Person
{
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
Wed Oct 25 06:41:43 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.it0000;
+package org.apache.maven.it0039;
import junit.framework.TestCase;
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
Wed Oct 25 06:41:43 2006
@@ -1,7 +1,7 @@
<model>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.it0039</groupId>
- <artifactId>maven-core-it0039-p2</artifactId>
+ <artifactId>maven-it-it0039-p2</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<dependencies>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
Wed Oct 25 06:41:43 2006
@@ -1,7 +1,7 @@
<model>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.it0039</groupId>
- <artifactId>maven-core-it0039-p2</artifactId>
+ <artifactId>maven-it-it0039-p2</artifactId>
<packaging>jar</packaging>
<version>1.0</version>
<dependencies>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
Wed Oct 25 06:41:43 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.it0000;
+package org.apache.maven.it0039;
public class Person2
{
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
Wed Oct 25 06:41:43 2006
@@ -1,4 +1,4 @@
-package it0039.project2.src.test.java.org.apache.maven.it0039;
+package org.apache.maven.it0039;
import junit.framework.TestCase;
@@ -7,7 +7,7 @@
{
public void testPerson()
{
- Person person = new Person();
+ Person2 person = new Person2();
person.setName( "foo" );
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0040/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0040/pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0040/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0040/pom.xml
Wed Oct 25 06:41:43 2006
@@ -4,7 +4,7 @@
<groupId>org.apache.maven.its.it0040</groupId>
<artifactId>maven-it-it0040</artifactId>
<description>Test the use of a packaging from a plugin</description>
- <packaging>coreit-packaging</packaging>
+ <packaging>it-packaging</packaging>
<version>1.0</version>
<build>
<plugins>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0041/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0041/pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0041/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0041/pom.xml
Wed Oct 25 06:41:43 2006
@@ -10,7 +10,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core-it-support</artifactId>
<version>1.2</version>
- <type>coreit-artifact</type>
+ <type>it-artifact</type>
</dependency>
</dependencies>
<build>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
Wed Oct 25 06:41:43 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.it00065;
+package org.apache.maven.it0065;
import junit.framework.TestCase;
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml
Wed Oct 25 06:41:43 2006
@@ -9,14 +9,14 @@
<version>1.0</version>
<dependencies>
<dependency>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>maven-it0077-sub1</artifactId>
+ <groupId>org.apache.maven.its.it0077</groupId>
+ <artifactId>sub1</artifactId>
<version>1.0</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>maven-it0077-sub1</artifactId>
+ <groupId>org.apache.maven.its.it0077</groupId>
+ <artifactId>sub1</artifactId>
<type>test-jar</type>
<version>1.0</version>
<scope>test</scope>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml?view=diff&rev=467652&r1=467651&r2=467652
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
Wed Oct 25 06:41:43 2006
@@ -5,9 +5,7 @@
<groupId>org.apache.maven.its.it0082</groupId>
<version>0.1</version>
</parent>
-
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-core-it-plugin</artifactId>
+ <artifactId>test-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.0-SNAPSHOT</version>
<name>Test Plugin</name>
