feat(deps): Depend on aws-java-sdk-s3 dependency instead of aws-java-…

…sdk and remove awsobjectmapper (spinnaker#592)
xiahuai · Aug 1, 2019 · 7188da0 · 7188da0
1 parent 8269040
commit 7188da0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/kayenta-aws/kayenta-aws.gradle b/kayenta-aws/kayenta-aws.gradle
@@ -1,5 +1,5 @@
 dependencies {
   implementation project(":kayenta-core")
 
-  api "com.amazonaws:aws-java-sdk"
+  api "com.amazonaws:aws-java-sdk-s3"
 }
diff --git a/kayenta-s3/kayenta-s3.gradle b/kayenta-s3/kayenta-s3.gradle
@@ -2,8 +2,7 @@ dependencies {
   implementation project(":kayenta-core")
   implementation project(":kayenta-aws")
 
-  api "com.amazonaws:aws-java-sdk"
-  api "com.netflix.awsobjectmapper:awsobjectmapper"
+  api "com.amazonaws:aws-java-sdk-s3"
   api "org.apache.httpcomponents:httpclient"
   api "org.apache.httpcomponents:httpcore"
 }
diff --git a/kayenta-s3/src/main/java/com/netflix/kayenta/s3/config/S3Configuration.java b/kayenta-s3/src/main/java/com/netflix/kayenta/s3/config/S3Configuration.java
@@ -16,9 +16,7 @@
 
 package com.netflix.kayenta.s3.config;
 
-import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.netflix.awsobjectmapper.AmazonObjectMapperConfigurer;
 import com.netflix.kayenta.aws.security.AwsNamedAccountCredentials;
 import com.netflix.kayenta.s3.storage.S3StorageService;
 import com.netflix.kayenta.security.AccountCredentials;
@@ -43,8 +41,6 @@ public class S3Configuration {
   @DependsOn({"registerAwsCredentials"})
   public S3StorageService s3StorageService(
       AccountCredentialsRepository accountCredentialsRepository) {
-    AmazonObjectMapperConfigurer.configure(kayentaObjectMapper);
-    kayentaObjectMapper.configure(MapperFeature.AUTO_DETECT_IS_GETTERS, true);
     S3StorageService.S3StorageServiceBuilder s3StorageServiceBuilder = S3StorageService.builder();
 
     accountCredentialsRepository.getAll().stream()