Skip to content

Commit

Permalink
added pom changes to fix email bug IQSS#3921
Browse files Browse the repository at this point in the history
  • Loading branch information
rbhatta99 committed Aug 7, 2017
1 parent 30d3f27 commit ca594de
Showing 1 changed file with 23 additions and 5 deletions.
28 changes: 23 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<dependencyManagement>
<dependencies>
<!--Due to our old version of glassfish and its version of jackson,
<!-- 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>
Expand All @@ -65,14 +65,32 @@
<type>pom</type>
<scope>import</scope>
</dependency>

</dependencies>
</dependencyManagement>
<dependencies>
<!-- <dependency>
<!-- <dependency>-->
<!-- <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>-->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
<exclusions>
<exclusion>
<artifactId>aws-java-sdk-ses</artifactId>

</exclusion>

</exclusions>
<!--
<configuration>
<excludes>
<exclude>**/simplemail/*</exclude>
</excludes>
</configuration>-->
<version>1.11.169</version>
</dependency>-->
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -395,11 +413,11 @@
<version>0.9.10</version>
</dependency>
<!--FIXME: Even with the aws block in DependencyManagement, maven complains about version? -->
<dependency>
<!-- <dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
<version>1.11.169</version>
</dependency>
</dependency>-->
<dependency>
<groupId>com.maxmind.geoip2</groupId>
<artifactId>geoip2</artifactId>
Expand Down

0 comments on commit ca594de

Please sign in to comment.