From 362855b8b83dc81058bd0d4db1c11635d580adcc Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 27 Apr 2021 10:25:48 -0500 Subject: [PATCH] docs.af.pivotal.io->docs-ip.spring.io The build conventions plugin does not support a property, so we must override the configuration for docs.host to docs-ip.spring.io Closes gh-9686 --- Jenkinsfile | 4 ++-- docs/manual/spring-security-docs-manual.gradle | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 53349704dc..a7ee4c2be3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -176,7 +176,7 @@ try { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { withCredentials([ARTIFACTORY_CREDENTIALS]) { withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { - sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PdeployDocsHost=docs-ip.spring.io --refresh-dependencies --no-daemon --stacktrace" + sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --refresh-dependencies --no-daemon --stacktrace" } } } @@ -191,7 +191,7 @@ try { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { withCredentials([ARTIFACTORY_CREDENTIALS]) { withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { - sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME -PdeployDocsHost=docs-ip.spring.io --refresh-dependencies --no-daemon --stacktrace" + sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace" } } } diff --git a/docs/manual/spring-security-docs-manual.gradle b/docs/manual/spring-security-docs-manual.gradle index 8056b92bf0..0d59ce2dca 100644 --- a/docs/manual/spring-security-docs-manual.gradle +++ b/docs/manual/spring-security-docs-manual.gradle @@ -15,6 +15,7 @@ remotes { docs { retryCount = 5 // retry 5 times (default is 0) retryWaitSec = 10 // wait 10 seconds between retries (default is 0) + host = "docs-ip.spring.io" } }