From cbde0b3be0fd9830bbf58e254bfbf947efb08294 Mon Sep 17 00:00:00 2001 From: Jay Bryant Date: Thu, 14 Dec 2023 09:12:31 -0600 Subject: [PATCH] Update to Spring Boot 3.2.0 And remove unused AsciiDoc attriutes in the readme. --- Jenkinsfile | 44 ------------------------------------------- README.adoc | 5 ----- complete/build.gradle | 4 ++-- complete/pom.xml | 2 +- initial/build.gradle | 4 ++-- initial/pom.xml | 2 +- 6 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 20877321..00000000 --- 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 (jdk17)") { - agent { - docker { - image 'harbor-repo.vmware.com/dockerhub-proxy-cache/library/adoptopenjdk/openjdk17: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: "${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}") - } - } - } -} diff --git a/README.adoc b/README.adoc index 159e7d12..8ed351c1 100644 --- a/README.adoc +++ b/README.adoc @@ -1,12 +1,7 @@ :spring_version: current -:spring_boot_version: 3.1.0 -:Component: http://docs.spring.io/spring/docs/{spring_version}/javadoc-api/org/springframework/stereotype/Component.html :Controller: http://docs.spring.io/spring/docs/{spring_version}/javadoc-api/org/springframework/stereotype/Controller.html -: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 :RequestParam: http://docs.spring.io/spring/docs/{spring_version}/javadoc-api/org/springframework/web/bind/annotation/RequestParam.html :View: http://docs.spring.io/spring/docs/{spring_version}/javadoc-api/org/springframework/web/servlet/View.html -:ResponseBody: http://docs.spring.io/spring/docs/{spring_version}/javadoc-api/org/springframework/web/bind/annotation/ResponseBody.html :Model: http://docs.spring.io/spring/docs/{spring_version}/javadoc-api/org/springframework/ui/Model.html :toc: :icons: font diff --git a/complete/build.gradle b/complete/build.gradle index 02fd50a1..181a49a3 100644 --- a/complete/build.gradle +++ b/complete/build.gradle @@ -1,6 +1,6 @@ plugins { - 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' id 'java' } diff --git a/complete/pom.xml b/complete/pom.xml index ff9b7e4f..ba9dffea 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0 + 3.2.0 com.example diff --git a/initial/build.gradle b/initial/build.gradle index 02fd50a1..181a49a3 100644 --- a/initial/build.gradle +++ b/initial/build.gradle @@ -1,6 +1,6 @@ plugins { - 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' id 'java' } diff --git a/initial/pom.xml b/initial/pom.xml index e5fd8c58..6ff16051 100644 --- a/initial/pom.xml +++ b/initial/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0 + 3.2.0 com.example