aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2017-04-04 08:42:23 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2017-04-11 14:56:45 +0200
commit41068dbab56d7f3fab9bb8ef0ba026cdd6442b19 (patch)
tree6dd185c7dd38b92922d355ac1ce1560f20493f9c
parent964fff7ca9f072e6e084c0fac605980f19bc0278 (diff)
downloadsonarqube-41068dbab56d7f3fab9bb8ef0ba026cdd6442b19.tar.gz
sonarqube-41068dbab56d7f3fab9bb8ef0ba026cdd6442b19.zip
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.
-rw-r--r--tests/upgrade/pom.xml5
-rw-r--r--tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationResponse.java6
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
@@ -18,6 +18,11 @@
<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>
<version>${project.version}</version>
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;
}