From 3a511ec00daa4d815ffb4dc83a4b4aad97f30e8f Mon Sep 17 00:00:00 2001
From: Jay Bryant <jbryant@vmware.com>
Date: Wed, 13 Dec 2023 11:57:31 -0600
Subject: [PATCH] Update to Spring Boot 3.2.0

And remove unused AsciiDoc attributes from the readme.
---
 Jenkinsfile           | 44 -------------------------------------------
 README.adoc           |  3 ---
 complete/build.gradle |  6 +++---
 complete/pom.xml      |  2 +-
 initial/build.gradle  |  4 ++--
 initial/pom.xml       |  2 +-
 6 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 0652ab4..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,44 +0,0 @@
-pipeline {
-	agent none
-
-	triggers {
-		pollSCM 'H/10 * * * *'
-	}
-
-	options {
-		disableConcurrentBuilds()
-		buildDiscarder(logRotator(numToKeepStr: '14'))
-	}
-
-	stages {
-		stage("test: baseline (jdk8)") {
-			agent {
-				docker {
-					image 'harbor-repo.vmware.com/dockerhub-proxy-cache/library/adoptopenjdk/openjdk8:latest'
-					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
-				}
-			}
-			options { timeout(time: 30, unit: 'MINUTES') }
-			steps {
-				sh 'test/run.sh'
-			}
-		}
-
-	}
-
-	post {
-		changed {
-			script {
-				slackSend(
-						color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
-						channel: '#sagan-content',
-						message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}")
-				emailext(
-						subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
-						mimeType: 'text/html',
-						recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']],
-						body: "<a href=\"${env.BUILD_URL}\">${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}</a>")
-			}
-		}
-	}
-}
diff --git a/README.adoc b/README.adoc
index 0fe19e3..d4e81be 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,7 +1,4 @@
-:spring_version: current
 :spring_boot_version: current
-:DispatcherServlet: http://docs.spring.io/spring/docs/{spring_version}/javadoc-api/org/springframework/web/servlet/DispatcherServlet.html
-:SpringApplication: http://docs.spring.io/spring-boot/docs/{spring_boot_version}/api/org/springframework/boot/SpringApplication.html
 :SpringBootSecurity: http://docs.spring.io/spring-boot/docs/{spring_boot_version}/reference/htmlsingle/#boot-features-security
 :images: https://raw.githubusercontent.com/spring-guides/gs-securing-web/main/images
 :toc:
diff --git a/complete/build.gradle b/complete/build.gradle
index d823f50..a1cf9d8 100644
--- a/complete/build.gradle
+++ b/complete/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.1.0'
-	id 'io.spring.dependency-management' version '1.1.0'
+	id 'org.springframework.boot' version '3.2.0'
+	id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group = 'com.example'
@@ -19,7 +19,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	//  Temporary explicit version to fix Thymeleaf bug
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.1.RELEASE'
-	implementation 'org.springframework.security:spring-security-test'
+	testImplementation 'org.springframework.security:spring-security-test'
 	// end::security-dependencies[]
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
diff --git a/complete/pom.xml b/complete/pom.xml
index 74a6344..867cfdc 100644
--- a/complete/pom.xml
+++ b/complete/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/initial/build.gradle b/initial/build.gradle
index 37a6ef1..74eef8d 100644
--- a/initial/build.gradle
+++ b/initial/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.1.0'
-	id 'io.spring.dependency-management' version '1.1.0'
+	id 'org.springframework.boot' version '3.2.0'
+	id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group = 'com.example'
diff --git a/initial/pom.xml b/initial/pom.xml
index a34c2a0..3edfeca 100644
--- a/initial/pom.xml
+++ b/initial/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>