- inherit from the plugin-parent/project.xml POM instead of the top level one which is reserved for the master build

- removed custom reports as we can now use the default ones from plugin-parent/project.xml


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115168 13f79535-47bb-0310-9956-ffa450edef68

artifact/project.xml

@@ -19,7 +19,7 @@
  -->
 
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-artifact-plugin</id>
   <name>Maven Artifact Plug-in</name>
@@ -104,12 +104,4 @@
       <type>jar</type>
     </dependency>
   </dependencies>
-  <reports>
-    <report>maven-changes-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-  </reports>
 </project>

ashkelon/project.xml

@@ -19,7 +19,7 @@
  -->
 
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-ashkelon-plugin</id>
   <name>Maven Ashkelon Plug-in</name>
@@ -85,12 +85,4 @@
       <version>2.0.7</version>
     </dependency>
   </dependencies>
-  <reports>
-    <report>maven-changes-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-  </reports>
 </project>

aspectj/project.xml

@@ -19,7 +19,7 @@
  -->
 
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-aspectj-plugin</id>
   <name>Maven AspectJ Plug-in</name>
@@ -92,12 +92,4 @@
       </properties>
     </dependency>
   </dependencies>
-  <reports>
-    <report>maven-changes-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-  </reports>
 </project>

aspectwerkz/project.xml

@@ -19,7 +19,7 @@
  -->
 
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-aspectwerkz-plugin</id>
   <name>Maven AspectWerkz Plug-in</name>
@@ -121,13 +121,4 @@
       <version>2.4.0</version>
     </dependency>
   </dependencies>
-  <reports>
-    <report>maven-changes-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-  </reports>
 </project>

caller/project.xml

@@ -19,7 +19,7 @@
  -->
 
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-caller-plugin</id>
   <name>Maven Caller Plugin</name>

castor/announcements/1.1.ann

@@ -1,24 +0,0 @@
-The Maven team is pleased to announce the Castor plugin 1.1 release!
-
-http://maven.apache.org/reference/plugins/castor/
-
-A plugin for providing access to Castor from Maven
-
-User-visible changes in this version:
-
-- the directory containing a customised castorbuilder.properties
-  file may now be specified via the property 'maven.castor.properties.dir',
-  to configure source code generation
-- updates the castor jar dependency from 0.9.4.3 to 0.9.5
-
-Note that this plugin has been tested with Maven 1.0 rc1.
-Using it with another version of Maven is at your own risk!
-
-You can install the plugin with Maven 1.0 rc1 or later using:
-maven -DgroupId=maven -DartifactId=maven-castor-plugin -Dversion=1.1  plugin:download
-
-You can download the plugin here:
-http://www.ibiblio.org/maven/maven/plugins/maven-castor-plugin-1.1.jar
-
-Have fun!
--dIon

castor/project.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,9 +18,8 @@
  */
  -->
 
-
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-castor-plugin</id>
   <name>Maven Castor Plug-in</name>
@@ -40,6 +40,11 @@
       <name>1.1</name>
       <tag>MAVEN_CASTOR_1_1</tag>
     </version>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>HEAD</tag>
+    </version>
   </versions>
   <developers>
     <developer>

castor/xdocs/changes.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -24,6 +25,8 @@
   </properties>
 
   <body>
+    <release version="1.2-SNAPSHOT" date="in CVS">
+    </release>
     <release version="1.1" date="2004-02-04">
       <action dev="tima" type="add">
         Added <em>maven.castor.properties.dir</em> property.
@@ -32,7 +35,6 @@
         Updated to castor 0.9.5
       </action>
     </release>
-
     <release version="1.0" date="2002-08-04">
       <action dev="jvanzyl" type="add">
         Original release for Maven 1.0-beta8

changes/project.xml

@@ -19,7 +19,7 @@
  -->
 
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-changes-plugin</id>
   <name>Maven Changes Plug-in</name>
@@ -94,13 +94,4 @@
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
   </dependencies>
-  <reports>
-    <report>maven-changes-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-  </reports>
 </project>

clover/project.xml

@@ -19,7 +19,7 @@
  -->
 
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-clover-plugin</id>
   <name>Maven Clover plugin</name>
@@ -109,13 +109,4 @@
       </properties>
     </dependency>
   </dependencies>
-  <reports>
-    <report>maven-changes-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-  </reports>
 </project>

clover/xdocs/changes.xml

@@ -28,7 +28,7 @@
 
   <body>
 
-    <release version="1.5" date="in CVS">
+    <release version="1.5-SNAPSHOT" date="in CVS">
 	    <action dev="vmassol" type="fix">
 	      Do not execute Clover if there are no tests to run Clover on. This
 	      prevents an error happening in the <code>clover:on</code> goal.

codeswitcher/project.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,9 +18,8 @@
  */
  -->
 
-
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-codeswitcher-plugin</id>
   <name>Maven CodeSwitcher Plugin</name>
@@ -41,6 +41,11 @@
       <name>1.1</name>
       <tag>MAVEN_CODESWITCHER_1_1</tag>
     </version>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>HEAD</tag>
+    </version>
   </versions>
   <developers>
     <developer>

codeswitcher/xdocs/changes.xml

@@ -24,12 +24,13 @@
   </properties>
 
   <body>
+    <release version="1.2-SNAPSHOT" date="in CVS">
+    </release>
     <release version="1.1" date="2003-09-29">
       <action dev="dion" type="update">
         update to commons-lang 1.0.1
       </action>
     </release>
-    
     <release version="1.0" date="2002-08-04">
       <action dev="jvanzyl" type="add">
         Original release for Maven 1.0-beta8

console/project.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,9 +18,8 @@
  */
  -->
 
-
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-console-plugin</id>
   <name>Maven Console Plug-in</name>
@@ -41,6 +41,11 @@
       <name>1.0</name>
       <tag>MAVEN_CONSOLE_1_0</tag>
     </version>
+    <version>
+      <id>1.1</id>
+      <name>1.1</name>
+      <tag>HEAD</tag>
+    </version>
   </versions>
   <developers>
     <developer>

cruisecontrol/project.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,9 +18,8 @@
  */
  -->
 
-
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <id>maven-cruisecontrol-plugin</id>
   <name>Maven Cruise Control Plug-in</name>
   <currentVersion>1.2-SNAPSHOT</currentVersion>
@@ -32,6 +32,18 @@
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/cruisecontrol/</developerConnection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/cruisecontrol/</url>
   </repository>
+  <versions>
+    <version>
+      <id>1.1</id>
+      <name>1.1</name>
+      <tag>MAVEN_CRUISECONTROL_1_1</tag>
+    </version>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>HEAD</tag>
+    </version>
+  </versions>
   <developers>
     <developer>
       <name>Brett Porter</name>
@@ -58,11 +70,4 @@
       <url>http://jakarta.apache.org/commons/jelly/libs/jsl/</url>
     </dependency>
   </dependencies>
-  <versions>
-    <version>
-      <id>1.1</id>
-      <name>1.1</name>
-      <tag>MAVEN_CRUISECONTROL_1_1</tag>
-    </version>
-  </versions>
 </project>