From 1bfc57a3394e55a0e62357f44a63bc9424ee5219 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 23 Feb 2004 00:45:52 +0000
Subject: [PATCH] add version info to latest as well

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114732 13f79535-47bb-0310-9956-ffa450edef68
---
 caller/project.xml              |  7 +++++++
 deploy/project.xml              |  7 +++++++
 scm/plugin.jelly                | 20 ++++++++++++--------
 scm/project.xml                 |  5 +++++
 struts/project.xml              |  7 +++++++
 war/plugin.jelly                | 14 ++++++++++++++
 war/project.xml                 | 11 ++++++++++-
 war/src/plugin-test/project.xml |  2 +-
 8 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/caller/project.xml b/caller/project.xml
index 180c789a..0d616e2e 100644
--- a/caller/project.xml
+++ b/caller/project.xml
@@ -14,6 +14,13 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/caller/</connection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/caller/</url>
   </repository>
+  <versions>
+    <version>
+      <id>1.0</id>
+      <name>1.0</name>
+      <tag>MAVEN_CALLER_1_0</tag>
+    </version>
+  </versions>
   <developers>
     <developer>
       <name>Vincent Massol</name>
diff --git a/deploy/project.xml b/deploy/project.xml
index 888795d1..bace1ce3 100644
--- a/deploy/project.xml
+++ b/deploy/project.xml
@@ -15,6 +15,13 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/deploy/</connection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/deploy/</url>
   </repository>
+  <versions>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>MAVEN_DEPLOY_1_2</tag>
+    </version>
+  </versions>
   <developers>
     <developer>
       <name>Stéphane Mor</name>
diff --git a/scm/plugin.jelly b/scm/plugin.jelly
index b6972688..9b5e404d 100644
--- a/scm/plugin.jelly
+++ b/scm/plugin.jelly
@@ -240,14 +240,7 @@
       />
     <ant:move file="temp_project.xml" tofile="project.xml" />
     <log:info>Modifying POM with tag = ${tag_name}; version = ${version_name}</log:info>
-    <doc:jslFile
-      input="${basedir}/project.xml"
-      output="${basedir}/project.xml"
-      stylesheet="${plugin.resources}/pom-release.jsl"
-      outputMode="xml"
-      omitXmlDeclaration="false"
-      prettyPrint="false"
-      />
+    <attainGoal name="scm:update-pom" />
     <log:info>Committing new POM</log:info>
     <ant:cvs command="commit -m '[maven-scm] prepare a release' project.xml"
       quiet="${maven.scm.cvs.quiet}"
@@ -263,5 +256,16 @@
       failonerror="true"
       />
   </goal>
+
+  <goal name="scm:update-pom">
+    <doc:jslFile
+      input="${basedir}/project.xml"
+      output="${basedir}/project.xml"
+      stylesheet="${plugin.resources}/pom-release.jsl"
+      outputMode="xml"
+      omitXmlDeclaration="false"
+      prettyPrint="false"
+      />
+  </goal>
 </project>
 
diff --git a/scm/project.xml b/scm/project.xml
index 6636fe43..a93b8b4c 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -19,6 +19,11 @@
       <name>1.0</name>
       <tag>MAVEN_SCM_1_0</tag>
     </version>
+    <version>
+      <id>1.1</id>
+      <name>1.1</name>
+      <tag>MAVEN_SCM_1_1</tag>
+    </version>
     <version>
       <id>SNAPSHOT</id>
       <name>SNAPSHOT</name>
diff --git a/struts/project.xml b/struts/project.xml
index 46238532..ccad4fb7 100644
--- a/struts/project.xml
+++ b/struts/project.xml
@@ -14,6 +14,13 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/struts/</connection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/struts/</url>
   </repository>
+  <versions>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>MAVEN_STRUTS_1_2</tag>
+    </version>
+  </versions>
   <developers>
     <developer>
       <name>dIon Gillard</name>
diff --git a/war/plugin.jelly b/war/plugin.jelly
index 4af713a7..41d561e9 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -128,6 +128,11 @@
         <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>
       </j:if>  
       <!-- END OF TO BE REMOVED -->
+
+      <j:set var="targetPath" value="${dep.getProperty('war.target.path')}"/> 
+      <j:if test="${!empty(targetPath)}">
+        <ant:copy todir="${maven.war.webapp.dir}/${targetPath}" file="${lib.path}"/>
+      </j:if>
     </j:forEach>            
 
     <util:available file="${maven.build.dest}">
@@ -210,6 +215,14 @@
       <ant:delete file="${maven.war.build.dir}/${maven.war.final.name}" quiet="true" failonerror="false"/>          
     </goal>
     
+  <!--==================================================================-->
+  <!-- In-place deployment of the web application                       -->
+  <!--==================================================================-->  
+  <goal name="war:inplace"
+    description="Deploy a webapp into maven.war.src - in particular setting up WEB-INF/lib and WEB-INF/classes">
+    <j:set var="maven.war.webapp.dir" value="${maven.war.src}"/>
+    <attainGoal name="war:webapp"/>
+  </goal> 
 
   <!--==================================================================-->
   <!-- Special no-op goal which can be used by other plugin which need  -->
@@ -219,3 +232,4 @@
   <goal name="war:load"/>
 
 </project>
+
diff --git a/war/project.xml b/war/project.xml
index 2262e2d3..a315e8fa 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -41,7 +41,16 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>
+    </developer>    
+    <developer>
+      <name>Brett Porter</name>
+      <id>bporter</id>
+      <email>brett@apache.org</email>
+      <organization>f2 network</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>    
   </developers>
   <dependencies/>
 </project>
diff --git a/war/src/plugin-test/project.xml b/war/src/plugin-test/project.xml
index d805fbf7..0106be3c 100644
--- a/war/src/plugin-test/project.xml
+++ b/war/src/plugin-test/project.xml
@@ -13,7 +13,7 @@
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
 
-  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <currentVersion>1.0</currentVersion>
   <!-- details about the organization that 'owns' the project -->
 
   <organization>