[rhq] etc/apt etc/classloaders-test etc/samples modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/jopr modules/plugins modules/test-utils pom.xml
etc/apt/pom.xml | 12 +-- etc/classloaders-test/plugin1/pom.xml | 12 +-- etc/classloaders-test/plugin2/pom.xml | 12 +-- etc/samples/perspectives/sample-perspective/perspective/pom.xml | 12 +-- etc/samples/provisioning/sample-bundle/pom.xml | 4 - etc/samples/skeleton-plugin/pom.xml | 12 +-- modules/cli-tests/pom.xml | 12 +-- modules/common/ant-bundle/pom.xml | 8 +- modules/common/drift/pom.xml | 16 ++--- modules/common/filetemplate-bundle/pom.xml | 8 +- modules/common/jboss-as/pom.xml | 8 +- modules/core/client-api/pom.xml | 16 ++--- modules/core/comm-api/pom.xml | 8 +- modules/core/domain/pom.xml | 16 ++--- modules/core/gui/pom.xml | 8 +- modules/core/native-system/pom.xml | 12 +-- modules/core/plugin-api/pom.xml | 8 +- modules/core/plugin-container/pom.xml | 16 ++--- modules/core/plugindoc/pom.xml | 4 - modules/core/util/pom.xml | 20 +++--- modules/enterprise/agent/pom.xml | 20 +++--- modules/enterprise/agentupdate/pom.xml | 16 ++--- modules/enterprise/binding/pom.xml | 24 +++---- modules/enterprise/comm/pom.xml | 20 +++--- modules/enterprise/gui/content_http-war/pom.xml | 12 +-- modules/enterprise/gui/coregui/pom.xml | 20 +++--- modules/enterprise/gui/installer-war/pom.xml | 16 ++--- modules/enterprise/gui/portal-war/pom.xml | 28 ++++---- modules/enterprise/gui/rest-war/pom.xml | 20 +++--- modules/enterprise/gui/webdav-war/pom.xml | 12 +-- modules/enterprise/remoting/webservices/pom.xml | 4 - modules/enterprise/server/client-api/pom.xml | 16 ++--- modules/enterprise/server/container-lib/pom.xml | 8 +- modules/enterprise/server/ear/pom.xml | 12 +-- modules/enterprise/server/itests/pom.xml | 4 - modules/enterprise/server/jar/pom.xml | 32 +++++----- modules/enterprise/server/plugins/alert-cli/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-email/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-irc/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-log4j/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-microblog/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-operations/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-roles/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-sms/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-snmp/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-subject/pom.xml | 16 ++--- modules/enterprise/server/plugins/ant-bundle/pom.xml | 20 +++--- modules/enterprise/server/plugins/cloud/pom.xml | 12 +-- modules/enterprise/server/plugins/cobbler/pom.xml | 20 +++--- modules/enterprise/server/plugins/disk/pom.xml | 20 +++--- modules/enterprise/server/plugins/drift-mongodb/pom.xml | 20 +++--- modules/enterprise/server/plugins/drift-rhq/pom.xml | 20 +++--- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 20 +++--- modules/enterprise/server/plugins/groovy-script/pom.xml | 20 +++--- modules/enterprise/server/plugins/jboss-software/pom.xml | 20 +++--- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 20 +++--- modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 12 +-- modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml | 12 +-- modules/enterprise/server/plugins/url/pom.xml | 20 +++--- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 4 - modules/enterprise/server/plugins/yum/pom.xml | 20 +++--- modules/enterprise/server/safe-invoker/pom.xml | 16 ++--- modules/enterprise/server/xml-schemas/pom.xml | 24 +++---- modules/helpers/bundleGen/pom.xml | 8 +- modules/helpers/perftest-support/pom.xml | 8 +- modules/helpers/pluginGen/pom.xml | 8 +- modules/helpers/rtfilter/pom.xml | 16 ++--- modules/integration-tests/apache-plugin-test/pom.xml | 4 - modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 4 - modules/integration-tests/mod_cluster-plugin-test/pom.xml | 4 - modules/jopr/dist/agent/pom.xml | 4 - modules/jopr/dist/server/pom.xml | 4 - modules/plugins/JBossOSGi/pom.xml | 20 +++--- modules/plugins/aliases/pom.xml | 24 +++---- modules/plugins/ant-bundle/pom.xml | 24 +++---- modules/plugins/apache/pom.xml | 24 +++---- modules/plugins/augeas/pom.xml | 20 +++--- modules/plugins/byteman/pom.xml | 24 +++---- modules/plugins/cobbler/pom.xml | 24 +++---- modules/plugins/cron/pom.xml | 24 +++---- modules/plugins/database/pom.xml | 20 +++--- modules/plugins/filetemplate-bundle/pom.xml | 24 +++---- modules/plugins/grub/pom.xml | 24 +++---- modules/plugins/hadoop/pom.xml | 20 +++--- modules/plugins/hardware/pom.xml | 8 +- modules/plugins/hibernate/pom.xml | 24 +++---- modules/plugins/hosts/pom.xml | 24 +++---- modules/plugins/hudson/pom.xml | 8 +- modules/plugins/iis/pom.xml | 24 +++---- modules/plugins/iptables/pom.xml | 16 ++--- modules/plugins/irc/pom.xml | 20 +++--- modules/plugins/jboss-as-5/pom.xml | 24 +++---- modules/plugins/jboss-as-7/pom.xml | 12 +-- modules/plugins/jboss-as/pom.xml | 24 +++---- modules/plugins/jboss-cache-v3/pom.xml | 24 +++---- modules/plugins/jboss-cache/pom.xml | 24 +++---- modules/plugins/jdbctrace/pom.xml | 28 ++++---- modules/plugins/jira/pom.xml | 24 +++---- modules/plugins/jmx/pom.xml | 24 +++---- modules/plugins/kickstart/pom.xml | 20 +++--- modules/plugins/lsof/pom.xml | 24 +++---- modules/plugins/mod-cluster/pom.xml | 24 +++---- modules/plugins/mysql/pom.xml | 24 +++---- modules/plugins/netservices/pom.xml | 24 +++---- modules/plugins/nss/pom.xml | 20 +++--- modules/plugins/onewire/pom.xml | 20 +++--- modules/plugins/oracle/pom.xml | 20 +++--- modules/plugins/pattern-generator/pom.xml | 12 +-- modules/plugins/platform/pom.xml | 24 +++---- modules/plugins/postfix/pom.xml | 24 +++---- modules/plugins/postgres/pom.xml | 24 +++---- modules/plugins/raw-config-test/pom.xml | 4 - modules/plugins/rhq-agent/pom.xml | 24 +++---- modules/plugins/rhq-server/pom.xml | 24 +++---- modules/plugins/samba/pom.xml | 24 +++---- modules/plugins/script/pom.xml | 24 +++---- modules/plugins/script2/pom.xml | 20 +++--- modules/plugins/services/pom.xml | 20 +++--- modules/plugins/snmptrapd/pom.xml | 20 +++--- modules/plugins/sshd/pom.xml | 24 +++---- modules/plugins/sudoers/pom.xml | 24 +++---- modules/plugins/tomcat/pom.xml | 24 +++---- modules/plugins/twitter/pom.xml | 20 +++--- modules/plugins/validate-all-plugins/pom.xml | 4 - modules/plugins/virt/pom.xml | 24 +++---- modules/test-utils/pom.xml | 8 +- pom.xml | 16 ++--- 129 files changed, 1114 insertions(+), 1114 deletions(-)
New commits: commit 3ba7c30f1a23c243448cc427c763dcd83b5d76da Author: Ian Springer ian.springer@redhat.com Date: Wed May 23 13:07:41 2012 -0400
use <target>...</target>, rather than the deprecated <tasks>...</tasks>, in all antrun plugin executions
diff --git a/etc/apt/pom.xml b/etc/apt/pom.xml index cbb8ae3..882bdee 100644 --- a/etc/apt/pom.xml +++ b/etc/apt/pom.xml @@ -49,7 +49,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar... </echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -81,7 +81,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -150,12 +150,12 @@ <id>deploy</id> <!--<phase>compile</phase>--> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -166,11 +166,11 @@ <id>undeploy</id> <!--<phase>clean</phase>--> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/classloaders-test/plugin1/pom.xml b/etc/classloaders-test/plugin1/pom.xml index b23d084..465db1c 100644 --- a/etc/classloaders-test/plugin1/pom.xml +++ b/etc/classloaders-test/plugin1/pom.xml @@ -169,12 +169,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -184,7 +184,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -196,7 +196,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -206,11 +206,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/classloaders-test/plugin2/pom.xml b/etc/classloaders-test/plugin2/pom.xml index 593d2ce..265b305 100644 --- a/etc/classloaders-test/plugin2/pom.xml +++ b/etc/classloaders-test/plugin2/pom.xml @@ -169,12 +169,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -184,7 +184,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -196,7 +196,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -206,11 +206,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/samples/perspectives/sample-perspective/perspective/pom.xml b/etc/samples/perspectives/sample-perspective/perspective/pom.xml index c72c419..d50b4e4 100644 --- a/etc/samples/perspectives/sample-perspective/perspective/pom.xml +++ b/etc/samples/perspectives/sample-perspective/perspective/pom.xml @@ -81,7 +81,7 @@ <id>add-war</id> <phase>verify</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> @@ -90,7 +90,7 @@ destfile="${basedir}/target/${project.artifactId}-${project.version}.jar" basedir="${basedir}/../app/target" includes="*.war" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -122,11 +122,11 @@ <id>deploy</id> <phase>install</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <copy file="${basedir}/target/${project.build.finalName}.jar" toDir="${rhq.deploymentDir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -137,11 +137,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/samples/provisioning/sample-bundle/pom.xml b/etc/samples/provisioning/sample-bundle/pom.xml index 26f227b..a939baf 100644 --- a/etc/samples/provisioning/sample-bundle/pom.xml +++ b/etc/samples/provisioning/sample-bundle/pom.xml @@ -43,7 +43,7 @@ <id>prepare-bundle</id> <phase>process-resources</phase> <configuration> - <tasks> + <target> <echo>settings.localRepository=${settings.localRepository}</echo> <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo> <ant antfile="src/main/scripts/build.xml"> @@ -52,7 +52,7 @@ <property name="project.build.outputDirectory" value="${project.build.outputDirectory}"/> <property name="derbyclient.version" value="${derbyclient.version}"/> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/samples/skeleton-plugin/pom.xml b/etc/samples/skeleton-plugin/pom.xml index f45b37e..39fc241 100644 --- a/etc/samples/skeleton-plugin/pom.xml +++ b/etc/samples/skeleton-plugin/pom.xml @@ -170,12 +170,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -185,7 +185,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -197,7 +197,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -207,11 +207,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index de9a671..e1b5521 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -86,7 +86,7 @@ <id>test-scripts</id> <phase>test</phase> <configuration> - <tasks> + <target> <java classname="org.rhq.enterprise.remoting.cli.ScriptTestRunner" classpathref="maven.test.classpath" resultproperty="script.tests.failed" @@ -103,7 +103,7 @@ <isfailure code="${script.tests.failed}"/> </condition> </fail> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -161,7 +161,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -181,7 +181,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,7 +191,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -212,7 +212,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 9fe88e9..4da4ece 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -135,7 +135,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -155,7 +155,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -165,7 +165,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -186,7 +186,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 8268ccf..cd0c979 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -49,12 +49,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -65,11 +65,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -104,7 +104,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -124,7 +124,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -134,7 +134,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -155,7 +155,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 580ecef..74480d7 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -62,7 +62,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -82,7 +82,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -92,7 +92,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -113,7 +113,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 60894f0..6600791 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -106,7 +106,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -132,7 +132,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -142,7 +142,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -163,7 +163,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index bd022fb..b5f049f 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -145,12 +145,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -161,11 +161,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -199,7 +199,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -219,7 +219,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -229,7 +229,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -250,7 +250,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index b71665b..bf501fc 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -40,12 +40,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -56,11 +56,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ebe159a..fa4eee4 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -330,7 +330,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target> <!-- don't instrument... I'm leaving this here as an example of how to apply Hibernate Instrumentation to a class. Instrumentation is useful for various property-level things such as field-level lazy load. @@ -354,7 +354,7 @@ <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="target/classes" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -365,11 +365,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -443,7 +443,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -463,7 +463,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -473,7 +473,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -494,7 +494,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 0ed21ed..51781ce 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -162,12 +162,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -178,11 +178,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index de8e2e3..82cd33a 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -50,7 +50,7 @@ <execution> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>SIGAR Java library version used is ${sigar.version}.</echo> <echo>Copying/unzipping SIGAR native libraries (version ${sigar.version}) to local build directory...</echo> <mkdir dir="${project.build.directory}/jboss-sigar" /> @@ -74,7 +74,7 @@ </fileset> </move> <delete dir="${project.build.directory}/jboss-sigar/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -177,7 +177,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -198,7 +198,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -208,7 +208,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -229,7 +229,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index b79a075..5ba5465 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -143,7 +143,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -163,7 +163,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -174,7 +174,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -195,7 +195,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 8887e4c..b9c19a4 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -128,7 +128,7 @@ <id>process-test-resources</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>SIGAR java library version used is ${sigar.version}</echo> <echo>Copying/unzipping SIGAR native libraries (version ${sigar.version}) to local build directory</echo> <mkdir dir="${project.build.directory}/jboss-sigar" /> @@ -152,7 +152,7 @@ </fileset> </move> <delete dir="${project.build.directory}/jboss-sigar/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -163,7 +163,7 @@ <id>process-test-classes</id> <phase>process-test-classes</phase> <configuration> - <tasks unless="maven.test.skip"> + <target unless="maven.test.skip"> <echo>Assembling the resource upgrade test plugins</echo> <copy toDir="${project.build.testOutputDirectory}/tmp/v1/META-INF"> <fileset file="${project.build.testSourceDirectory}/org/rhq/core/pc/upgrade/plugins/v1/rhq-plugin.xml" /> @@ -336,7 +336,7 @@ </jar>
<delete dir="${project.build.testOutputDirectory}/tmp" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -411,7 +411,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -431,7 +431,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -441,7 +441,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -462,7 +462,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 7192c4d..c35c001 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -102,12 +102,12 @@ <id>plugindoc-distro-package</id> <phase>install</phase> <configuration> - <tasks> + <target> <ant antfile="${basedir}/ant-run.xml" dir="${basedir}" target="package-dist" inheritAll="false" inheritRefs="false"> <property name="settings.localRepository" value="${settings.localRepository}" /> <property name="project.version" value="${project.version}" /> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 2dd2ef6..2737ce3 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -53,7 +53,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target> <!-- generate the I18N resource bundles --> <taskdef name="i18n" classpathref="maven.compile.classpath" classname="mazz.i18n.ant.I18NAntTask" />
@@ -63,7 +63,7 @@ <include name="**/*.class" /> </classfileset> </i18n> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -97,12 +97,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -113,11 +113,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -151,7 +151,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -171,7 +171,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -181,7 +181,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -202,7 +202,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 6abfed3..6fa0902 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -122,7 +122,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target>
<!-- generate the I18N resource bundles --> <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> @@ -152,7 +152,7 @@ Build-OS-Version=${os.version} Build-Number=${buildNumber} </echo>
- </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -164,7 +164,7 @@ Build-Number=${buildNumber} <id>agent-distro-package</id> <phase>install</phase> <configuration> - <tasks> + <target> <ant antfile="${basedir}/ant-run.xml" dir="${basedir}" target="package-dist" inheritAll="false" inheritRefs="false"> <property name="settings.localRepository" value="${settings.localRepository}" /> <property name="project.version" value="${project.version}" /> @@ -185,7 +185,7 @@ Build-Number=${buildNumber} <property name="augeas.zip.version" value="${augeas.zip.version}" /> <property name="log4j.version" value="${log4j.version}" /> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -196,10 +196,10 @@ Build-Number=${buildNumber} <id>clean-test-dirs</id> <phase>test</phase> <configuration> - <tasks> + <target> <delete dir="${basedir}/data" /> <delete dir="${basedir}/plugins" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -257,7 +257,7 @@ Build-Number=${buildNumber} <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -277,7 +277,7 @@ Build-Number=${buildNumber} <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -287,7 +287,7 @@ Build-Number=${buildNumber} <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -308,7 +308,7 @@ Build-Number=${buildNumber} </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index de2ef8d..6069aaf 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -162,7 +162,7 @@ rhq-agent.latest.build-number=${buildNumber} <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <echo>*** Cleaning old ${rhq.deploymentDir}...</echo> <mkdir dir="${rhq.deploymentDir}" /> <delete failonerror="false"> @@ -171,7 +171,7 @@ rhq-agent.latest.build-number=${buildNumber} <property name="deployment.file" location="${rhq.deploymentDir}/${rhq.deploymentJar}" /> <echo>*** Updating ${deployment.file}...</echo> <copy file="${basedir}/target/${rhq.projectJar}" toFile="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -181,12 +181,12 @@ rhq-agent.latest.build-number=${buildNumber} <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <echo>*** Deleting ${rhq.deploymentDir}...</echo> <delete failonerror="false"> <fileset dir="${rhq.deploymentDir}" includes="*" /> </delete> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,7 +218,7 @@ rhq-agent.latest.build-number=${buildNumber} <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -238,7 +238,7 @@ rhq-agent.latest.build-number=${buildNumber} <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -248,7 +248,7 @@ rhq-agent.latest.build-number=${buildNumber} <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -269,7 +269,7 @@ rhq-agent.latest.build-number=${buildNumber} </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 7383d3a..23eab14 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -238,13 +238,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -255,12 +255,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -292,7 +292,7 @@ <id>bindings-api</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> <property name="project.dir" value="./src/main/java/org/rhq/bindings" /> <property name="maven.compile.classpath" refid="maven.compile.classpath" /> @@ -309,7 +309,7 @@ <link href="http://download.oracle.com/javase/6/docs/api/" /> <bottom><![CDATA[Copyright © 2005-2011 <a href="http://redhat.com/">Red Hat, Inc.</a>. All Rights Reserved.]]></bottom> </javadoc> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -344,7 +344,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura --> <mkdir dir="target/cobertura" /> @@ -368,7 +368,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -378,7 +378,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura --> @@ -402,7 +402,7 @@ <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -448,10 +448,10 @@ </goals> <phase>generate-sources</phase> <configuration> - <tasks> + <target> <!-- Ex. -DTagManager=false will disable the TagManager from remote api if this profile is active. --> <echo>Updating remote api to exclude RemoteManagers passed in.</echo> - </tasks> + </target> </configuration> </execution> </executions> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 2c6133e..f784d42 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -105,7 +105,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target> <!-- generate the I18N resource bundles --> <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />
@@ -115,7 +115,7 @@ <include name="**/CommI18NResourceKeys.class" /> </classfileset> </i18n> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -186,12 +186,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -202,11 +202,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -240,7 +240,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -260,7 +260,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -270,7 +270,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -291,7 +291,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 5f86321..78f8982 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -220,7 +220,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> @@ -232,7 +232,7 @@ <fileset dir="${basedir}/src/main/webapp" /> </copy> <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. --> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -243,13 +243,13 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -260,11 +260,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 1260cee..45308cc 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -351,7 +351,7 @@ <id>Generate I18N Resource Bundles</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> <i18n outputdir="${project.buildNodes.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true"> <classpath refid="maven.runtime.classpath" /> @@ -359,7 +359,7 @@ <include name="**/*I18NResourceKeys.class" /> </classfileset> </i18n> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -369,14 +369,14 @@ <id>Maintain an unfiltered copy of i18n properties files</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <copy todir="${project.buildNodes.outputDirectory}"> <fileset dir="src/main/webapp-filtered/WEB-INF/classes"> <include name="ApplicationResources.properties" /> </fileset> <mapper type="glob" from="*" to="*.unfiltered" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -414,7 +414,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <!-- <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/${project.buildNodes.finalName}/WEB-INF/classes to ${classes.dir}...</echo> @@ -430,7 +430,7 @@ <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/src/main/webapp" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -441,7 +441,7 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to @@ -450,7 +450,7 @@ <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -461,11 +461,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 471f23e..b4fd36c 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -182,7 +182,7 @@ <id>Generate I18N Resource Bundles</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <!-- generate the I18N resource bundles --> <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> <!--<i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true">--> @@ -198,7 +198,7 @@ </fileset> <mapper type="glob" from="*" to="*.unfiltered" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -256,13 +256,13 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> <fileset dir="target/classes" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -273,14 +273,14 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> <delete dir="${deployment.dir}.rej" /> <!-- need to remove any residual backups --> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -291,11 +291,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 6a5e230..5e034ef 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -444,7 +444,7 @@ <id>Generate I18N Resource Bundles</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <!-- generate the I18N resource bundles --> <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> <i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true"> @@ -453,7 +453,7 @@ <include name="**/*I18NResourceKeys.class" /> </classfileset> </i18n> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -463,14 +463,14 @@ <id>Maintain an unfiltered copy of i18n properties files</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <copy todir="${project.build.outputDirectory}"> <fileset dir="src/main/webapp-filtered/WEB-INF/classes"> <include name="ApplicationResources.properties" /> </fileset> <mapper type="glob" from="*" to="*.unfiltered" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -507,7 +507,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> @@ -519,7 +519,7 @@ <fileset dir="${basedir}/src/main/webapp" /> </copy> <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. --> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -530,13 +530,13 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -547,11 +547,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -610,7 +610,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -632,7 +632,7 @@ <include name="org/rhq/enterprise/gui/common/time/converter/RelativeDurationConverter.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -642,7 +642,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -665,7 +665,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 4eb9c60..4c18901 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -139,7 +139,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> @@ -151,7 +151,7 @@ <fileset dir="${basedir}/src/main/webapp" /> </copy> <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. --> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -162,13 +162,13 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -179,11 +179,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,7 +218,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -240,7 +240,7 @@ <include name="org/rhq/enterprise/gui/common/time/converter/RelativeDurationConverter.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -250,7 +250,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -273,7 +273,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index b85eeef..3ab00df 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -213,7 +213,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> @@ -225,7 +225,7 @@ <fileset dir="${basedir}/src/main/webapp" /> </copy> <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. --> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -236,13 +236,13 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -253,11 +253,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index f3e0c81..fe1c3e7 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -104,7 +104,7 @@ <id>client-distribution</id> <phase>compile</phase> <configuration> - <tasks> + <target> <echo>ant.version=${ant.version}</echo>
<ant antfile="${basedir}/src/main/scripts/rhq-client.build.xml" dir="${basedir}" target="prepare-dist" inheritAll="false" inheritRefs="false"> @@ -126,7 +126,7 @@ <property name="ant.contrib.version" value="${ant.contrib.version}" /> <property name="webservice.version" value="${project.version}" /> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 9a2f24f..81b559c 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -71,13 +71,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -88,12 +88,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -128,7 +128,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura --> <mkdir dir="target/cobertura" /> @@ -152,7 +152,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -162,7 +162,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura --> @@ -186,7 +186,7 @@ <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 197341b..8a5f9dd 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -69,12 +69,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -85,11 +85,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index ecbf664..46ec595 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -854,7 +854,7 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to @@ -866,7 +866,7 @@ <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> <touch file="${deployment.descriptor.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -877,13 +877,13 @@ <id>deploy-ear-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> <patternset> <include name="META-INF/**" /> </patternset> </unjar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -894,11 +894,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index 3725e1d..3f3f03f 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -286,7 +286,7 @@ <id>Extract JMS classes from RAR needed for JMS tests</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <unzip src="src/test/resources/jms-ra.rar" dest="target"> <patternset> <include name="jms-ra.jar"/> @@ -297,7 +297,7 @@ <include name="org/**"/> </patternset> </unzip> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index ef539f6..86bc22d 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -606,7 +606,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target> <!-- generate the I18N resource bundles --> <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />
@@ -634,7 +634,7 @@ Build-Jdk=${java.version} Build-OS-Name=${os.name} Build-OS-Version=${os.version} </echo> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -646,7 +646,7 @@ Build-OS-Version=${os.version} <id>Extract JMS classes from RAR needed for JMS tests</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <unzip src="src/test/resources/jms-ra.rar" dest="target"> <patternset> <include name="jms-ra.jar"/> @@ -657,7 +657,7 @@ Build-OS-Version=${os.version} <include name="org/**"/> </patternset> </unzip> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -845,13 +845,13 @@ Build-OS-Version=${os.version} <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target/classes to ${deployment.dir}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="target/classes" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -867,13 +867,13 @@ Build-OS-Version=${os.version} <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${rhq.deploymentDir}" overwrite="false"> <patternset> <include name="META-INF/**" /> </patternset> </unjar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -884,11 +884,11 @@ Build-OS-Version=${os.version} <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -941,7 +941,7 @@ Build-OS-Version=${os.version} <id>remote-api</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> <property name="maven.compile.classpath" refid="maven.compile.classpath" /> @@ -958,7 +958,7 @@ Build-OS-Version=${os.version} <link href="http://download.oracle.com/javase/6/docs/api/" /> <bottom><![CDATA[Copyright © 2005-2011 <a href="http://redhat.com/">Red Hat, Inc.</a>. All Rights Reserved.]]></bottom> </javadoc> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -990,7 +990,7 @@ Build-OS-Version=${os.version} <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -1012,7 +1012,7 @@ Build-OS-Version=${os.version} <exclude name="**/DynamicConfigurationPropertyBean.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -1022,7 +1022,7 @@ Build-OS-Version=${os.version} <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -1043,7 +1043,7 @@ Build-OS-Version=${os.version} </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index ad59517..0977465 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -58,13 +58,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -75,12 +75,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -91,7 +91,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> @@ -102,7 +102,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -137,7 +137,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura --> <mkdir dir="target/cobertura" /> @@ -161,7 +161,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -171,7 +171,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura --> @@ -195,7 +195,7 @@ <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 419c20a..a7db8c7 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -64,12 +64,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -80,11 +80,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -95,7 +95,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -105,7 +105,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -140,7 +140,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -160,7 +160,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -170,7 +170,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -191,7 +191,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 0d7194a..53b67dd 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -61,12 +61,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -77,11 +77,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -92,7 +92,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -102,7 +102,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -194,7 +194,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -214,7 +214,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -224,7 +224,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -245,7 +245,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 9884b3d..5f01f19 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -51,12 +51,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -67,11 +67,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -82,7 +82,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -92,7 +92,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -130,7 +130,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -150,7 +150,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,7 +160,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -181,7 +181,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index c3b4437..ceb88ad 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -59,12 +59,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -75,11 +75,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -90,7 +90,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -100,7 +100,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,7 +191,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -211,7 +211,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -221,7 +221,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -242,7 +242,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 9a5ea88..01e8ed2 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -51,12 +51,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -67,11 +67,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -82,7 +82,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -92,7 +92,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -127,7 +127,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -147,7 +147,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -178,7 +178,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index c28cee4..032030c 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -126,12 +126,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -142,11 +142,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -167,7 +167,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -201,7 +201,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -221,7 +221,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -231,7 +231,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -252,7 +252,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 63375ca..e1b2b68 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -78,12 +78,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -94,11 +94,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -109,7 +109,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -119,7 +119,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -154,7 +154,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -174,7 +174,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -184,7 +184,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -205,7 +205,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-scriptlang/pom.xml b/modules/enterprise/server/plugins/alert-scriptlang/pom.xml index 5aace00..843b2af 100644 --- a/modules/enterprise/server/plugins/alert-scriptlang/pom.xml +++ b/modules/enterprise/server/plugins/alert-scriptlang/pom.xml @@ -81,12 +81,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -97,11 +97,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -112,7 +112,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -123,7 +123,7 @@ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -156,7 +156,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -176,7 +176,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -186,7 +186,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -207,7 +207,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-sms/pom.xml b/modules/enterprise/server/plugins/alert-sms/pom.xml index eaddb5a..31fdfd7 100644 --- a/modules/enterprise/server/plugins/alert-sms/pom.xml +++ b/modules/enterprise/server/plugins/alert-sms/pom.xml @@ -94,12 +94,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -110,11 +110,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -125,7 +125,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -135,7 +135,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -209,7 +209,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -229,7 +229,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -239,7 +239,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -260,7 +260,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 249f916..5e272f6 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -59,12 +59,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -75,11 +75,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -90,7 +90,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -100,7 +100,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,7 +160,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -180,7 +180,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -190,7 +190,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -211,7 +211,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index f1d7420..1e168a0 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -52,12 +52,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -68,11 +68,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -106,7 +106,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -126,7 +126,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -136,7 +136,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -157,7 +157,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 64d9579..5cb7d9d 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -152,12 +152,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -168,11 +168,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -183,7 +183,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -193,7 +193,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -227,7 +227,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -247,7 +247,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -257,7 +257,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -278,7 +278,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/cloud/pom.xml b/modules/enterprise/server/plugins/cloud/pom.xml index 2a5b73c..6ed8c41 100644 --- a/modules/enterprise/server/plugins/cloud/pom.xml +++ b/modules/enterprise/server/plugins/cloud/pom.xml @@ -79,12 +79,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -95,11 +95,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -110,7 +110,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -120,7 +120,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index df451de..db45a30 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -103,12 +103,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -119,11 +119,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -134,7 +134,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -144,7 +144,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -178,7 +178,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -198,7 +198,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -208,7 +208,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -229,7 +229,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 9252abd..f695434 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -78,12 +78,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -94,11 +94,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -109,7 +109,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -119,7 +119,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -153,7 +153,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -173,7 +173,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -183,7 +183,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -204,7 +204,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml index 869286d..985cd67 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml +++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml @@ -154,12 +154,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -170,11 +170,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -185,7 +185,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -195,7 +195,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -230,7 +230,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -250,7 +250,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -260,7 +260,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -281,7 +281,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index e06625c..141b792 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -92,12 +92,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -108,11 +108,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -123,7 +123,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -133,7 +133,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -167,7 +167,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -187,7 +187,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -197,7 +197,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -218,7 +218,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 4fed8f3..1d3afe9 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -129,12 +129,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -145,11 +145,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,7 +160,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -170,7 +170,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -205,7 +205,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -225,7 +225,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -235,7 +235,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -256,7 +256,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 0e26344..f708881 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -155,12 +155,12 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -171,11 +171,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -186,7 +186,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -196,7 +196,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -230,7 +230,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -250,7 +250,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -260,7 +260,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -281,7 +281,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 91920bf..ba40c46 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -82,12 +82,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -98,11 +98,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -113,7 +113,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -123,7 +123,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -177,7 +177,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -187,7 +187,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -208,7 +208,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index d78df65..523a7b8 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -52,12 +52,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -68,11 +68,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -83,7 +83,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> @@ -94,7 +94,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -127,7 +127,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -147,7 +147,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -178,7 +178,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 39da337..601d777 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -40,12 +40,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -56,11 +56,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -71,7 +71,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -81,7 +81,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml index 6ce8667..141eaef 100644 --- a/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml @@ -53,7 +53,7 @@ <id>add-war</id> <phase>verify</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> @@ -62,7 +62,7 @@ destfile="${basedir}/target/${project.artifactId}-${project.version}.jar" basedir="${basedir}/../app/target" includes="*.war" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -94,11 +94,11 @@ <id>deploy</id> <phase>install</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <copy file="${basedir}/target/${project.build.finalName}.jar" toDir="${rhq.deploymentDir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -109,11 +109,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 26e21c6..56877dd 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -87,12 +87,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -103,11 +103,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -118,7 +118,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -128,7 +128,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -163,7 +163,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -183,7 +183,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -193,7 +193,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -214,7 +214,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 4890974..4d68e6e 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -23,7 +23,7 @@ <execution> <phase>integration-test</phase> <configuration> - <tasks> + <target> <property name="test.classpath" refid="maven.test.classpath" /> <echo>Validating plugins...</echo> <java classname="org.rhq.enterprise.server.plugin.pc.ServerPluginValidatorUtil" failonerror="true" fork="true"> @@ -59,7 +59,7 @@ <jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,address=8797,server=y,suspend=y" /> --> </java> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index f9cd80a..4d91ffd 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -72,12 +72,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -88,11 +88,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -103,7 +103,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -113,7 +113,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -148,7 +148,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -168,7 +168,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -178,7 +178,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -199,7 +199,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 2607be4..1a515f3 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -62,12 +62,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${rhq.deploymentName}" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -78,11 +78,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${rhq.deploymentName}" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -117,7 +117,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -137,7 +137,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -147,7 +147,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -168,7 +168,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index e9cb460..d14f05d 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -97,7 +97,7 @@ <id>Copy the schemas in one place, including rhq-configuration.xsd schema so we can reuse it</id> <phase>initialize</phase> <configuration> - <tasks> + <target> <mkdir dir="${basedir}/target/classes" /> <copy todir="${basedir}/target/classes"> <fileset dir="${basedir}/src/main/resources"> @@ -107,7 +107,7 @@ <include name="rhq-configuration.xsd" /> </fileset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -117,9 +117,9 @@ <id>purge duplicated JAXB-generated configuration schema classes</id> <phase>process-sources</phase> <configuration> - <tasks> + <target> <delete dir="${basedir}/target/generated-sources/xjc/org/rhq/core" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,12 +160,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -176,11 +176,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -214,7 +214,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -234,7 +234,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -244,7 +244,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -265,7 +265,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index a1c2d5b..6476dc0 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -95,7 +95,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -115,7 +115,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -125,7 +125,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -146,7 +146,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index f34103c..55e7c37 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -137,7 +137,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -157,7 +157,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -167,7 +167,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -188,7 +188,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 6394863..299550d 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -116,7 +116,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -136,7 +136,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -146,7 +146,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -167,7 +167,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index e94372a..821df29 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -104,12 +104,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -120,11 +120,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -159,7 +159,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -179,7 +179,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -189,7 +189,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -210,7 +210,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 10f3766..7219146 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -130,7 +130,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> @@ -241,7 +241,7 @@ <chmod perm="ugo+rx"> <fileset dir="target/itest/httpd/bin" /> </chmod> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index efa765d..4351b11 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -275,7 +275,7 @@ <id>Extract JMS classes from RAR needed for JMS tests</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <unzip src="src/test/resources/jms-ra.rar" dest="target"> <patternset> @@ -288,7 +288,7 @@ <include name="org/**" /> </patternset> </unzip> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml b/modules/integration-tests/mod_cluster-plugin-test/pom.xml index a51f3b1..63fb98d 100644 --- a/modules/integration-tests/mod_cluster-plugin-test/pom.xml +++ b/modules/integration-tests/mod_cluster-plugin-test/pom.xml @@ -282,7 +282,7 @@ <execution> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/testsetup" /> @@ -320,7 +320,7 @@ </fileset> </move> <delete dir="target/testsetup/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/jopr/dist/agent/pom.xml b/modules/jopr/dist/agent/pom.xml index fa46fc7..9fab897 100644 --- a/modules/jopr/dist/agent/pom.xml +++ b/modules/jopr/dist/agent/pom.xml @@ -53,7 +53,7 @@ <id>build-dist</id> <phase>generate-resources</phase> <configuration> - <tasks> + <target> <property name="jopr.trunk.dir" location="../../.." /> <property name="rhq.agent.dist.zipfile" location="${settings.localRepository}/org/rhq/rhq-enterprise-agent/${rhq.version}/rhq-enterprise-agent-${rhq.version}.zip" /> <property name="rhq.connectors.dist.zipfile" location="${settings.localRepository}/org/rhq/rhq-enterprise-agent/${rhq.version}/rhq-product_connectors-${rhq.version}.zip" /> @@ -75,7 +75,7 @@ <copy todir="${jopr.agent.dist.dir}"> <fileset dir="${jopr.trunk.dir}" includes="LICENSE*" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/jopr/dist/server/pom.xml b/modules/jopr/dist/server/pom.xml index 9ec8f35..0e95346 100644 --- a/modules/jopr/dist/server/pom.xml +++ b/modules/jopr/dist/server/pom.xml @@ -158,7 +158,7 @@ <id>build-dist</id> <phase>generate-resources</phase> <configuration> - <tasks> + <target> <echo>settings.localRepository=${settings.localRepository}</echo> <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo> <ant antfile="src/main/scripts/dist.build.xml" target="run"> @@ -177,7 +177,7 @@ <property name="rhq.ds.password" value="${rhq.ds.password}" /> <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" /> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/JBossOSGi/pom.xml b/modules/plugins/JBossOSGi/pom.xml index 1033830..0abd4b2 100644 --- a/modules/plugins/JBossOSGi/pom.xml +++ b/modules/plugins/JBossOSGi/pom.xml @@ -90,13 +90,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}"/> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -107,7 +107,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> @@ -121,7 +121,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -132,12 +132,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -171,7 +171,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -191,7 +191,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -201,7 +201,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -222,7 +222,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 24cbe04..17cd506 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -66,7 +66,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -137,7 +137,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -203,12 +203,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -219,7 +219,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -227,7 +227,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -238,11 +238,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -297,7 +297,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -307,7 +307,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -328,7 +328,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index a7bb554..35bad6b 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -104,7 +104,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -135,7 +135,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -205,12 +205,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -221,7 +221,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -231,7 +231,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -242,11 +242,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -281,7 +281,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -301,7 +301,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -311,7 +311,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -332,7 +332,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index ca40f59..92b0521 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -125,7 +125,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -200,7 +200,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -264,12 +264,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -280,7 +280,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -288,7 +288,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -299,11 +299,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -338,7 +338,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -358,7 +358,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -368,7 +368,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -389,7 +389,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 92aa5c2..b770b07 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -133,12 +133,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -149,7 +149,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -157,7 +157,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -168,11 +168,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -230,7 +230,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -250,7 +250,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -260,7 +260,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -281,7 +281,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 13140d1..c6fbfed 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -76,7 +76,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -107,7 +107,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -174,12 +174,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -190,7 +190,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -198,7 +198,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -209,11 +209,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -247,7 +247,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -267,7 +267,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -298,7 +298,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 2d7604e..840b4b6 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -71,7 +71,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -142,7 +142,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -208,12 +208,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -224,7 +224,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -232,7 +232,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -243,11 +243,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -302,7 +302,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -322,7 +322,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -332,7 +332,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -353,7 +353,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index f1022b4..fa4f7d3 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -60,7 +60,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -131,7 +131,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -197,12 +197,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -213,7 +213,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -221,7 +221,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -232,11 +232,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -270,7 +270,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -290,7 +290,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -300,7 +300,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -321,7 +321,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 27c86f7..d4da519 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -41,12 +41,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -57,7 +57,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -65,7 +65,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -76,11 +76,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -114,7 +114,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -134,7 +134,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -144,7 +144,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -165,7 +165,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index d7c92c7..8c0a155 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -85,7 +85,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -116,7 +116,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -183,12 +183,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -199,7 +199,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -207,7 +207,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,11 +218,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -256,7 +256,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -276,7 +276,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -286,7 +286,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -307,7 +307,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 94dc1d4..5c56712 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -60,7 +60,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -128,7 +128,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -194,12 +194,12 @@ <id>deploy</id> <!--<phase>compile</phase>--> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -210,7 +210,7 @@ <id>deploy-jar-meta-inf</id> <!--<phase>package</phase>--> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -218,7 +218,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -229,11 +229,11 @@ <id>undeploy</id> <!--<phase>clean</phase>--> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -267,7 +267,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -287,7 +287,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -297,7 +297,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -318,7 +318,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index e393e1a..7aae62d 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -50,12 +50,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -66,7 +66,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -76,7 +76,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -87,11 +87,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -126,7 +126,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -146,7 +146,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -156,7 +156,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -177,7 +177,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hardware/pom.xml b/modules/plugins/hardware/pom.xml index a922967..5b17f47 100644 --- a/modules/plugins/hardware/pom.xml +++ b/modules/plugins/hardware/pom.xml @@ -92,7 +92,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -112,7 +112,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -122,7 +122,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -143,7 +143,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 5e62e6b..e7a1349 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -75,7 +75,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -109,7 +109,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -176,12 +176,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -192,7 +192,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -200,7 +200,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -211,11 +211,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -249,7 +249,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -269,7 +269,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -279,7 +279,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -300,7 +300,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 46417ee..4794d78 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -67,7 +67,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -138,7 +138,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -204,12 +204,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -220,7 +220,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -228,7 +228,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -239,11 +239,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -297,7 +297,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -307,7 +307,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -328,7 +328,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 47747e5..e50de4e 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -97,7 +97,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -117,7 +117,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -127,7 +127,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -148,7 +148,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 62fa324..60c3f2c 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -34,7 +34,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -65,7 +65,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -132,12 +132,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -148,7 +148,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -156,7 +156,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -167,11 +167,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -205,7 +205,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -225,7 +225,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -235,7 +235,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -256,7 +256,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/iptables/pom.xml b/modules/plugins/iptables/pom.xml index afcd92f..d6eeff3 100644 --- a/modules/plugins/iptables/pom.xml +++ b/modules/plugins/iptables/pom.xml @@ -48,7 +48,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar... </echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -80,7 +80,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -149,12 +149,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -165,7 +165,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -173,7 +173,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -184,11 +184,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 65a7d8f..0750d4b 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -73,12 +73,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -89,7 +89,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -99,7 +99,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -110,11 +110,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -149,7 +149,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -169,7 +169,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -179,7 +179,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -200,7 +200,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index f23bc01..8ca5f8a 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -279,7 +279,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository"/> @@ -316,7 +316,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -599,13 +599,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}"/> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -616,7 +616,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> @@ -630,7 +630,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -641,12 +641,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -681,7 +681,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura"/> <mkdir dir="target/cobertura/backup"/> @@ -705,7 +705,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -715,7 +715,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties"/> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura"/> @@ -738,7 +738,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 425d85b..f630059 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -624,12 +624,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}"/> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -640,7 +640,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" @@ -652,7 +652,7 @@ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -663,11 +663,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index aaeca54..866838e 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -203,7 +203,7 @@ <phase>pre-integration-test</phase>
<configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -236,7 +236,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -302,12 +302,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -318,7 +318,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -326,7 +326,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -337,11 +337,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -375,7 +375,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -395,7 +395,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -405,7 +405,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -426,7 +426,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 7f88567..1519908 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -322,7 +322,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -355,7 +355,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -441,12 +441,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -457,7 +457,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -465,7 +465,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -476,11 +476,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -514,7 +514,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -534,7 +534,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -544,7 +544,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -565,7 +565,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index f266552..1079417 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -65,7 +65,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -99,7 +99,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -166,12 +166,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -182,7 +182,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -190,7 +190,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -201,11 +201,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -239,7 +239,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -259,7 +259,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -269,7 +269,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -290,7 +290,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jdbctrace/pom.xml b/modules/plugins/jdbctrace/pom.xml index 9f1e210..4d6b14a 100644 --- a/modules/plugins/jdbctrace/pom.xml +++ b/modules/plugins/jdbctrace/pom.xml @@ -41,14 +41,14 @@ <id>Package helper jar</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <echo>Preparing the internal byteman helper jar to be installed in byteman classpath</echo> <mkdir dir="${project.build.outputDirectory}/helper" /> <jar destfile="${project.build.outputDirectory}/helper/rhq-jdbctrace-plugin-helper.jar"> <fileset dir="${project.build.outputDirectory}" includes="**/org/rhq/plugins/jdbctrace/helper/*.class"/> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -106,7 +106,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -137,7 +137,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -204,12 +204,12 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -220,7 +220,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -228,7 +228,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -239,11 +239,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -297,7 +297,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -307,7 +307,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -328,7 +328,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jira/pom.xml b/modules/plugins/jira/pom.xml index b97bc8a..4839ea0 100644 --- a/modules/plugins/jira/pom.xml +++ b/modules/plugins/jira/pom.xml @@ -165,7 +165,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -196,7 +196,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -250,12 +250,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -266,7 +266,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" @@ -276,7 +276,7 @@ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -287,11 +287,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -325,7 +325,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -345,7 +345,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -355,7 +355,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -376,7 +376,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index bba3095..c38a4d0 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -141,7 +141,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -172,7 +172,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -205,12 +205,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -221,7 +221,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -229,7 +229,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -240,11 +240,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -279,7 +279,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -299,7 +299,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -309,7 +309,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -330,7 +330,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index d92b2ba..8ee8062 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -53,12 +53,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -68,7 +68,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -78,7 +78,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -88,11 +88,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -124,7 +124,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -144,7 +144,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -154,7 +154,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -175,7 +175,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/lsof/pom.xml b/modules/plugins/lsof/pom.xml index 3c03009..d3d6b24 100644 --- a/modules/plugins/lsof/pom.xml +++ b/modules/plugins/lsof/pom.xml @@ -76,7 +76,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -107,7 +107,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -174,12 +174,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -190,7 +190,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -198,7 +198,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -209,11 +209,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -247,7 +247,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -267,7 +267,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -298,7 +298,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index dbb1e1c..11ef595 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -87,12 +87,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -103,7 +103,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -111,7 +111,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -122,11 +122,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,12 +191,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -207,7 +207,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -215,7 +215,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -226,11 +226,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 9c4572f..fb018ca 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -79,7 +79,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -111,7 +111,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -178,12 +178,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -194,7 +194,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -202,7 +202,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -213,11 +213,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -251,7 +251,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -271,7 +271,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -281,7 +281,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -302,7 +302,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index dc68504..748cc07 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -89,7 +89,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -117,7 +117,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -183,12 +183,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -199,7 +199,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -207,7 +207,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,11 +218,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -256,7 +256,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -276,7 +276,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -286,7 +286,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -307,7 +307,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/nss/pom.xml b/modules/plugins/nss/pom.xml index ce34157..e5e9534 100644 --- a/modules/plugins/nss/pom.xml +++ b/modules/plugins/nss/pom.xml @@ -38,12 +38,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -53,7 +53,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -65,7 +65,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -75,11 +75,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -111,7 +111,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -131,7 +131,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -141,7 +141,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -162,7 +162,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/onewire/pom.xml b/modules/plugins/onewire/pom.xml index b991c55..3595d8d 100644 --- a/modules/plugins/onewire/pom.xml +++ b/modules/plugins/onewire/pom.xml @@ -92,12 +92,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -108,7 +108,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -116,7 +116,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -127,11 +127,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -165,7 +165,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -185,7 +185,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -195,7 +195,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -216,7 +216,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 4245f28..60fdb03 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -92,12 +92,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -108,7 +108,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -118,7 +118,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -129,11 +129,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -219,7 +219,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -239,7 +239,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -249,7 +249,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -270,7 +270,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 9549c47..28d63d4 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -50,12 +50,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -66,7 +66,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -76,7 +76,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -87,11 +87,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 57ce747..b098b14 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -37,7 +37,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -65,7 +65,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -131,12 +131,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -147,7 +147,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -155,7 +155,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -166,11 +166,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -204,7 +204,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -224,7 +224,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -234,7 +234,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -255,7 +255,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index f58ad01..a40b63d 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -65,7 +65,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -136,7 +136,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -202,12 +202,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,7 +218,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -226,7 +226,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -237,11 +237,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -275,7 +275,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -295,7 +295,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -305,7 +305,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -326,7 +326,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 605e377..46c873e 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -78,7 +78,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -110,7 +110,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -177,12 +177,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -193,7 +193,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -201,7 +201,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -212,11 +212,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -250,7 +250,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -270,7 +270,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -280,7 +280,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -301,7 +301,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 5a4abc6..5b023ba 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -148,12 +148,12 @@ <id>deploy</id> <phase>install</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 863acf0..46b0171 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -52,7 +52,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -85,7 +85,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -144,12 +144,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,7 +160,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -168,7 +168,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -179,11 +179,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -217,7 +217,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -237,7 +237,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -247,7 +247,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -268,7 +268,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 076e534..c3af4c6 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -77,7 +77,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -110,7 +110,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -175,12 +175,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,7 +191,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -199,7 +199,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -210,11 +210,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -248,7 +248,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -268,7 +268,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -278,7 +278,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -299,7 +299,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index eae465a..0f7bd3d 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -65,7 +65,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -136,7 +136,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -202,12 +202,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,7 +218,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -226,7 +226,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -237,11 +237,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -275,7 +275,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -295,7 +295,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -305,7 +305,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -326,7 +326,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index a9044b2..9a1370b 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -37,7 +37,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -65,7 +65,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -131,12 +131,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -147,7 +147,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -155,7 +155,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -166,11 +166,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -203,7 +203,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -223,7 +223,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -233,7 +233,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -254,7 +254,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 1202bd6..0c0bee5 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -104,12 +104,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -120,7 +120,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -130,7 +130,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -141,11 +141,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -180,7 +180,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -200,7 +200,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -210,7 +210,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -231,7 +231,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml index 256c63b..a484f18 100644 --- a/modules/plugins/services/pom.xml +++ b/modules/plugins/services/pom.xml @@ -46,7 +46,7 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${project.build.outputDirectory}/lib"/> <copy todir="${project.build.outputDirectory}/lib"> <fileset dir="/usr/share/java/dbus-java"> @@ -61,7 +61,7 @@ <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -72,7 +72,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -82,7 +82,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -93,11 +93,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -131,7 +131,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -151,7 +151,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -161,7 +161,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -182,7 +182,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 830338a..4f60a52 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -88,12 +88,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -104,7 +104,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -112,7 +112,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -123,11 +123,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -161,7 +161,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -181,7 +181,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,7 +191,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -212,7 +212,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index c04bf17..c3db44f 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -61,7 +61,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -128,7 +128,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -194,12 +194,12 @@ <id>deploy</id> <!--<phase>compile</phase>--> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -210,7 +210,7 @@ <id>deploy-jar-meta-inf</id> <!--<phase>package</phase>--> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -218,7 +218,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -229,11 +229,11 @@ <id>undeploy</id> <!--<phase>clean</phase>--> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -267,7 +267,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -287,7 +287,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -297,7 +297,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -318,7 +318,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 549b70a..4aed11b 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -54,7 +54,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -126,7 +126,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -192,12 +192,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -208,7 +208,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -216,7 +216,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -227,11 +227,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -265,7 +265,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -285,7 +285,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -295,7 +295,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -316,7 +316,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 891869b..ca0576f 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -60,7 +60,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -92,7 +92,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -158,12 +158,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -174,7 +174,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -182,7 +182,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -193,11 +193,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -231,7 +231,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -251,7 +251,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -261,7 +261,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -282,7 +282,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index f94068b..daf4755 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -48,12 +48,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -64,7 +64,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -74,7 +74,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -85,11 +85,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -147,7 +147,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -167,7 +167,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -177,7 +177,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -198,7 +198,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 2cad837..cff4b8b 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -23,7 +23,7 @@ <execution> <phase>integration-test</phase> <configuration> - <tasks> + <target> <property name="test.classpath" refid="maven.test.classpath" /> <echo>Validating plugins...</echo> <java classname="org.rhq.core.pc.plugin.PluginValidator" failonerror="true" fork="true"> @@ -65,7 +65,7 @@ <jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,address=8797,server=y,suspend=y" /> --> </java> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 9baf60d..e9fbb43 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -134,7 +134,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -165,7 +165,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -219,12 +219,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -235,7 +235,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -243,7 +243,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -254,11 +254,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -293,7 +293,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -313,7 +313,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -323,7 +323,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -344,7 +344,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 9c3f1d7..ba3e023 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -127,7 +127,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -147,7 +147,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" /> <!-- prepare directory structure for cobertura--> <mkdir dir="target/cobertura" /> @@ -178,7 +178,7 @@ </cobertura-report> <!-- delete cobertura.properties file --> <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/pom.xml b/pom.xml index 6dd1430..3ae18ec 100644 --- a/pom.xml +++ b/pom.xml @@ -975,7 +975,7 @@ </goals> <phase>generate-sources</phase> <configuration> - <tasks> + <target> <mkdir dir="target" />
<tstamp> @@ -989,7 +989,7 @@ <arg value="-n1"/> </exec> <echo file="target/build.properties" append="true">buildNumber = ${buildNumber}${line.separator}</echo> - </tasks> + </target> </configuration> </execution>
@@ -1000,10 +1000,10 @@ <goal>run</goal> </goals> <configuration> - <tasks> + <target> <echo level="debug">buildTime = ${buildTime}</echo> <echo level="debug">buildNumber = ${buildNumber}</echo> - </tasks> + </target> </configuration> </execution>
@@ -1012,11 +1012,11 @@ <phase>site</phase> <inherited>false</inherited> <configuration> - <tasks> + <target> <property name="apidocs.dir" value="target/apidocs" />
<copy dir="modules/core/domain/target/site/apidocs" todir="${apidocs.dir}/domain"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -1193,9 +1193,9 @@ <phase>validate</phase> <inherited>false</inherited> <configuration> - <tasks> + <target> <echo>. !!!!!!! dev profile is active !!!!!!!</echo> - </tasks> + </target> </configuration> <goals> <goal>run</goal>
rhq-commits@lists.fedorahosted.org
-
ips