From 525dc6a2d058cd1126cbcf223239164e53498a49 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 10 May 2021 17:45:23 +0100 Subject: [PATCH 1/3] Only attempt to login to docker on main --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab3854078..c76db46b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ jdk: oraclejdk8 services: - docker before_script: - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "main" ] && docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"' + - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || [ "${TRAVIS_BRANCH}" != "main" ] || docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"' script: - - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && [ "${TRAVIS_BRANCH}" = "main" ] && docker push springio/petclinic + - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && ([ "${TRAVIS_BRANCH}" != "main" ] || docker push springio/petclinic) From 0d8a80da65315dc898ec07a0c38948288cf2e2b3 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 12 May 2021 10:41:09 +0100 Subject: [PATCH 2/3] Clarify that a JDK is needed --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ff6d2be15..fe2ff72b3 100644 --- a/readme.md +++ b/readme.md @@ -48,7 +48,7 @@ Further documentation is provided [here](https://github.com/spring-projects/spri ### Prerequisites The following items should be installed in your system: -* Java 8 or newer. +* Java 8 or newer (full JDK not a JRE). * git command line tool (https://help.github.com/articles/set-up-git) * Your preferred IDE * Eclipse with the m2e plugin. Note: when m2e is available, there is an m2 icon in `Help -> About` dialog. If m2e is From 8954fa9585b02ba035662ab1385dce20a8c15efc Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 12 May 2021 10:45:14 +0100 Subject: [PATCH 3/3] Add note about autocrlf on windows --- readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.md b/readme.md index fe2ff72b3..c31c8a162 100644 --- a/readme.md +++ b/readme.md @@ -24,6 +24,8 @@ Or you can run it from Maven directly using the Spring Boot Maven plugin. If you ./mvnw spring-boot:run ``` +> NOTE: Windows users should set `git config core.autocrlf true` to avoid format assertions failing the build (use `--global` to set that flag globally). + ## In case you find a bug/suggested improvement for Spring Petclinic Our issue tracker is available here: https://github.com/spring-projects/spring-petclinic/issues