parent
1dbd23968c
commit
a1669be4d1
14
pom.xml
14
pom.xml
|
@ -90,14 +90,9 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.amazonaws</groupId>
|
<groupId>com.amazonaws</groupId>
|
||||||
<artifactId>aws-java-sdk</artifactId>
|
<artifactId>aws-java-sdk</artifactId>
|
||||||
<version>1.3.32</version>
|
<version>1.7.3</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<!-- We need to exclude httpclient, since it pulls the wrong version -->
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpclient</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<!-- jackson is optional -->
|
<!-- jackson is optional -->
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.codehaus.jackson</groupId>
|
<groupId>org.codehaus.jackson</groupId>
|
||||||
|
@ -110,13 +105,6 @@
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- We need to explicitly set the http client version since aws-java-sdk pulls the wrong version -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpclient</artifactId>
|
|
||||||
<version>4.1.1</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- We need to explicitly set the common codec version since aws-java-sdk pulls the wrong version -->
|
<!-- We need to explicitly set the common codec version since aws-java-sdk pulls the wrong version -->
|
||||||
<!-- See https://github.com/elasticsearch/elasticsearch-cloud-aws/issues/29 -->
|
<!-- See https://github.com/elasticsearch/elasticsearch-cloud-aws/issues/29 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
<useTransitiveFiltering>true</useTransitiveFiltering>
|
<useTransitiveFiltering>true</useTransitiveFiltering>
|
||||||
<includes>
|
<includes>
|
||||||
<include>com.amazonaws:aws-java-sdk</include>
|
<include>com.amazonaws:aws-java-sdk</include>
|
||||||
<include>org.apache.httpcomponents:httpclient</include>
|
|
||||||
<include>commons-codec:commons-codec</include>
|
<include>commons-codec:commons-codec</include>
|
||||||
</includes>
|
</includes>
|
||||||
</dependencySet>
|
</dependencySet>
|
||||||
|
|
Loading…
Reference in New Issue