Skip to content

Commit

Permalink
#3921 fixed aws import
Browse files Browse the repository at this point in the history
AWS import now points to a version of the sdk that uses all its own unique named dependencies as to not cause conflicts.

As we go forward we should look into updating glassfish and using the normal SDK.
  • Loading branch information
matthew-a-dunlap committed Jul 27, 2017
1 parent b1c9cfa commit 74ce09e
Showing 1 changed file with 13 additions and 20 deletions.
33 changes: 13 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,24 @@

<dependencyManagement>
<dependencies>
<!--Due to our old version of glassfish and its version of jackson,
we are pointing to an aws sdk with unique references to needed libraries.
If we update glassfish, we should return to the normal sdk as well. -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.11.166</version>
<version>1.11.169</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- <dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
<version>1.11.169</version>
</dependency>-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -386,26 +394,11 @@
<artifactId>joss</artifactId>
<version>0.9.10</version>
</dependency>
<!-- AWS S3 cloud storage -->
<!-- <dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.11.166</version>
<type>pom</type>
<scope>import</scope>
</dependency> -->
<!--FIXME: Even with the aws block in DependencyManagement, maven complains about version? -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-ec2</artifactId>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-dynamodb</artifactId>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
<version>1.11.169</version>
</dependency>
<dependency>
<groupId>com.maxmind.geoip2</groupId>
Expand Down

0 comments on commit 74ce09e

Please sign in to comment.