Updated Branches: refs/heads/master 932476488 -> cd28e4f37
Added 1.7 as the version for antrun Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd28e4f3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd28e4f3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd28e4f3 Branch: refs/heads/master Commit: cd28e4f370be6e70a7b03323e84295893b8c8330 Parents: 9324764 Author: Alex Huang <alex.hu...@citrix.com> Authored: Fri Aug 2 16:34:47 2013 -0700 Committer: Alex Huang <alex.hu...@citrix.com> Committed: Fri Aug 2 16:34:47 2013 -0700 ---------------------------------------------------------------------- pom.xml | 97 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 49 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd28e4f3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0c9e4f1..ce956e3 100644 --- a/pom.xml +++ b/pom.xml @@ -346,46 +346,46 @@ <artifactId>javax.inject</artifactId> <version>1</version> </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${cs.gson.version}</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${cs.guava.version}</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> - <version>2.1.0_1</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjtools</artifactId> - <version>1.6.2</version> - </dependency> - <dependency> - <groupId>org.apache.axis</groupId> - <artifactId>axis</artifactId> - <version>${cs.axis.version}</version> - </dependency> - <dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${cs.gson.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${cs.guava.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> + <version>2.1.0_1</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjtools</artifactId> + <version>1.6.2</version> + </dependency> + <dependency> + <groupId>org.apache.axis</groupId> + <artifactId>axis</artifactId> + <version>${cs.axis.version}</version> + </dependency> + <dependency> <groupId>commons-daemon</groupId> <artifactId>commons-daemon</artifactId> <version>${cs.daemon.version}</version> - </dependency> - <dependency> - <groupId>org.apache.axis</groupId> - <artifactId>axis-jaxrpc</artifactId> - <version>${cs.axis.version}</version> - </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.4</version> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>${cs.axis.version}</version> + </dependency> + <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.4</version> + </dependency> </dependencies> </dependencyManagement> @@ -408,11 +408,11 @@ <version>${org.springframework.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> </dependencies> <build> @@ -469,12 +469,8 @@ <pluginExecutions> <pluginExecution> <pluginExecutionFilter> - <groupId> - org.apache.maven.plugins - </groupId> - <artifactId> - maven-antrun-plugin - </artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> <versionRange>[1.7,)</versionRange> <goals> <goal>run</goal> @@ -494,6 +490,11 @@ <version>2.0</version> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>0.8</version>
