Revert "fixed m2eclipse error" because it breaks packaging This reverts commit 5bcd8280fdd1e9039a6bf6c4c4fd43b8b49f938e.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d2271d1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d2271d1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d2271d1 Branch: refs/heads/rbac Commit: 9d2271d115f400f467017eb4af6fa2d7ebe5b77e Parents: 25d4333 Author: Hugo Trippaers <[email protected]> Authored: Wed Oct 30 20:17:59 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Wed Oct 30 20:17:59 2013 +0100 ---------------------------------------------------------------------- agent/pom.xml | 139 +++++++++++++------------- plugins/hypervisors/kvm/pom.xml | 62 ++++++------ plugins/user-authenticators/ldap/pom.xml | 128 ++++++++++++------------ usage/pom.xml | 138 +++++++++++++------------ 4 files changed, 230 insertions(+), 237 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d2271d1/agent/pom.xml ---------------------------------------------------------------------- diff --git a/agent/pom.xml b/agent/pom.xml index ec1ddde..1413322 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -46,75 +46,74 @@ </dependency> </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-resource</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <copy todir="${basedir}/target/transformed"> - <fileset dir="${basedir}/conf"> - <include name="agent.properties" /> - </fileset> - </copy> - <copy overwrite="true" - todir="${basedir}/target/transformed"> - <fileset dir="${basedir}/conf"> - <include name="*.in" /> - </fileset> - <globmapper from="*.in" to="*" /> - <filterchain> - <filterreader - classname="org.apache.tools.ant.filters.ReplaceTokens"> - <param type="propertiesfile" - value="${cs.replace.properties}" /> - </filterreader> - </filterchain> - </copy> - <copy overwrite="true" - todir="${basedir}/target/transformed"> - <fileset dir="${basedir}/bindir"> - <include name="*.in" /> - </fileset> - <globmapper from="*.in" to="*" /> - <filterchain> - <filterreader - classname="org.apache.tools.ant.filters.ReplaceTokens"> - <param type="propertiesfile" - value="${cs.replace.properties}" /> - </filterreader> - </filterchain> - </copy> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/dependencies</outputDirectory> - <includeScope>runtime</includeScope> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-resource</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <copy + todir="${basedir}/target/transformed"> + <fileset dir="${basedir}/conf"> + <include name="agent.properties" /> + </fileset> + </copy> + <copy overwrite="true" + todir="${basedir}/target/transformed"> + <fileset dir="${basedir}/conf"> + <include name="*.in" /> + </fileset> + <globmapper from="*.in" to="*" /> + <filterchain> + <filterreader + classname="org.apache.tools.ant.filters.ReplaceTokens"> + <param type="propertiesfile" + value="${cs.replace.properties}" /> + </filterreader> + </filterchain> + </copy> + <copy overwrite="true" + todir="${basedir}/target/transformed"> + <fileset dir="${basedir}/bindir"> + <include name="*.in" /> + </fileset> + <globmapper from="*.in" to="*" /> + <filterchain> + <filterreader + classname="org.apache.tools.ant.filters.ReplaceTokens"> + <param type="propertiesfile" + value="${cs.replace.properties}" /> + </filterreader> + </filterchain> + </copy> + </target> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/dependencies</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d2271d1/plugins/hypervisors/kvm/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 0c0001f..e279621 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -58,37 +58,35 @@ <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> <testSourceDirectory>test</testSourceDirectory> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/dependencies</outputDirectory> - <includeScope>runtime</includeScope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.14</version> - <configuration> - <excludes> - <exclude>**/Qemu*.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/dependencies</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.14</version> + <configuration> + <excludes> + <exclude>**/Qemu*.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d2271d1/plugins/user-authenticators/ldap/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index 5ecb45c..1f9dea0 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -20,78 +20,76 @@ </parent> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.3</version> - <configuration> - <providerSelection>1.7</providerSelection> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - <goal>testCompile</goal> - </goals> - <configuration> - <sources> - <fileset> - <directory>test/groovy</directory> - <includes> - <include>**/*.groovy</include> - </includes> - </fileset> - </sources> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codehaus.gmaven.runtime</groupId> - <artifactId>gmaven-runtime-1.7</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>2.0.5</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*Spec*</include> - </includes> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.3</version> + <configuration> + <providerSelection>1.7</providerSelection> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>testCompile</goal> + </goals> + <configuration> + <sources> + <fileset> + <directory>test/groovy</directory> + <includes> + <include>**/*.groovy</include> + </includes> + </fileset> + </sources> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.gmaven.runtime</groupId> + <artifactId>gmaven-runtime-1.7</artifactId> + <version>1.3</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>2.0.5</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*Spec*</include> + </includes> + </configuration> + </plugin> - <plugin> - <groupId>com.btmatthews.maven.plugins</groupId> - <artifactId>ldap-maven-plugin</artifactId> - <version>1.1.0</version> - <configuration> - <monitorPort>11389</monitorPort> + <plugin> + <groupId>com.btmatthews.maven.plugins</groupId> + <artifactId>ldap-maven-plugin</artifactId> + <version>1.1.0</version> + <configuration> + <monitorPort>11389</monitorPort> <monitorKey>ldap</monitorKey> <daemon>false</daemon> <rootDn>dc=cloudstack,dc=org</rootDn> <ldapPort>10389</ldapPort> <ldifFile>test/resources/cloudstack.org.ldif</ldifFile> - </configuration> - </plugin> + </configuration> + </plugin> - </plugins> - </pluginManagement> + </plugins> </build> <dependencies> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d2271d1/usage/pom.xml ---------------------------------------------------------------------- diff --git a/usage/pom.xml b/usage/pom.xml index 19929d6..04d1630 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -51,76 +51,74 @@ <directory>resources</directory> </resource> </resources> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>com/cloud/usage/UsageManagerTest.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/dependencies</outputDirectory> - <includeScope>runtime</includeScope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-resource</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <copy overwrite="true" todir="${basedir}/target/transformed"> - <fileset dir="${basedir}/../client/tomcatconf"> - <include name="**/db.properties.in" /> - </fileset> - <globmapper from="*.in" to="*" /> - <filterchain> - <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> - <param type="propertiesfile" value="${cs.replace.properties}" /> - </filterreader> - </filterchain> - </copy> - </target> - <target> - <copy overwrite="true" todir="${basedir}/target/transformed"> - <fileset dir="${basedir}/conf"> - <include name="*.in" /> - </fileset> - <globmapper from="*.in" to="*" /> - <filterchain> - <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> - <param type="propertiesfile" value="${cs.replace.properties}" /> - </filterreader> - </filterchain> - </copy> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>com/cloud/usage/UsageManagerTest.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/dependencies</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-resource</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <copy overwrite="true" todir="${basedir}/target/transformed"> + <fileset dir="${basedir}/../client/tomcatconf"> + <include name="**/db.properties.in" /> + </fileset> + <globmapper from="*.in" to="*" /> + <filterchain> + <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> + <param type="propertiesfile" value="${cs.replace.properties}" /> + </filterreader> + </filterchain> + </copy> + </target> + <target> + <copy overwrite="true" todir="${basedir}/target/transformed"> + <fileset dir="${basedir}/conf"> + <include name="*.in" /> + </fileset> + <globmapper from="*.in" to="*" /> + <filterchain> + <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> + <param type="propertiesfile" value="${cs.replace.properties}" /> + </filterreader> + </filterchain> + </copy> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> <profiles> <profile>
