honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'split-aws-java-sdk' of https://github.com/Collaborne/elasticsearch-cloud-aws into Collaborne-split-aws-java-sdk

This commit is contained in:
tlrx 2014-11-26 16:44:44 +01:00
parent d0c712299b dce47eb481
commit 77e9d7f16f
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pom.xml
View File

@ -96,20 +96,15 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<artifactId>aws-java-sdk-ec2</artifactId>
<version>${amazonaws.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${amazonaws.version}</version>
<scope>compile</scope>
<exclusions>
<!-- jackson is optional -->
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- We need to explicitly set the common codec version since aws-java-sdk pulls the wrong version -->

4
src/main/assemblies/plugin.xml
View File

@ -19,7 +19,9 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>com.amazonaws:aws-java-sdk</include>
<include>com.amazonaws:aws-java-sdk-core</include>
<include>com.amazonaws:aws-java-sdk-ec2</include>
<include>com.amazonaws:aws-java-sdk-s3</include>
<include>commons-codec:commons-codec</include>
</includes>
</dependencySet>