Skip to content

Commit 428f8ae

Browse files
frankyadvr
authored andcommitted
add missing jar for awsapi as maven dependency
Fixed conflicts between: 2f9941d 5c3ec15 on: awsapi/pom.xml
1 parent 39bd7e5 commit 428f8ae

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

awsapi/pom.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,22 @@
237237
<artifactId>mysql-connector-java</artifactId>
238238
<version>5.1.21</version>
239239
<scope>runtime</scope>
240-
</dependency>
240+
</dependency>
241+
<dependency>
242+
<groupId>org.antlr</groupId>
243+
<artifactId>antlr-runtime</artifactId>
244+
<version>3.4</version>
245+
</dependency>
246+
<dependency>
247+
<groupId>dom4j</groupId>
248+
<artifactId>dom4j</artifactId>
249+
<version>1.6.1</version>
250+
</dependency>
251+
<dependency>
252+
<groupId>javassist</groupId>
253+
<artifactId>javassist</artifactId>
254+
<version>3.9.0.GA</version>
255+
</dependency>
241256
</dependencies>
242257
<build>
243258
<defaultGoal>install</defaultGoal>
@@ -251,7 +266,7 @@
251266
</resource>
252267
<resource>
253268
<directory>../utils/conf/</directory>
254-
</resource>
269+
</resource>
255270
</resources>
256271
<plugins>
257272
<plugin>

build/build-aws-api.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,9 @@
383383
<include name="woden-*.jar"/>
384384
<include name="xercesImpl*.jar"/>
385385
<include name="xml-apis*.jar"/>
386+
<include name="antlr*.jar"/>
387+
<include name="dom4j*.jar"/>
388+
<include name="javassist*.jar"/>
386389
</fileset>
387390
<fileset dir="${jar.dir}">
388391
<include name="cloud-awsapi.jar" />

0 commit comments

Comments
 (0)