diff --git a/war/plugin.properties b/war/plugin.properties index d7fb1eae..7010c78b 100644 --- a/war/plugin.properties +++ b/war/plugin.properties @@ -41,4 +41,5 @@ maven.war.build.dir = ${maven.build.dir} 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 diff --git a/war/project.xml b/war/project.xml index 7ff5da18..2d2bbf3b 100644 --- a/war/project.xml +++ b/war/project.xml @@ -23,7 +23,7 @@ 3 maven-war-plugin Maven WAR Plugin - 1.6 + 1.7-SNAPSHOT War Plugin for Maven War Plugin for Maven http://maven.apache.org/reference/plugins/war/ diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml index ffb3ff09..b84f0ef7 100644 --- a/war/xdocs/changes.xml +++ b/war/xdocs/changes.xml @@ -24,6 +24,11 @@ Vincent Massol + + + Allow use of maven.war.manifest to specify the manifest file location + + preserve last modified time of source files in the exploded webapp Call test:test regardless of whether sources are present as it contains build logic diff --git a/war/xdocs/properties.xml b/war/xdocs/properties.xml index 1b56b04d..87708654 100644 --- a/war/xdocs/properties.xml +++ b/war/xdocs/properties.xml @@ -117,7 +117,7 @@ Yes Location of the MANIFEST.MF file in the source tree. It defaults to - ${pom.build.sourceDirectory}/META-INF/MANIFEST.MF. + ${maven.war.src}/META-INF/MANIFEST.MF.