You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2004/06/19 10:46:59 UTC
cvs commit: maven-plugins/war project.xml plugin.properties
dion 2004/06/19 01:46:59
Modified: war/xdocs properties.xml changes.xml
war project.xml plugin.properties
Log:
Fix for MPWAR-22.
Fix typo in plugin.properties and document common location of the manifest file
Revision Changes Path
1.12 +1 -1 maven-plugins/war/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/war/xdocs/properties.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- properties.xml 31 Mar 2004 06:11:53 -0000 1.11
+++ properties.xml 19 Jun 2004 08:46:59 -0000 1.12
@@ -117,7 +117,7 @@
<td>Yes</td>
<td>
Location of the MANIFEST.MF file in the source tree. It defaults to
- <code>${pom.build.sourceDirectory}/META-INF/MANIFEST.MF</code>.
+ <code>${maven.war.src}/META-INF/MANIFEST.MF</code>.
</td>
</tr>
<tr>
1.27 +5 -0 maven-plugins/war/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/war/xdocs/changes.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- changes.xml 12 May 2004 13:59:00 -0000 1.26
+++ changes.xml 19 Jun 2004 08:46:59 -0000 1.27
@@ -24,6 +24,11 @@
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
+ <release version="1.7-SNAPSHOT" date="in CVS">
+ <action dev="dion" type="fix" issue="MPWAR-22">
+ Allow use of maven.war.manifest to specify the manifest file location
+ </action>
+ </release>
<release version="1.6" date="2004-05-12">
<action dev="brett" type="fix" issue="MPWAR-25">preserve last modified time of source files in the exploded webapp</action>
<action dev="brett" type="fix" issue="MPWAR-1">Call test:test regardless of whether sources are present as it contains build logic</action>
1.26 +1 -1 maven-plugins/war/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/war/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 12 May 2004 13:59:00 -0000 1.25
+++ project.xml 19 Jun 2004 08:46:59 -0000 1.26
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-war-plugin</id>
<name>Maven WAR Plugin</name>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.7-SNAPSHOT</currentVersion>
<description>War Plugin for Maven</description>
<shortDescription>War Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/war/</url>
1.11 +2 -1 maven-plugins/war/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/war/plugin.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.properties 31 Mar 2004 04:35:30 -0000 1.10
+++ plugin.properties 19 Jun 2004 08:46:59 -0000 1.11
@@ -41,4 +41,5 @@
maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
maven.war.tld.dir=WEB-INF/tld
-maven.jar.manifest=${pom.build.sourceDirectory}/META-INF/MANIFEST.MF
\ No newline at end of file
+# Location of the manifest file to be used
+maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org