diff --git a/war/project.xml b/war/project.xml index e8daa565..532e9d80 100644 --- a/war/project.xml +++ b/war/project.xml @@ -1,4 +1,4 @@ - + - - + ../plugins-parent/project.xml 3 maven-war-plugin Maven WAR Plugin - 1.6.2-SNAPSHOT + 1.6.2 War Plugin for Maven War Plugin for Maven @@ -43,6 +41,11 @@ 1.6.1 MAVEN_WAR_1_6_1 + + 1.6.2 + 1.6.2 + MAVEN_WAR_1_6_2 + diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml index 6ae9cb57..4b8089cb 100644 --- a/war/xdocs/changes.xml +++ b/war/xdocs/changes.xml @@ -17,21 +17,24 @@ * limitations under the License. */ --> - Changes Vincent Massol - + Manifest file is now generated properly. Aded the ability to customize the Class-Path entry of the manifest - Added property maven.war.resources.overwrite to control is resources overwrites the ones in the generated webapp directory. + Added property + maven.war.resources.overwriteto control is resources overwrites the ones in the generated webapp directory. + Added ability to expand properties when copying war resources. Updated wrong documentation regarding web.xml filtering. Now filtering when copying resources. - Added property maven.war.webxml.overwrite to control if the source web.xml overwrite the one in the generated webapp directory. + Added property + maven.war.webxml.overwriteto control if the source web.xml overwrite the one in the generated webapp directory. + Fixed confusing documentation regarding maven.war.classes.includes and excludes properties License file is now added properly to the generated war Remove reference to unused caller tag library to suppress warning