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

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

jar/announcements/1.1.ann

@@ -1,19 +0,0 @@
-The Maven team is pleased to announce the Jar plugin 1.1 release!
-
-http://maven.apache.org/reference/plugins/jar/index.html
-
-The Maven Jar plugin is a core plugin of Maven that assists in creating jar files.
-
-This release is a bug fix release to allow users of Maven 1.0-beta10 to update their local
-installation. The default for creating a jar index is now false.
-
-Changes in this version:
-o Added maven.jar.index property
-o Upgrade to velocity 1.4-dev
-
-
-You can download the Jar plugin here:
-http://www.ibiblio.org/maven/maven/plugins/maven-jar-plugin-1.1.jar
-
-Have fun!
--dIon

jar/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-jar-plugin</id>
   <name>Maven Jar Plug-in</name>
@@ -34,6 +34,18 @@
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/jar</developerConnection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/jar/</url>
   </repository>
+  <versions>
+    <version>
+      <id>1.4</id>
+      <name>1.4</name>
+      <tag>MAVEN_JAR_1_4</tag>
+    </version>
+    <version>
+      <id>1.5</id>
+      <name>1.5</name>
+      <tag>HEAD</tag>
+    </version>
+  </versions>
   <developers/>
   <dependencies>
     <dependency>
@@ -47,11 +59,4 @@
       <version>1.4-dev</version>
     </dependency>
   </dependencies>
-  <versions>
-    <version>
-      <id>1.4</id>
-      <name>1.4</name>
-      <tag>MAVEN_JAR_1_4</tag>
-    </version>
-  </versions>
 </project>

jar/xdocs/changes.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +18,6 @@
  */
  -->
 
-
 <document>
   <properties>
     <title>Changes</title>