From: Duarte Meneses <duarte.meneses@sonarsource.com>
Date: Fri, 19 Apr 2019 20:34:09 +0000 (-0500)
Subject: Upgrade jjwt to v0.10.5 for compatibility with Java 11
X-Git-Tag: 7.8~306
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ff9286920bee6199bf294cfd01fe944eb9e0a630;p=sonarqube.git

Upgrade jjwt to v0.10.5 for compatibility with Java 11
---

diff --git a/build.gradle b/build.gradle
index 41002fbf9d7..8a1cba4fdb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -144,7 +144,9 @@ subprojects {
       }
       dependency 'com.tngtech.java:junit-dataprovider:1.9.2'
       dependency 'info.picocli:picocli:3.6.1'
-      dependency 'io.jsonwebtoken:jjwt:0.9.0'
+      dependency 'io.jsonwebtoken:jjwt-api:0.10.5'
+      dependency 'io.jsonwebtoken:jjwt-impl:0.10.5'
+      dependency 'io.jsonwebtoken:jjwt-jackson:0.10.5'
       dependency 'javax.mail:mail:1.4.4'
       dependency 'javax.annotation:javax.annotation-api:1.3.1'
       dependency 'javax.servlet:javax.servlet-api:3.0.1'
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 15111dfb774..11001b42e03 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -33,7 +33,8 @@ dependencies {
   compile 'com.googlecode.java-diff-utils:diffutils'
   compile 'com.hazelcast:hazelcast-client'
   compile 'commons-dbutils:commons-dbutils'
-  compile 'io.jsonwebtoken:jjwt'
+  compile 'io.jsonwebtoken:jjwt-api'
+  compile 'io.jsonwebtoken:jjwt-impl'
   compile 'javax.xml.bind:jaxb-api'
   compile 'org.apache.httpcomponents:httpclient'
   compile 'org.apache.logging.log4j:log4j-api'
@@ -82,6 +83,8 @@ dependencies {
   testCompile 'org.subethamail:subethasmtp'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+
+  runtime 'io.jsonwebtoken:jjwt-jackson'
 }
 
 task testJar(type: Jar) {