diff --git a/war/plugin.jelly b/war/plugin.jelly index fbf57161..b751ea5e 100644 --- a/war/plugin.jelly +++ b/war/plugin.jelly @@ -39,9 +39,7 @@ - - - + diff --git a/war/project.xml b/war/project.xml index 3e8507e0..ac260ad5 100644 --- a/war/project.xml +++ b/war/project.xml @@ -35,11 +35,6 @@ http://cvs.apache.org/viewcvs/maven-plugins/war/ - - 1.5 - 1.5 - HEAD - 1.5 1.5 @@ -69,7 +64,7 @@ Brett Porter - bporter + brett brett@apache.org f2 network diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml index f025d2da..f7a1cfaf 100644 --- a/war/xdocs/changes.xml +++ b/war/xdocs/changes.xml @@ -25,6 +25,7 @@ + Call test:test regardless of whether sources are present as it contains build logic Remove extra call to java:compile Allow automated generation of manifest Class-Path Allow customizing of MANIFEST.MF @@ -35,8 +36,8 @@ Use the new callerplugin to isolate the java compilation goal called from its implementation. - Add war:inplace goal for building the webapp into maven.war.src. You should cvsignore WEB-INF/lib and WEB-INF/classes - Add target path to dependencies so you can copy to elsewhere than WEB-INF/lib. Useful for applets. + Add war:inplace goal for building the webapp into maven.war.src. You should cvsignore WEB-INF/lib and WEB-INF/classes + Add target path to dependencies so you can copy to elsewhere than WEB-INF/lib. Useful for applets. Apply MAVEN-831. Copy web.xml as specified by ${maven.war.webxml}