brett 2004/02/22 16:45:52
Modified: caller project.xml
deploy project.xml
scm plugin.jelly project.xml
struts project.xml
war plugin.jelly project.xml
war/src/plugin-test project.xml
Log:
add version info to latest as well
Revision Changes Path
1.4 +7 -0 maven-plugins/caller/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/caller/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 16 Nov 2003 15:11:50 -0000 1.3
+++ project.xml 23 Feb 2004 00:45:52 -0000 1.4
@@ -14,6 +14,13 @@
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/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>
1.18 +7 -0 maven-plugins/deploy/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/deploy/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 10 Feb 2004 12:49:42 -0000 1.17
+++ project.xml 23 Feb 2004 00:45:52 -0000 1.18
@@ -15,6 +15,13 @@
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/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>
1.5 +12 -8 maven-plugins/scm/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/scm/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 24 Sep 2003 05:56:36 -0000 1.4
+++ plugin.jelly 23 Feb 2004 00:45:52 -0000 1.5
@@ -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}"
@@ -261,6 +254,17 @@
cvsRsh="${maven.scm.cvs.rsh}"
cvsRoot="${maven.scm.cvs.root}"
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>
1.8 +5 -0 maven-plugins/scm/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/scm/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 22 Nov 2003 00:36:04 -0000 1.7
+++ project.xml 23 Feb 2004 00:45:52 -0000 1.8
@@ -20,6 +20,11 @@
<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>
<tag>HEAD</tag>
1.33 +7 -0 maven-plugins/struts/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/struts/project.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- project.xml 22 Feb 2004 00:51:11 -0000 1.32
+++ project.xml 23 Feb 2004 00:45:52 -0000 1.33
@@ -14,6 +14,13 @@
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/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>
1.34 +14 -0 maven-plugins/war/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/war/plugin.jelly,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plugin.jelly 30 Jan 2004 03:27:33 -0000 1.33
+++ plugin.jelly 23 Feb 2004 00:45:52 -0000 1.34
@@ -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>
+
1.18 +10 -1 maven-plugins/war/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/war/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 10 Feb 2004 12:49:43 -0000 1.17
+++ project.xml 23 Feb 2004 00:45:52 -0000 1.18
@@ -41,7 +41,16 @@
<roles>
<role>Java Developer</role>
</roles>
- </developer>
+ </developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>bporter</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>f2 network</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
</developers>
<dependencies/>
</project>
1.4 +1 -1 maven-plugins/war/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/war/src/plugin-test/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 29 Dec 2003 04:38:07 -0000 1.3
+++ project.xml 23 Feb 2004 00:45:52 -0000 1.4
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
