From 41068dbab56d7f3fab9bb8ef0ba026cdd6442b19 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 4 Apr 2017 08:42:23 +0200
Subject: [PATCH] Fix dependency of upgrade tests on jsr305

Tests use JSR305 annotations, so the Maven dependency must be
explicitly defined instead of relying on transitive dependency.
---
 tests/upgrade/pom.xml                                       | 5 +++++
 .../sonarqube/upgrade/ServerMigrationResponse.java          | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/upgrade/pom.xml b/tests/upgrade/pom.xml
index dc46f2f5602..4bb1219e822 100644
--- a/tests/upgrade/pom.xml
+++ b/tests/upgrade/pom.xml
@@ -17,6 +17,11 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-ws</artifactId>
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationResponse.java b/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationResponse.java
index 298d01a5460..7b2815b1a98 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationResponse.java
+++ b/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationResponse.java
@@ -20,13 +20,11 @@
 package org.sonarsource.sonarqube.upgrade;
 
 import java.util.Date;
-
-import javax.annotation.Nullable;
+import javax.annotation.CheckForNull;
 
 class ServerMigrationResponse {
   private final Status status;
   private final String message;
-  @Nullable
   private final Date date;
 
   ServerMigrationResponse(Status status, String message, Date date) {
@@ -43,7 +41,7 @@ class ServerMigrationResponse {
     return message;
   }
 
-  @Nullable
+  @CheckForNull
   public Date getDate() {
     return date;
   }
-- 
2.39.5