From 6a60e655e34f47a9634bd66fffb6c3f1a6868a49 Mon Sep 17 00:00:00 2001
From: Marcus Da Coregio <marcusdacoregio@gmail.com>
Date: Fri, 8 Oct 2021 15:38:13 -0300
Subject: [PATCH] Update to JDK 17

Issue gh-46
---
 gradle.properties                                      |  2 +-
 .../webflux/kotlin/hello-security/build.gradle.kts     |  6 +++---
 servlet/java-configuration/aspectj/build.gradle        | 10 ++++++++++
 .../spring-boot/kotlin/hello-security/build.gradle.kts |  6 +++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 02622be..5ab3f03 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 version=5.6.0-SNAPSHOT
 spring-security.version=5.6.0-SNAPSHOT
-org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true
 org.gradle.caching=true
diff --git a/reactive/webflux/kotlin/hello-security/build.gradle.kts b/reactive/webflux/kotlin/hello-security/build.gradle.kts
index 599715f..ce05304 100644
--- a/reactive/webflux/kotlin/hello-security/build.gradle.kts
+++ b/reactive/webflux/kotlin/hello-security/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("org.springframework.boot") version "2.5.0"
     id("io.spring.dependency-management") version "1.0.9.RELEASE"
-    kotlin("jvm") version "1.5.0"
-    kotlin("plugin.spring") version "1.5.0"
+    kotlin("jvm") version "1.5.31"
+    kotlin("plugin.spring") version "1.5.31"
 }
 
 repositories {
@@ -34,7 +34,7 @@ dependencies {
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/servlet/java-configuration/aspectj/build.gradle b/servlet/java-configuration/aspectj/build.gradle
index ea899bd..03942c2 100644
--- a/servlet/java-configuration/aspectj/build.gradle
+++ b/servlet/java-configuration/aspectj/build.gradle
@@ -8,6 +8,16 @@ repositories {
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
+compileJava {
+	sourceCompatibility "1.8"
+	targetCompatibility "1.8"
+}
+
+compileTestJava {
+	sourceCompatibility "1.8"
+	targetCompatibility "1.8"
+}
+
 dependencies {
 	aspect platform("org.springframework:spring-framework-bom:5.3.0")
 	aspect platform("org.springframework.security:spring-security-bom:5.4.0-SNAPSHOT")
diff --git a/servlet/spring-boot/kotlin/hello-security/build.gradle.kts b/servlet/spring-boot/kotlin/hello-security/build.gradle.kts
index 4f650c4..33155d2 100644
--- a/servlet/spring-boot/kotlin/hello-security/build.gradle.kts
+++ b/servlet/spring-boot/kotlin/hello-security/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("org.springframework.boot") version "2.5.0"
     id("io.spring.dependency-management") version "1.0.9.RELEASE"
-    kotlin("jvm") version "1.5.0"
-    kotlin("plugin.spring") version "1.5.0"
+    kotlin("jvm") version "1.5.31"
+    kotlin("plugin.spring") version "1.5.31"
 }
 
 repositories {
@@ -28,7 +28,7 @@ dependencies {
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }