From 7764c97053c4b80028cf186f3bbbe64e54231b11 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <corneil.du-plessis@broadcom.com>
Date: Wed, 18 Dec 2024 14:08:17 +0200
Subject: [PATCH] Apply default profile to prevent observations test being
 compiled.

---
 Jenkinsfile                             | 2 +-
 ci/build-and-deploy-to-artifactory.sh   | 2 +-
 ci/build-and-deploy-to-maven-central.sh | 2 +-
 ci/smoke-test-against-artifactory.sh    | 2 +-
 ci/smoke-test-against-maven-central.sh  | 2 +-
 ci/test.sh                              | 9 +++++----
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bc34f8b6..713d4af1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -294,7 +294,7 @@ pipeline {
 				    docker.withRegistry('', "${p['dockerhub.credentials']}") {
 					    docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
                             sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ' +
-                                    './mvnw -s settings.xml -Pjakarta-ee-10,distribute,docs ' +
+                                    './mvnw -s settings.xml -Pjakarta-ee-10,distribute,docs,default ' +
                                     '-Dartifactory.server=https://repo.spring.io ' +
                                     "-Dartifactory.username=${ARTIFACTORY_USR} " +
                                     "-Dartifactory.password=${ARTIFACTORY_PSW} " +
diff --git a/ci/build-and-deploy-to-artifactory.sh b/ci/build-and-deploy-to-artifactory.sh
index 5960f8b4..0141d63c 100755
--- a/ci/build-and-deploy-to-artifactory.sh
+++ b/ci/build-and-deploy-to-artifactory.sh
@@ -11,6 +11,6 @@ echo 'Deploying to Artifactory...'
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
   -s settings.xml \
-  -Pjakarta-ee-10,distribute,${RELEASE_TYPE} \
+  -Pjakarta-ee-10,distribute,${RELEASE_TYPE},default \
   -Dmaven.test.skip=true \
   clean deploy -B
diff --git a/ci/build-and-deploy-to-maven-central.sh b/ci/build-and-deploy-to-maven-central.sh
index 9eb2a573..9f28fd8e 100755
--- a/ci/build-and-deploy-to-maven-central.sh
+++ b/ci/build-and-deploy-to-maven-central.sh
@@ -18,7 +18,7 @@ cp $KEYRING $GNUPGHOME
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
     -s settings.xml \
-    -Pjakarta-ee-10,distribute,central  \
+    -Pjakarta-ee-10,distribute,central,default  \
     -Dmaven.test.skip=true \
     -Dgpg.passphrase=${PASSPHRASE} \
     -Dgpg.secretKeyring=${GNUPGHOME}/secring.gpg \
diff --git a/ci/smoke-test-against-artifactory.sh b/ci/smoke-test-against-artifactory.sh
index d2255919..a8a024aa 100755
--- a/ci/smoke-test-against-artifactory.sh
+++ b/ci/smoke-test-against-artifactory.sh
@@ -9,7 +9,7 @@ echo 'Smoke test against Artifactory...'
 cd smoke-tests
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
-    -Partifactory  \
+    -Partifactory,default  \
     -Dspring-ws.version="${PROJECT_VERSION}" \
     clean dependency:purge-local-repository verify -B -U
 
diff --git a/ci/smoke-test-against-maven-central.sh b/ci/smoke-test-against-maven-central.sh
index f39235b3..2993edeb 100755
--- a/ci/smoke-test-against-maven-central.sh
+++ b/ci/smoke-test-against-maven-central.sh
@@ -10,7 +10,7 @@ echo 'Smoke test against Maven Central...'
 cd smoke-tests
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
-    -Pmaven-central  \
+    -Pmaven-central,default  \
     -DstagingRepositoryId="${STAGING_REPOSITORY_ID}" \
     -Dspring-ws.version="${PROJECT_VERSION}" \
     clean dependency:purge-local-repository verify -B -U
diff --git a/ci/test.sh b/ci/test.sh
index ba458fba..28a0dce2 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -2,9 +2,10 @@
 
 set -euo pipefail
 
-export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR}
-export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW}
-
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" \
   ./mvnw -s settings.xml \
-  -P${PROFILE} clean dependency:list test -Dsort -B -U
+  -P${PROFILE},default clean dependency:list test -Dsort -B -U
+# Provides for testing org.springframework.ws.observation.ObservationInWsConfigurerTests separately
+MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" \
+  ./mvnw -s settings.xml \
+  -P-default,${PROFILE},observation clean dependency:list test -Dsort -B -U