apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

add missing jar for awsapi as maven dependency

Browse Source 
Fixed conflicts between:
2f9941d85f8277f1fb2cbf958e41afb3fcd6960b
5c3ec1541040ecc9d1f1da240b38eed0c4802632

on:
awsapi/pom.xml
This commit is contained in:
frank 2012-10-08 20:46:43 -07:00 committed by Rohit Yadav
parent 39bd7e5f51
commit 428f8ae152
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
awsapi/pom.xml
View File

@ -237,7 +237,22 @@
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.21</version> <version>5.1.21</version>
<scope>runtime</scope> <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> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
@ -251,7 +266,7 @@
</resource> </resource>
<resource> <resource>
<directory>../utils/conf/</directory> <directory>../utils/conf/</directory>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>

3
build/build-aws-api.xml
View File

@ -383,6 +383,9 @@
<include name="woden-*.jar"/> <include name="woden-*.jar"/>
<include name="xercesImpl*.jar"/> <include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/> <include name="xml-apis*.jar"/>
<include name="antlr*.jar"/>
<include name="dom4j*.jar"/>
<include name="javassist*.jar"/>
</fileset> </fileset>
<fileset dir="${jar.dir}"> <fileset dir="${jar.dir}">
<include name="cloud-awsapi.jar" /> <include name="cloud-awsapi.jar" />