From ab9135ad9bbc8631221caf0a7ee3eadd0561311d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 24 Nov 2020 10:44:41 +0000 Subject: [PATCH 1/9] Upgrade to Spring Boot 2.4.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 16c314d13..ae20ee24a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.springframework.samples spring-petclinic - 2.3.0.BUILD-SNAPSHOT + 2.4.0.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.4.0 petclinic From 949278cd46971a2170d749be0cfe2a1223161001 Mon Sep 17 00:00:00 2001 From: Arka Bandyopadhyay Date: Sun, 29 Nov 2020 14:21:33 +0530 Subject: [PATCH 2/9] remove .vscode folder from project repository --- .vscode/launch.json | 26 -------------------------- .vscode/settings.json | 3 --- .vscode/tasks.json | 19 ------------------- 3 files changed, 48 deletions(-) delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json delete mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 559c53805..000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "java", - "name": "Debug (Launch)-PetClinicApplication", - "request": "launch", - "cwd": "${workspaceFolder}", - "console": "internalConsole", - "stopOnEntry": false, - "mainClass": "org.springframework.samples.petclinic.PetClinicApplication", - "projectName": "spring-petclinic", - "args": "" - }, - { - "type": "java", - "name": "Debug (Attach)", - "request": "attach", - "hostName": "localhost", - "port": 0 - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c5f3f6b9c..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index fabd5c416..000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "verify", - "type": "shell", - "command": "mvn -B verify", - "group": "build" - }, - { - "label": "test", - "type": "shell", - "command": "mvn -B test", - "group": "test" - } - ] -} From 502870d6c031692b2111602a3eae5ae00e24efd9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 29 Nov 2020 11:38:26 +0100 Subject: [PATCH 3/9] Remove IDE specific configuration files Closes gh-706 --- .gitignore | 6 +----- .vscode/launch.json | 26 -------------------------- .vscode/settings.json | 3 --- .vscode/tasks.json | 19 ------------------- 4 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json delete mode 100644 .vscode/tasks.json diff --git a/.gitignore b/.gitignore index 559982f3d..191769767 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,5 @@ target/* *.iml /target .sts4-cache/ -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json +.vscode _site/ diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 559c53805..000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "java", - "name": "Debug (Launch)-PetClinicApplication", - "request": "launch", - "cwd": "${workspaceFolder}", - "console": "internalConsole", - "stopOnEntry": false, - "mainClass": "org.springframework.samples.petclinic.PetClinicApplication", - "projectName": "spring-petclinic", - "args": "" - }, - { - "type": "java", - "name": "Debug (Attach)", - "request": "attach", - "hostName": "localhost", - "port": 0 - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c5f3f6b9c..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index fabd5c416..000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "verify", - "type": "shell", - "command": "mvn -B verify", - "group": "build" - }, - { - "label": "test", - "type": "shell", - "command": "mvn -B test", - "group": "test" - } - ] -} From 0573cda3c2b07d37424b27a63f4514d63fbb3cfb Mon Sep 17 00:00:00 2001 From: Arka Bandyopadhyay Date: Sun, 29 Nov 2020 15:47:35 +0530 Subject: [PATCH 4/9] Downgrade to wro4j 1.8.0 This commit downgrades the wro4j plugin to 1.8.0 as the latest version requires Java 11. See gh-707 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae20ee24a..2dbb637d3 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.3.6 1.11.4 2.2.4 - 1.9.0 + 1.8.0 0.8.5 0.0.4.RELEASE From 02babdd8cb0d494d043fdf35a24dd2127c5d5167 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 25 Dec 2020 13:02:48 +0100 Subject: [PATCH 5/9] Upgrade to Spring Boot 2.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2dbb637d3..4941843ad 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0 + 2.4.1 petclinic From 04471aec492c9e48e2c5ec719bb047e521b83027 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 28 Jan 2021 09:55:39 +0000 Subject: [PATCH 6/9] Update to Boot 2.4.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4941843ad..dd88e7582 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.springframework.samples spring-petclinic - 2.4.0.BUILD-SNAPSHOT + 2.4.2 org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2 petclinic From 3a040886fe1456d8e9496c527b412a755f5e3a10 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 28 Jan 2021 09:57:17 +0000 Subject: [PATCH 7/9] Add docker push to CI --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1e91cb501..133fe2d35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,9 @@ dist: trusty language: java jdk: oraclejdk8 +services: + - docker +before_script: + - docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD" +script: + - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && docker push springio/petclinic From a0d743cfed340fbe96d5e3d79d6a3d2a78c6894f Mon Sep 17 00:00:00 2001 From: Diego Lemos Date: Thu, 7 Jan 2021 15:28:46 +0000 Subject: [PATCH 8/9] Do not fail packaging if repo info is absent As part of a process to build a BOSH release, I encountered the error below while running `./mvnw package`: ``` [ERROR] Failed to execute goal pl.project13.maven:git-commit-id-plugin:3.0.1:revision (default) on project spring-petclinic: Could not complete Mojo execution...: Error: Could not get HEAD Ref, are you sure you have set the dotGitDirectory property of this plugin to a valid path? -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException ``` That's because we are just interested on the source files for the BOSH release, we don't care about repo metadata (so we exclude them). Going through the [git-commit-id-maven-plugin docs](https://github.com/git-commit-id/git-commit-id-maven-plugin/blob/master/maven/docs/using-the-plugin.md) we learned it is possible to prevent the failure above via configuration. We propose then to set `false`, enabling use cases similar to ours. FWIW `failOnNoGitDirectory` is already set to false. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index dd88e7582..cdd6c4522 100644 --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,7 @@ ${project.build.outputDirectory}/git.properties false + false From e2fbc561309d03d92a0958f3cf59219b1fc0d985 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 28 Jan 2021 12:01:44 +0000 Subject: [PATCH 9/9] Only publish docker image from main branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 133fe2d35..6557f3076 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ services: before_script: - docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD" script: - - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && docker push springio/petclinic + - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && [ "${TRAVIS_BRANCH}" = "main" ] && docker push springio/petclinic