From 777022ddada63910179e89518a2d76ee4d84463f Mon Sep 17 00:00:00 2001
From: Matthew Miller <millem@amazon.com>
Date: Thu, 2 Nov 2017 15:04:07 -0700
Subject: [PATCH] Upgrade dependencies to support future migration to Java 9.

1. Migrated from FindBugs to SpotBugs
2. Upgraded any dependencies that no longer worked on Java 9
3. Added explicit dependency on javax annotations for @Generated annotation access.
4. Fixed a warning from SpotBugs that was not caught by FindBugs.
---
 build-tools/pom.xml                           |  2 +-
 ...ressions.xml => spotbugs-suppressions.xml} |  0
 bundle/pom.xml                                |  2 +-
 codegen-maven-plugin/pom.xml                  |  6 +++---
 core/pom.xml                                  |  4 ++++
 pom.xml                                       | 21 ++++++++++++-------
 services/pom.xml                              |  6 +++---
 .../protocol/ProtocolTestSuiteLoader.java     |  2 +-
 8 files changed, 26 insertions(+), 17 deletions(-)
 rename build-tools/src/main/resources/software/amazon/awssdk/{findbugs-suppressions.xml => spotbugs-suppressions.xml} (100%)

diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index c8238f5acc97..e64db56cbd82 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -22,7 +22,7 @@
     <artifactId>build-tools</artifactId>
     <name>AWS Java SDK :: Build Tools</name>
     <version>1.0</version>
-    <description>This package holds the resources used for checkstyle and findbugs.
+    <description>This package holds the resources used for checkstyle and spotbugs.
     </description>
 
     <build>
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/findbugs-suppressions.xml b/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
similarity index 100%
rename from build-tools/src/main/resources/software/amazon/awssdk/findbugs-suppressions.xml
rename to build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 62f84d563539..ae7a2e1f3fab 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -50,7 +50,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.1.0</version>
                 <configuration>
                     <artifactSet>
                         <includes>
diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
index 1d1edc01dc6f..ca6c90ee6baf 100644
--- a/codegen-maven-plugin/pom.xml
+++ b/codegen-maven-plugin/pom.xml
@@ -44,12 +44,12 @@
         <dependency>
             <artifactId>maven-plugin-api</artifactId>
             <groupId>org.apache.maven</groupId>
-            <version>3.3.9</version>
+            <version>3.5.0</version>
         </dependency>
         <dependency>
             <artifactId>maven-plugin-annotations</artifactId>
             <groupId>org.apache.maven.plugin-tools</groupId>
-            <version>3.4</version>
+            <version>3.5</version>
         </dependency>
         <dependency>
             <artifactId>maven-project</artifactId>
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.4</version>
+                <version>3.5</version>
                 <executions>
                     <execution>
                         <id>default-descriptor</id>
diff --git a/core/pom.xml b/core/pom.xml
index d4c0c63fed77..eeae1cd02022 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -32,6 +32,10 @@
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
     <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 53143a4a7355..1401da852ad2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
         <jackson.version>2.9.1</jackson.version>
         <ion.java.version>1.0.2</ion.java.version>
         <junit.version>4.12</junit.version>
-        <easymock.version>3.4</easymock.version>
+        <easymock.version>3.5</easymock.version>
         <commons.lang.version>3.4</commons.lang.version>
         <wiremock.version>1.55</wiremock.version>
         <slf4j.version>1.7.25</slf4j.version>
@@ -90,7 +90,7 @@
         <commons.io.version>2.5</commons.io.version>
         <mockito.version>1.10.19</mockito.version>
         <assertj.version>3.8.0</assertj.version>
-        <equalsverifier.version>2.3.1</equalsverifier.version>
+        <equalsverifier.version>2.3.3</equalsverifier.version>
         <guava.version>19.0</guava.version>
         <netty.version>4.1.13.Final</netty.version>
         <unitils.version>3.3</unitils.version>
@@ -303,6 +303,11 @@
                 <artifactId>jmespath-jackson</artifactId>
                 <version>0.2.0</version>
             </dependency>
+            <dependency>
+                <groupId>javax.annotation</groupId>
+                <artifactId>javax.annotation-api</artifactId>
+                <version>1.3.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -395,9 +400,9 @@
                     </executions>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>3.0.5</version>
+                    <groupId>com.github.hazendaz.spotbugs</groupId>
+                    <artifactId>spotbugs-maven-plugin</artifactId>
+                    <version>3.1.0-RC4</version>
                     <dependencies>
                         <dependency>
                             <groupId>software.amazon.awssdk</groupId>
@@ -418,7 +423,7 @@
                         <failOnError>true</failOnError>
                         <fork>false</fork>
                         <findbugsXmlOutput>true</findbugsXmlOutput>
-                        <excludeFilterFile>software/amazon/awssdk/findbugs-suppressions.xml</excludeFilterFile>
+                        <excludeFilterFile>software/amazon/awssdk/spotbugs-suppressions.xml</excludeFilterFile>
                         <threshold>Low</threshold>
                         <effort>Max</effort>
                     </configuration>
@@ -488,8 +493,8 @@
             </plugin>
 
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
+                <groupId>com.github.hazendaz.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
             </plugin>
 
         </plugins>
diff --git a/services/pom.xml b/services/pom.xml
index 419764519ff6..0b7f0793e5a0 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -192,10 +192,10 @@
                     </executions>
                 </plugin>
 
-                <!-- Disable findbugs for service clients to speed up the build. -->
+                <!-- Disable spotbugs for service clients to speed up the build. -->
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
+                    <groupId>com.github.hazendaz.spotbugs</groupId>
+                    <artifactId>spotbugs-maven-plugin</artifactId>
                     <configuration>
                         <skip>true</skip>
                     </configuration>
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/ProtocolTestSuiteLoader.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/ProtocolTestSuiteLoader.java
index 854ccd2ac449..36da1b04ab17 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/ProtocolTestSuiteLoader.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/ProtocolTestSuiteLoader.java
@@ -30,7 +30,7 @@
  * Loads the test specification from it's JSON representation. Assumes the JSON files are in the
  * AwsDrSharedSdk package under /test/protocols.
  */
-public class ProtocolTestSuiteLoader {
+public final class ProtocolTestSuiteLoader {
 
     private static final String RESOURCE_PREFIX = "/software/amazon/awssdk/protocol/suites/";
     private static final ObjectMapper MAPPER = new ObjectMapper()