upgraded dependencies

rocketbase-io · Sep 16, 2018 · 3644cee · 3644cee
1 parent 422ac88
commit 3644cee
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/commons-auth-core/pom.xml b/commons-auth-core/pom.xml
@@ -101,11 +101,6 @@ SOFTWARE.
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.pebbletemplates</groupId>
-            <artifactId>pebble</artifactId>
-            <version>${pebble.version}</version>
-        </dependency>
 
         <!-- security -->
         <dependency>
@@ -137,8 +132,20 @@ SOFTWARE.
 
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
+            <artifactId>jjwt-api</artifactId>
+            <version>${jjwt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>${jjwt.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
             <version>${jjwt.version}</version>
+            <scope>runtime</scope>
         </dependency>
 
         <!-- tests -->

diff --git a/...auth-core/src/test/java/io/rocketbase/commons/security/CustomAuthoritiesProviderTest.java b/...auth-core/src/test/java/io/rocketbase/commons/security/CustomAuthoritiesProviderTest.java
@@ -41,7 +41,7 @@ public void getExtraSecurityContextAuthorities() {
         List<GrantedAuthority> authorities = Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"));
 
         JwtProperties config = new JwtProperties();
-        config.setSecret("YSZESjg5aiZ0ZHszcSc1R0BEOiY5PFgp");
+        config.setSecret("NHU3eCFBJUQqRy1LYU5kUmdVa1hwMnM1djh5L0I/RShIK01iUWVTaFZtWXEzdDZ3OXokQyZGKUpATmNSZlVqVw==");
         JwtTokenService service = new JwtTokenService(config);
         service.customAuthoritiesProvider = myOwnImplementation();
         // when

diff --git a/commons-auth-core/src/test/java/io/rocketbase/commons/security/JwtTokenServiceTest.java b/commons-auth-core/src/test/java/io/rocketbase/commons/security/JwtTokenServiceTest.java
@@ -23,7 +23,7 @@ public class JwtTokenServiceTest {
 
     private JwtTokenService getInstance() {
         JwtProperties config = new JwtProperties();
-        config.setSecret("YSZESjg5aiZ0ZHszcSc1R0BEOiY5PFgp");
+        config.setSecret("NHU3eCFBJUQqRy1LYU5kUmdVa1hwMnM1djh5L0I/RShIK01iUWVTaFZtWXEzdDZ3OXokQyZGKUpATmNSZlVqVw==");
         JwtTokenService service = new JwtTokenService(config);
         service.customAuthoritiesProvider = new EmptyCustomAuthoritiesProvider();
         return service;

diff --git a/commons-auth-core/src/test/resources/application-test.yml b/commons-auth-core/src/test/resources/application-test.yml
@@ -31,5 +31,5 @@ logging:
 # auth configuration
 auth:
   jwt:
-    secret: 'UnU7PkNfKEAuJ045NDgkcls5OFR0MmteWmMpLlkze0U='
+    secret: 'P0UoSCtNYlBlU2hWbVlxM3Q2dzl6JEMmRilKQE5jUmZUalduWnI0dTd4IUElRCpHLUthUGRTZ1ZrWHAyczV2OA=='
   user-cache-time: 0
diff --git a/pom.xml b/pom.xml
@@ -87,15 +87,14 @@ SOFTWARE.
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring-boot.version>2.0.4.RELEASE</spring-boot.version>
+        <spring-boot.version>2.0.5.RELEASE</spring-boot.version>
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
         <commons-rest.version>1.3.0</commons-rest.version>
-        <jjwt.version>0.9.0</jjwt.version>
+        <jjwt.version>0.10.5</jjwt.version>
         <mapstruct.version>1.2.0.Final</mapstruct.version>
-        <pebble.version>2.6.0</pebble.version>
         <guava.version>26.0-jre</guava.version>
         <passay.version>1.0</passay.version>
-        <email-template-builder.version>1.0.2</email-template-builder.version>
+        <email-template-builder.version>1.1.0</email-template-builder.version>
     </properties>
 
     <dependencyManagement>