Apply default profile to prevent observations test being compiled.

This commit is contained in:
Corneil du Plessis
2024-12-18 14:08:17 +02:00
parent ebded16d6c
commit 7764c97053
6 changed files with 10 additions and 9 deletions

2
Jenkinsfile vendored
View File

@@ -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} " +

View File

@@ -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

View File

@@ -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 \

View File

@@ -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

View File

@@ -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

View File

@@ -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