From 9c684c006051b737eccb11a8739ff6b4ff61c8dd Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Fri, 15 Feb 2019 08:50:08 -0600 Subject: [PATCH] #815 - Test against Spring Framework 5.1/5.2 snapshots. --- readme.adoc => README.adoc | 38 ++++++++---- ci/pipeline-template.yml | 118 ++++++++++++++++++++++++++++++++++++- pom.xml | 28 ++++++++- 3 files changed, 170 insertions(+), 14 deletions(-) rename readme.adoc => README.adoc (68%) diff --git a/readme.adoc b/README.adoc similarity index 68% rename from readme.adoc rename to README.adoc index 15a42ffd..5065af6b 100644 --- a/readme.adoc +++ b/README.adoc @@ -12,40 +12,54 @@ as possible. Check the matrix below to see the status of supported versions: -.`master` branch -[cols=4] +.Build Status +[cols='2,1,1'] |=== -| Job | `1.0` status | `0.25` status | `0.x` status +| Job | `1.0` status (master) | `0.25` status (0.25.x) | Test - JDK 8 | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"] -| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.x/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"] | Test - JDK 8 and Spring 5.0 (snapshots) -| -| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] -| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] +| Requires Spring Framework 5.1+ +| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"] | Test - JDK 8 and Spring 5.1 (snapshots) -| -| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] -| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] +| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] +| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"] + +| Test - JDK 8 and Spring 5.2 (snapshots) +| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%208%20and%20Spring%205.2%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] +| Not supported | Test - JDK 11 | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2011/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] | Not supported + +| Test - JDK 11 and Spring 5.1 (snapshots) +| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2011%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] +| Not supported + +| Test - JDK 11 and Spring 5.2 (snapshots) +| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2011%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] | Not supported | Test - JDK 13 | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] | Not supported + +| Test - JDK 13 and Spring 5.1 (snapshots) +| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013%20and%20Spring%205.2%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] | Not supported -| Build - Release to repo.spring.io +| Test - JDK 13 and Spring 5.2 (snapshots) +| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013%20and%20Spring%205.2%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] +| Not supported + +| Build - Deploy to repo.spring.io | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Build/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"] | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Build/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"] -| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.x/jobs/Build/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"] |=== diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml index 587ca8ff..7bb14813 100644 --- a/ci/pipeline-template.yml +++ b/ci/pipeline-template.yml @@ -85,8 +85,14 @@ groups: - name: spring-hateoas jobs: - Test - JDK 8 + - Test - JDK 8 and Spring 5.1 (snapshots) + - Test - JDK 8 and Spring 5.2 (snapshots) - Test - JDK 11 + - Test - JDK 11 and Spring 5.1 (snapshots) + - Test - JDK 11 and Spring 5.2 (snapshots) - Test - JDK 13 + - Test - JDK 13 and Spring 5.1 (snapshots) + - Test - JDK 13 and Spring 5.2 (snapshots) - Build - name: pull-requests jobs: @@ -111,6 +117,32 @@ jobs: params: { PROFILE: "non-existent" } <<: *slack-test-failure +- name: Test - JDK 8 and Spring 5.1 (snapshots) + serial: true + public: true + plan: + - get: spring-hateoas-github + trigger: true + - get: openjdk:8-jdk + trigger: true + - task: test + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring51-next" } + <<: *slack-test-failure + +- name: Test - JDK 8 and Spring 5.2 (snapshots) + serial: true + public: true + plan: + - get: spring-hateoas-github + trigger: true + - get: openjdk:8-jdk + trigger: true + - task: test + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring52-next" } + <<: *slack-test-failure + - name: Test - JDK 11 serial: true public: true @@ -125,6 +157,34 @@ jobs: params: { PROFILE: "non-existant" } <<: *slack-test-failure +- name: Test - JDK 11 and Spring 5.1 (snapshots) + serial: true + public: true + plan: + - get: spring-hateoas-github + trigger: true + - get: openjdk:11-jdk + trigger: true + - task: test + image: openjdk:11-jdk + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring51-next" } + <<: *slack-test-failure + +- name: Test - JDK 11 and Spring 5.2 (snapshots) + serial: true + public: true + plan: + - get: spring-hateoas-github + trigger: true + - get: openjdk:11-jdk + trigger: true + - task: test + image: openjdk:11-jdk + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring52-next" } + <<: *slack-test-failure + - name: Test - JDK 13 serial: true public: true @@ -139,6 +199,34 @@ jobs: params: { PROFILE: "non-existant" } <<: *slack-test-failure +- name: Test - JDK 13 and Spring 5.1 (snapshots) + serial: true + public: true + plan: + - get: spring-hateoas-github + trigger: true + - get: openjdk:13-jdk + trigger: true + - task: test + image: openjdk:13-jdk + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring51-next" } + <<: *slack-test-failure + +- name: Test - JDK 13 and Spring 5.2 (snapshots) + serial: true + public: true + plan: + - get: spring-hateoas-github + trigger: true + - get: openjdk:13-jdk + trigger: true + - task: test + image: openjdk:13-jdk + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring52-next" } + <<: *slack-test-failure + - name: Build serial: true public: true @@ -147,8 +235,14 @@ jobs: trigger: true passed: [ Test - JDK 8, + Test - JDK 8 and Spring 5.1 (snapshots), + Test - JDK 8 and Spring 5.2 (snapshots), Test - JDK 11, - Test - JDK 13 + Test - JDK 11 and Spring 5.1 (snapshots), + Test - JDK 11 and Spring 5.2 (snapshots), + Test - JDK 13, + Test - JDK 13 and Spring 5.1 (snapshots), + Test - JDK 13 and Spring 5.2 (snapshots) ] - put: spring-hateoas-status params: @@ -216,14 +310,36 @@ jobs: - task: test (JDK 8) file: spring-hateoas-github/ci/test.yml params: { PROFILE: "non-existent" } + - task: test (JDK 8 and Spring 5.1 snapshots) + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring51-next" } + - task: test (JDK 8 and Spring 5.2 snapshots) + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring52-next" } - task: test (JDK 11) image: openjdk:11-jdk file: spring-hateoas-github/ci/test.yml params: { PROFILE: "non-existent" } + - task: test (JDK 11 and Spring 5.1 snapshots) + image: openjdk:11-jdk + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring51-next" } + - task: test (JDK 11 and Spring 5.2 snapshots) + image: openjdk:11-jdk + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring52-next" } - task: test (JDK 13) image: openjdk:13-jdk file: spring-hateoas-github/ci/test.yml params: { PROFILE: "non-existent" } + - task: test (JDK 13 and Spring 5.1 snapshots) + image: openjdk:13-jdk + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring51-next" } + - task: test (JDK 13 and Spring 5.2 snapshots) + image: openjdk:13-jdk + file: spring-hateoas-github/ci/test.yml + params: { PROFILE: "spring52-next" } on_failure: aggregate: - put: spring-hateoas-pull-requests diff --git a/pom.xml b/pom.xml index 98f2f8ea..d7381e97 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,33 @@ - + + + spring51-next + + 5.1.6.BUILD-SNAPSHOT + + + + spring-libs-snapshot + http://repo.spring.io/libs-snapshot + + + + + + spring52-next + + 5.2.0.BUILD-SNAPSHOT + + + + spring-libs-snapshot + http://repo.spring.io/libs-snapshot + + + +