From 34e79f4766a8fb2d387c342c7e8067fe5f259e84 Mon Sep 17 00:00:00 2001
From: Fredrich Ombico <fombico@vmware.com>
Date: Wed, 9 Nov 2022 14:57:01 -0500
Subject: [PATCH] Upgrade to JDK 17 and Gradle 7.5.1

---
 README.adoc                              | 2 +-
 build.gradle                             | 4 ++--
 ci/images/spring-credhub-ci/Dockerfile   | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 spring-credhub-docs/build.gradle         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.adoc b/README.adoc
index 00d26c8..f9d77bd 100644
--- a/README.adoc
+++ b/README.adoc
@@ -14,7 +14,7 @@ A simple application that demonstrates the use of Spring CredHub is available in
 
 === Basic Compile and Test
 
-To build the source you will need to install JDK 1.8.
+To build the source you will need to install JDK 17.
 
 Spring CredHub uses Gradle for most build-related activities, and you should be able to get off the ground quite quickly by cloning the project you are interested in and typing
 
diff --git a/build.gradle b/build.gradle
index 6c60d4e..813295d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,8 +119,8 @@ configure(publishedProjects) {
 }
 
 subprojects {
-	sourceCompatibility = 1.8
-	targetCompatibility = 1.8
+	sourceCompatibility = 17
+	targetCompatibility = 17
 
 	tasks.withType(JavaCompile) {
 		options.encoding = 'UTF-8'
diff --git a/ci/images/spring-credhub-ci/Dockerfile b/ci/images/spring-credhub-ci/Dockerfile
index a6e7310..5707e3a 100644
--- a/ci/images/spring-credhub-ci/Dockerfile
+++ b/ci/images/spring-credhub-ci/Dockerfile
@@ -8,7 +8,7 @@ ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
 RUN mkdir -p /opt/openjdk && \
     cd /opt/openjdk && \
-    curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz | tar xz --strip-components=1
+    curl -L https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz | tar xz --strip-components=1
 
 ADD https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh /opt/
 ADD https://repo.spring.io/libs-snapshot/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.4-SNAPSHOT/concourse-release-scripts-0.3.4-SNAPSHOT.jar /opt/
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3ab0b72..ae04661 100644
--- 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.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/spring-credhub-docs/build.gradle b/spring-credhub-docs/build.gradle
index 0cfb6ac..fb7b898 100644
--- a/spring-credhub-docs/build.gradle
+++ b/spring-credhub-docs/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-	id 'org.asciidoctor.jvm.convert' version '3.2.0'
+	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 }
 
 dependencyManagement {