#1 Update jdk, gradle and 3rd party libraries

tscz · Jul 17, 2020 · 6731fc1 · 6731fc1
1 parent a585bd8
commit 6731fc1
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up JDK 12
+    - name: Set up JDK 14
       uses: actions/setup-java@v1
       with:
-        java-version: 12
+        java-version: 14
     - name: Build with Gradle
       run: ./gradlew build --info
        # Manual upload of coverage report, see https://github.com/kt3k/coveralls-gradle-plugin/issues/85

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,21 +1,20 @@
 ext {
   versions = [
-    guava: "28.0-jre",
-  	jjwt: "0.10.7",
-  	postgres: "42.2.6",
-  	problem: "0.23.0",
-	spring: "5.2.2.RELEASE",
-	spring_boot: "2.2.2.RELEASE",
+    guava: "29.0-jre",
+  	jjwt: "0.11.2",
+  	postgres: "42.2.14",
+  	problem: "0.25.2",
+	spring: "5.2.7.RELEASE",
+	spring_boot: "2.3.1.RELEASE",
   ]
   testVersions = [
   	jsonassert: "2.8.0",
   	h2: "1.4.200",
-  	httpclient: "4.5.10",
+  	httpclient: "4.5.12",
   ]
   pluginVersions = [
-    asciidoc: "2.3.0",
-    coveralls: "2.8.4",
-    jacoco: "0.8.4",
+    asciidoc: "3.2.0",
+    coveralls: "2.10.1"
   ]
   libraries = [
     guava: "com.google.guava:guava:${versions.guava}",
@@ -29,6 +28,7 @@ ext {
     spring_boot_starter_jpa: "org.springframework.boot:spring-boot-starter-data-jpa",
     spring_boot_starter_security: "org.springframework.boot:spring-boot-starter-security",
     spring_boot_starter_web: "org.springframework.boot:spring-boot-starter-web",
+    spring_boot_starter_validation: "org.springframework.boot:spring-boot-starter-validation",
   ]
   testLibraries = [
     h2: "com.h2database:h2:${testVersions.h2}",
@@ -39,7 +39,8 @@ ext {
   ]
   gradlePlugins = [
 	asciidoc: "org.asciidoctor:asciidoctor-gradle-jvm:${pluginVersions.asciidoc}",
-    coveralls: "gradle.plugin.com.github.kt3k.coveralls:coveralls-gradle-plugin:${pluginVersions.coveralls}",
+	asciidoc_pdf: "org.asciidoctor:asciidoctor-gradle-jvm-pdf:${pluginVersions.asciidoc}",
+  coveralls: "gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:${pluginVersions.coveralls}",
 	spring_boot: "org.springframework.boot:spring-boot-gradle-plugin:${versions.spring_boot}",	
   ]
 }
diff --git a/gradle/spring-boot-platform.gradle b/gradle/spring-boot-platform.gradle
@@ -12,6 +12,7 @@ dependencies {
 	implementation libraries.spring_boot_starter_jpa
 	implementation libraries.spring_boot_starter_web
 	implementation libraries.spring_boot_starter_security
+	implementation libraries.spring_boot_starter_validation
 
 	runtimeOnly libraries.postgres
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...ng-boot-platform-tests/src/main/java/com/github/tscz/spring/platform/TestApplication.java b/...ng-boot-platform-tests/src/main/java/com/github/tscz/spring/platform/TestApplication.java
@@ -2,8 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 
-import com.github.tscz.spring.platform.SpringBootPlatformApplication;
-
 @SpringBootPlatformApplication
 public class TestApplication {
 

diff --git a/...g-boot-platform-tests/src/test/java/com/github/tscz/spring/platform/ApplicationTests.java b/...g-boot-platform-tests/src/test/java/com/github/tscz/spring/platform/ApplicationTests.java
@@ -22,8 +22,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.annotation.DirtiesContext;
-import org.zalando.problem.spring.web.advice.validation.ConstraintViolationProblem;
+import org.zalando.problem.violations.ConstraintViolationProblem;
 
 import com.github.tscz.spring.platform.jwt.JwtRequest;
 import com.github.tscz.spring.platform.jwt.JwtResponse;

diff --git a/spring-boot-platform/src/main/java/com/github/tscz/spring/platform/Application.java b/spring-boot-platform/src/main/java/com/github/tscz/spring/platform/Application.java
@@ -2,8 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 
-import com.github.tscz.spring.platform.SpringBootPlatformApplication;
-
 @SpringBootPlatformApplication
 public class Application {
 

diff --git a/spring-boot-platform/src/main/java/com/github/tscz/spring/platform/config/JacksonConfig.java b/spring-boot-platform/src/main/java/com/github/tscz/spring/platform/config/JacksonConfig.java
@@ -3,7 +3,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.zalando.problem.ProblemModule;
-import org.zalando.problem.validation.ConstraintViolationProblemModule;
+import org.zalando.problem.violations.ConstraintViolationProblemModule;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

diff --git a/...rm/src/main/java/com/github/tscz/spring/platform/exception/ResourceNotFoundException.java b/...rm/src/main/java/com/github/tscz/spring/platform/exception/ResourceNotFoundException.java
@@ -5,6 +5,11 @@
 
 @ResponseStatus(HttpStatus.NOT_FOUND)
 public class ResourceNotFoundException extends RuntimeException {
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
 	public ResourceNotFoundException(String message) {
 		super(message);
 	}

diff --git a/spring-boot-platform/src/main/java/com/github/tscz/spring/platform/jwt/JwtFilter.java b/spring-boot-platform/src/main/java/com/github/tscz/spring/platform/jwt/JwtFilter.java
@@ -16,8 +16,8 @@
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.zalando.problem.Status;
-import org.zalando.problem.spring.web.advice.validation.ConstraintViolationProblem;
-import org.zalando.problem.spring.web.advice.validation.Violation;
+import org.zalando.problem.violations.ConstraintViolationProblem;
+import org.zalando.problem.violations.Violation;
 
 public class JwtFilter extends OncePerRequestFilter {
 

diff --git a/spring-boot-platform/src/main/java/com/github/tscz/spring/platform/jwt/JwtTokenUtil.java b/spring-boot-platform/src/main/java/com/github/tscz/spring/platform/jwt/JwtTokenUtil.java
@@ -19,7 +19,7 @@ public class JwtTokenUtil {
 	public ApplicationConfig config;
 
 	public Claims getAllClaimsFromToken(String token) {
-		return Jwts.parser().setSigningKey(config.getJwtSecret()).parseClaimsJws(token).getBody();
+		return Jwts.parserBuilder().setSigningKey(config.getJwtSecret()).build().parseClaimsJws(token).getBody();
 	}
 
 	public String generateToken(String username) {

diff --git a/spring-boot-platform/src/test/java/com/github/tscz/spring/platform/jwt/JwtFilterTest.java b/spring-boot-platform/src/test/java/com/github/tscz/spring/platform/jwt/JwtFilterTest.java
@@ -24,7 +24,7 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.zalando.problem.spring.web.advice.validation.ConstraintViolationProblem;
+import org.zalando.problem.violations.ConstraintViolationProblem;
 
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.MalformedJwtException;

diff --git a/system.properties b/system.properties
@@ -1 +1 @@
-java.runtime.version=12
+java.runtime.version=14