Merge pull request #1754 from bjagg/upgrade-jjwt

chore(deps): update jjwt to v0.10.6 (package change)
uPortal-Project · Jun 22, 2019 · a8e77cd · a8e77cd
2 parents 36a55c7 + 7307ac5
commit a8e77cd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -44,6 +44,7 @@ apereoPortletUtilsVersion=1.1.3
 aspectjVersion=1.9.4
 casClientVersion=3.5.1
 ccppVersion=1.0
+bouncyVersion=1.62
 cernunnosVersion=1.4.0
 commonsBeanutilsVersion=1.9.3
 commonsCliVersion=1.4
@@ -75,7 +76,7 @@ javaxMailVersion=1.4.7
 jasyptVersion=1.9.3
 jaxb2basicsVersion=1.11.1
 jgroupsVersion=3.6.17.Final
-jjwtVersion=0.9.1
+jjwtVersion=0.10.6
 jodaTimeVersion=2.10.2
 jodaTimeJsptagsVersion=1.1.1
 jsonassertVersion=1.5.0

diff --git a/uPortal-security/uPortal-security-core/build.gradle b/uPortal-security/uPortal-security-core/build.gradle
@@ -6,7 +6,10 @@ dependencies {
     compile project(':uPortal-i18n')
     compile project(':uPortal-soffit:uPortal-soffit-core')
 
-    compile "io.jsonwebtoken:jjwt:${jjwtVersion}"
+    compile "io.jsonwebtoken:jjwt-api:${jjwtVersion}"
+    runtime "io.jsonwebtoken:jjwt-impl:${jjwtVersion}",
+            "org.bouncycastle:bcprov-jdk15on:${bouncyVersion}",  // for RSASSA-PSS
+            "io.jsonwebtoken:jjwt-jackson:${jjwtVersion}"
     compile "org.jasypt:jasypt:${jasyptVersion}"
 
     testCompile "${servletApiDependency}"

diff --git a/uPortal-soffit/uPortal-soffit-core/build.gradle b/uPortal-soffit/uPortal-soffit-core/build.gradle
@@ -1,7 +1,10 @@
 description = "Apereo uPortal Soffit Core"
 
 dependencies {
-    compile "io.jsonwebtoken:jjwt:${jjwtVersion}"
+    compile "io.jsonwebtoken:jjwt-api:${jjwtVersion}"
+    runtime "io.jsonwebtoken:jjwt-impl:${jjwtVersion}",
+            "org.bouncycastle:bcprov-jdk15on:${bouncyVersion}",  // for RSASSA-PSS
+            "io.jsonwebtoken:jjwt-jackson:${jjwtVersion}"
     compile "org.apache.commons:commons-lang3:${commonsLang3Version}"
     compile "org.jasypt:jasypt:${jasyptVersion}"
     compile "org.slf4j:slf4j-api:${slf4jVersion}"

diff --git a/...Portal-soffit-core/src/main/java/org/apereo/portal/soffit/service/AbstractJwtService.java b/...Portal-soffit-core/src/main/java/org/apereo/portal/soffit/service/AbstractJwtService.java
@@ -38,7 +38,8 @@ public class AbstractJwtService {
     public static final String JWT_ISSUER = "Soffit";
 
     public static final String SIGNATURE_KEY_PROPERTY = "org.apereo.portal.soffit.jwt.signatureKey";
-    public static final String DEFAULT_SIGNATURE_KEY = "CHANGEME";
+    public static final String DEFAULT_SIGNATURE_KEY =
+            "CHANGEMEBx0myZ/pv/e7+xrdDLYGC1iIzSa6Uw5CPpH0KCCS1deESk3v+b+LYMz1ks57tjFb9vudpSCyRKXO5TeEBc45rfMyGtkRa1zri+hukZIAfgrvCbFixpCBxBusRs+uhXRuLxOe6k77VE+EMM4jVJArtNBgVPyV7iOC05kHNiYIGgs=";
 
     public static final String ENCRYPTION_PASSWORD_PROPERTY =
             "org.apereo.portal.soffit.jwt.encryptionPassword";