From 428f8ae152efbb08759083333f2ac15ce7197691 Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Mon, 8 Oct 2012 20:46:43 -0700
Subject: [PATCH] add missing jar for awsapi as maven dependency

Fixed conflicts between:
2f9941d85f8277f1fb2cbf958e41afb3fcd6960b
5c3ec1541040ecc9d1f1da240b38eed0c4802632

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

diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 10b9c9be5b5..8108ce35c12 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>
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index 0b1deec7d5d..40ad22c2679 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" />