From ff33436946df4fced070d2f46c3d25e80fccc429 Mon Sep 17 00:00:00 2001 From: vmassol Date: Sun, 2 May 2004 13:46:29 +0000 Subject: [PATCH] - inherit from the plugin-parent/project.xml POM instead of the top level one which is reserved for the master build - removed custom reports as we can now use the default ones from plugin-parent/project.xml git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115169 13f79535-47bb-0310-9956-ffa450edef68 --- ear/announcements/1.4.ann | 22 ---------------------- ear/project.xml | 16 ++++++---------- ear/xdocs/changes.xml | 2 +- 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 ear/announcements/1.4.ann diff --git a/ear/announcements/1.4.ann b/ear/announcements/1.4.ann deleted file mode 100644 index 89e47cca..00000000 --- a/ear/announcements/1.4.ann +++ /dev/null @@ -1,22 +0,0 @@ -The Maven team is pleased to announce the EAR plugin 1.4 release! - -http://maven.apache.org/reference/plugins/ear/ - -The Maven EAR plugin helps with building J2EE EAR files. - -Fixed/changed in this version - -o Introduced ear.module property to mark jars as being java client modules -o The ear.bundle property now just includes the jar in the EAR -o Added to the plugin tests a check to make sure the ear includes the jars marked by - ear.bundle and ear.module and that ear.module generates a java module in the generated - application.xml - -Note that this plugin has been tested with Maven 1.0 rc2 SNAPSHOT. Using it with -another version of Maven is at your own risk! :-) - -You can download and install the EAR plugin by using - -maven -DgroupId=maven -DartifactId=maven-ear-plugin -Dversion=1.4 plugin:download - -Have fun! diff --git a/ear/project.xml b/ear/project.xml index 0e6b7f24..6d406333 100644 --- a/ear/project.xml +++ b/ear/project.xml @@ -19,7 +19,7 @@ --> - ../project.xml + ../plugin-parent/project.xml 3 maven-ear-plugin Maven EAR Plugin @@ -45,6 +45,11 @@ 1.4 MAVEN_EAR_1_4 + + 1.5 + 1.5 + HEAD + @@ -91,13 +96,4 @@ http://jakarta.apache.org/commons/jelly/tags/util/ - - maven-changes-plugin - maven-changelog-plugin - maven-file-activity-plugin - maven-developer-activity-plugin - maven-faq-plugin - maven-license-plugin - maven-linkcheck-plugin - diff --git a/ear/xdocs/changes.xml b/ear/xdocs/changes.xml index 4bfaa62e..89f1eedc 100644 --- a/ear/xdocs/changes.xml +++ b/ear/xdocs/changes.xml @@ -24,7 +24,7 @@ Nathan Coast - + Ignore generated file in plugin test. Check to make sure maven.ear.src exists before using it. Allow resources in EAR projects