diff --git a/ear/plugin.jelly b/ear/plugin.jelly index dc52a4c9..f1e23dba 100644 --- a/ear/plugin.jelly +++ b/ear/plugin.jelly @@ -72,12 +72,12 @@ - Building EAR ${maven.final.name} with appxml "${finalAppxml}" + Building EAR ${maven.ear.final.name} with appxml "${finalAppxml}" - @@ -233,7 +233,7 @@ description="Install the ear in the local repository"> @@ -247,7 +247,7 @@ description="Install the snapshot version of the ear in the local repository"> @@ -261,7 +261,7 @@ description="Deploys the ear to the remote repository"> @@ -275,7 +275,7 @@ description="Deploys the snapshot version of the ear to remote repository"> diff --git a/ear/plugin.properties b/ear/plugin.properties index f26190d6..dc09d5fc 100644 --- a/ear/plugin.properties +++ b/ear/plugin.properties @@ -32,3 +32,5 @@ maven.ear.displayname=${pom.artifactId} maven.ear.appxml.version=1.3 maven.ear.resources=${maven.build.dir}/ear maven.ear.appxml.encoding=UTF-8 +# Name of generated EAR file +maven.ear.final.name=${maven.final.name}.ear diff --git a/ear/src/plugin-test/appXmlBundledTest/maven.xml b/ear/src/plugin-test/appXmlBundledTest/maven.xml index 120721d0..90d3be7c 100644 --- a/ear/src/plugin-test/appXmlBundledTest/maven.xml +++ b/ear/src/plugin-test/appXmlBundledTest/maven.xml @@ -37,10 +37,11 @@ - + + - + diff --git a/ear/src/plugin-test/appXmlLocationTest/maven.xml b/ear/src/plugin-test/appXmlLocationTest/maven.xml index 38e65374..1acf23eb 100644 --- a/ear/src/plugin-test/appXmlLocationTest/maven.xml +++ b/ear/src/plugin-test/appXmlLocationTest/maven.xml @@ -40,10 +40,11 @@ - + + - + diff --git a/ear/src/plugin-test/bundlePropertiesTest/maven.xml b/ear/src/plugin-test/bundlePropertiesTest/maven.xml index c5d3646a..aa433780 100644 --- a/ear/src/plugin-test/bundlePropertiesTest/maven.xml +++ b/ear/src/plugin-test/bundlePropertiesTest/maven.xml @@ -28,11 +28,10 @@ - + + - diff --git a/ear/src/plugin-test/sarBundledTest/maven.xml b/ear/src/plugin-test/sarBundledTest/maven.xml index 035ff053..8bdfbe78 100644 --- a/ear/src/plugin-test/sarBundledTest/maven.xml +++ b/ear/src/plugin-test/sarBundledTest/maven.xml @@ -28,9 +28,9 @@ - + + - diff --git a/ear/src/plugin-test/simpleTest/maven.xml b/ear/src/plugin-test/simpleTest/maven.xml index ec549723..dbaf6237 100644 --- a/ear/src/plugin-test/simpleTest/maven.xml +++ b/ear/src/plugin-test/simpleTest/maven.xml @@ -28,12 +28,11 @@ + - + - diff --git a/ear/xdocs/changes.xml b/ear/xdocs/changes.xml index 8d8c5ff5..13805b72 100644 --- a/ear/xdocs/changes.xml +++ b/ear/xdocs/changes.xml @@ -25,6 +25,8 @@ + Added property maven.ear.final.name. + Removed checking introduced by MPEAR-9, as the fix introduced more bugs than it solved. Re-added property maven.ear.appxml. diff --git a/ear/xdocs/properties.xml b/ear/xdocs/properties.xml index c1e473b5..ff675f27 100644 --- a/ear/xdocs/properties.xml +++ b/ear/xdocs/properties.xml @@ -28,6 +28,13 @@
+ + + + +
PropertyOptional?DescriptionDefault
maven.ear.final.nameName of the generated EAR file. + ${maven.final.name}.ear +
maven.ear.manifest Yes