From 0350e4784a0315e0cef59421da68b555513a083a Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew_dunlap@harvard.edu>
Date: Fri, 4 Aug 2017 16:33:07 -0400
Subject: [PATCH 1/3] Revert "Datafiles to data files #3921"

This reverts commit 0d1853bf7deb0e42e727eb987ebe46a87062c749.
---
 doc/sphinx-guides/source/installation/config.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 9a2624138ef..bbd585ef798 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -254,7 +254,7 @@ Then, we'll need to identify which S3 bucket we're using. Replace ``your_bucket_
 
 ``./asadmin create-jvm-options "-Ddataverse.files.s3-bucket-name=your_bucket_name"``
 
-Lastly, go ahead and restart your glassfish server. With Dataverse deployed and the site online, you should be able to upload datasets and data files and see the corresponding files in your S3 bucket. Within a bucket, the folder structure emulates that found in local file storage.
+Lastly, go ahead and restart your glassfish server. With Dataverse deployed and the site online, you should be able to upload datasets and datafiles and see the corresponding files in your S3 bucket. Within a bucket, the folder structure emulates that found in local file storage.
 
 .. _Branding Your Installation:
 

From 30d3f2715d808e64d2272badde733e53a53d736e Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew_dunlap@harvard.edu>
Date: Fri, 4 Aug 2017 17:11:14 -0400
Subject: [PATCH 2/3] Update config.rst

Accidentally reverted change to this word.
---
 doc/sphinx-guides/source/installation/config.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index bbd585ef798..9a2624138ef 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -254,7 +254,7 @@ Then, we'll need to identify which S3 bucket we're using. Replace ``your_bucket_
 
 ``./asadmin create-jvm-options "-Ddataverse.files.s3-bucket-name=your_bucket_name"``
 
-Lastly, go ahead and restart your glassfish server. With Dataverse deployed and the site online, you should be able to upload datasets and datafiles and see the corresponding files in your S3 bucket. Within a bucket, the folder structure emulates that found in local file storage.
+Lastly, go ahead and restart your glassfish server. With Dataverse deployed and the site online, you should be able to upload datasets and data files and see the corresponding files in your S3 bucket. Within a bucket, the folder structure emulates that found in local file storage.
 
 .. _Branding Your Installation:
 

From ca594dee55d7dbc1421600410ea8a40a04543e8b Mon Sep 17 00:00:00 2001
From: Rohit Bhattacharjee <rohit.bhattacharjee99@gmail.com>
Date: Mon, 7 Aug 2017 15:33:51 -0400
Subject: [PATCH 3/3] added pom changes to fix email bug #3921

---
 pom.xml | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 824f01b7c70..515e24894cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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> 
@@ -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>
@@ -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>