Merge branch 'master' into java8

Author: johnwalker

CHANGELOG.md

@@ -1,10 +1,12 @@
 # Changelog
 
-## 1.3.6
+## 1.3.6 -- 2018-12-10
 
-### Minor Changes
+### Patches
 * Fixed typos in Exception messages (excryption -> encryption) #78
 * Fixed DecryptionMaterialsRequest.Builder to copy EncryptionContext #77
+
+### Maintenance
 * JML Specifications for CipherBlockHeaders #74
 * Minor Java code cleanup #73
 * Added JML specs in #72

README.md

@@ -45,7 +45,7 @@ You can get the latest release from Maven:
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-encryption-sdk-java</artifactId>
-  <version>1.3.5</version>
+  <version>1.3.6</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-encryption-sdk-java</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
     <packaging>jar</packaging>
 
     <name>aws-encryption-sdk-java</name>
@@ -49,13 +49,13 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-ext-jdk15on</artifactId>
-            <version>1.54</version>
+            <version>1.60</version>
         </dependency>
 
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.23.0</version>
+            <version>2.23.4</version>
             <scope>test</scope>
         </dependency>
 
@@ -114,7 +114,7 @@
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>1024m</maxmemory>
-                    <additionalparam>-Xdoclint:none</additionalparam>
+                    <doclint>none</doclint>
                 </configuration>
             </plugin>
         </plugins>