cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [2/4] git commit: add missing jar for awsapi as maven dependency
Date Tue, 09 Oct 2012 13:11:20 GMT
add missing jar for awsapi as maven dependency

Fixed conflicts between:
2f9941d85f8277f1fb2cbf958e41afb3fcd6960b
5c3ec1541040ecc9d1f1da240b38eed0c4802632

on:
awsapi/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/428f8ae1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/428f8ae1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/428f8ae1

Branch: refs/heads/master
Commit: 428f8ae152efbb08759083333f2ac15ce7197691
Parents: 39bd7e5
Author: frank <frank.zhang@citrix.com>
Authored: Mon Oct 8 20:46:43 2012 -0700
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Tue Oct 9 18:38:54 2012 +0530

----------------------------------------------------------------------
 awsapi/pom.xml          |   19 +++++++++++++++++--
 build/build-aws-api.xml |    3 +++
 2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/428f8ae1/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 10b9c9b..8108ce3 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -237,7 +237,22 @@
       <artifactId>mysql-connector-java</artifactId>
       <version>5.1.21</version>
       <scope>runtime</scope>
-    </dependency>    
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr-runtime</artifactId>
+      <version>3.4</version>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.9.0.GA</version>
+    </dependency>
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -251,7 +266,7 @@
       </resource>
       <resource>
           <directory>../utils/conf/</directory>
-      </resource>      
+      </resource>
     </resources>
     <plugins>
       <plugin>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/428f8ae1/build/build-aws-api.xml
----------------------------------------------------------------------
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index 0b1deec..40ad22c 100644
--- a/build/build-aws-api.xml
+++ b/build/build-aws-api.xml
@@ -383,6 +383,9 @@
               <include name="woden-*.jar"/>
               <include name="xercesImpl*.jar"/>
               <include name="xml-apis*.jar"/>
+              <include name="antlr*.jar"/>
+              <include name="dom4j*.jar"/>
+              <include name="javassist*.jar"/>
             </fileset>
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />


Mime
View raw message