Use only the S3 and EC2 parts of the AWS Java SDK

Note that jackson is not marked as optional in the SDK POM, and the SDK uses Jackson 2 now.

Author: ankon

pom.xml

@@ -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 -->

src/main/assemblies/plugin.xml

@@ -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>