From f38c2f4e23cee93a9156eed5c49755eab8ccbcb3 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Sun, 3 Mar 2019 12:51:41 -0600
Subject: [PATCH] #847 - Move 'ci' profile into pipeline.

To let the pipeline inject custom profiles, the 'ci' profile needs to move out of `test.sh` script and instead be injected.
---
 ci/pipeline-template.yml | 18 +++++++++---------
 ci/test.sh               |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml
index ba67660a..be213c0f 100644
--- a/ci/pipeline-template.yml
+++ b/ci/pipeline-template.yml
@@ -390,37 +390,37 @@ jobs:
   - aggregate:
     - task: test (JDK 8)
       file: spring-hateoas-github/ci/test.yml
-      params: { PROFILE: "non-existent" }
+      params: { PROFILE: "ci" }
     - task: test (JDK 8 and Spring 5.1 snapshots)
       file: spring-hateoas-github/ci/test.yml
-      params: { PROFILE: "spring51-next" }
+      params: { PROFILE: "ci,spring51-next" }
     - task: test (JDK 8 and Spring 5.2 snapshots)
       file: spring-hateoas-github/ci/test.yml
-      params: { PROFILE: "spring52-next" }
+      params: { PROFILE: "ci,spring52-next" }
     - task: test (JDK 11)
       image: openjdk:11-jdk
       file: spring-hateoas-github/ci/test.yml
-      params: { PROFILE: "non-existent" }
+      params: { PROFILE: "ci" }
     - task: test (JDK 11 and Spring 5.1 snapshots)
       image: openjdk:11-jdk
       file: spring-hateoas-github/ci/test.yml
-      params: { PROFILE: "spring51-next" }
+      params: { PROFILE: "ci,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" }
+      params: { PROFILE: "ci,spring52-next" }
     - task: test (JDK 13)
       image: openjdk:13-jdk
       file: spring-hateoas-github/ci/test.yml
-      params: { PROFILE: "non-existent" }
+      params: { PROFILE: "ci" }
     - task: test (JDK 13 and Spring 5.1 snapshots)
       image: openjdk:13-jdk
       file: spring-hateoas-github/ci/test.yml
-      params: { PROFILE: "spring51-next" }
+      params: { PROFILE: "ci,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" }
+      params: { PROFILE: "ci,spring52-next" }
   on_failure:
     aggregate:
     - put: spring-hateoas-pull-requests
diff --git a/ci/test.sh b/ci/test.sh
index 609ca3f7..570e22ce 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -8,4 +8,4 @@ rm -rf $HOME/.m2/repository/org/springframework/hateoas 2> /dev/null || :
 
 cd spring-hateoas-github
 
-./mvnw clean dependency:list test -Pci -Dsort
+./mvnw clean dependency:list test -P${PROFILE} -Dsort