diff --git a/Jenkinsfile b/Jenkinsfile index 96f873c432..0b04ac6ded 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,23 @@ properties(projectProperties) def SUCCESS = hudson.model.Result.SUCCESS.toString() currentBuild.result = SUCCESS +def GRADLE_ENTERPRISE_CACHE_USER = usernamePassword(credentialsId: 'gradle_enterprise_cache_user', + passwordVariable: 'GRADLE_ENTERPRISE_CACHE_PASSWORD', + usernameVariable: 'GRADLE_ENTERPRISE_CACHE_USERNAME') +def GRADLE_ENTERPRISE_SECRET_ACCESS_KEY = string(credentialsId: 'gradle_enterprise_secret_access_key', + variable: 'GRADLE_ENTERPRISE_ACCESS_KEY') +def SPRING_SIGNING_SECRING = file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE') +def SPRING_GPG_PASSPHRASE = string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD') +def OSSRH_CREDENTIALS = usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME') +def ARTIFACTORY_CREDENTIALS = usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD') +def JENKINS_PRIVATE_SSH_KEY = file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY') +def SONAR_LOGIN_CREDENTIALS = string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN') + +def jdkEnv(String jdk = 'jdk8') { + def jdkTool = tool(jdk) + return "JAVA_HOME=${ jdkTool }" +} + try { parallel check: { stage('Check') { @@ -15,8 +32,14 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { - sh "./gradle check --stacktrace" + withCredentials([GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv(), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { + sh "./gradlew check --stacktrace" + } } } catch(Exception e) { currentBuild.result = 'FAILED: check' @@ -32,9 +55,14 @@ try { node { checkout scm sh "git clean -dfx" - withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) { + withCredentials([SONAR_LOGIN_CREDENTIALS, + GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { try { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv([jdkEnv(), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { if ("master" == env.BRANCH_NAME) { sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --stacktrace" } else { @@ -55,8 +83,14 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { - sh "./gradle test -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion=Dysprosium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT -PlocksDisabled --stacktrace" + withCredentials([GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv(), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { + sh "./gradlew test -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion=Dysprosium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT -PlocksDisabled --stacktrace" + } } } catch(Exception e) { currentBuild.result = 'FAILED: snapshots' @@ -71,8 +105,14 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk9' }"]) { - sh "./gradle test --stacktrace" + withCredentials([GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv("jdk9"), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { + sh "./gradlew test --stacktrace" + } } } catch(Exception e) { currentBuild.result = 'FAILED: jdk9' @@ -87,8 +127,14 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk10' }"]) { - sh "./gradle test --stacktrace" + withCredentials([GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv("jdk10"), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { + sh "./gradlew test --stacktrace" + } } } catch(Exception e) { currentBuild.result = 'FAILED: jdk10' @@ -103,8 +149,15 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk11' }"]) { - sh "./gradle test --stacktrace" + + withCredentials([GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv("jdk11"), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { + sh "./gradlew test --stacktrace" + } } } catch(Exception e) { currentBuild.result = 'FAILED: jdk11' @@ -119,8 +172,14 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'openjdk12' }"]) { - sh "./gradle test --stacktrace" + withCredentials([GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv("openjdk12"), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { + sh "./gradlew test --stacktrace" + } } } catch(Exception e) { currentBuild.result = 'FAILED: jdk12' @@ -136,15 +195,17 @@ try { node { checkout scm sh "git clean -dfx" - withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) { - withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { - withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { - withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { - sh "./gradlew deployArtifacts finalizeDeployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace" - } - } - } + withCredentials([SPRING_SIGNING_SECRING, + SPRING_GPG_PASSPHRASE, + OSSRH_CREDENTIALS, + ARTIFACTORY_CREDENTIALS, + GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv(), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { + sh "./gradlew deployArtifacts finalizeDeployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace" } } } @@ -155,8 +216,16 @@ try { node { checkout scm sh "git clean -dfx" - withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withCredentials([JENKINS_PRIVATE_SSH_KEY, + SPRING_GPG_PASSPHRASE, + OSSRH_CREDENTIALS, + ARTIFACTORY_CREDENTIALS, + GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv(), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --stacktrace" } } @@ -168,8 +237,16 @@ try { node { checkout scm sh "git clean -dfx" - withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withCredentials([JENKINS_PRIVATE_SSH_KEY, + SPRING_GPG_PASSPHRASE, + OSSRH_CREDENTIALS, + ARTIFACTORY_CREDENTIALS, + GRADLE_ENTERPRISE_CACHE_USER, + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) { + withEnv([jdkEnv(), + "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}", + "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}", + "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) { sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --stacktrace" } } @@ -194,12 +271,12 @@ try { def subject = "${buildStatus}: Build ${env.JOB_NAME} ${env.BUILD_NUMBER} status is now ${buildStatus}" def details = """The build status changed to ${buildStatus}. For details see ${env.BUILD_URL}""" - emailext ( - subject: subject, - body: details, - recipientProviders: RECIPIENTS, - to: "$SPRING_SECURITY_TEAM_EMAILS" - ) +// emailext ( +// subject: subject, +// body: details, +// recipientProviders: RECIPIENTS, +// to: "$SPRING_SECURITY_TEAM_EMAILS" +// ) } } } diff --git a/gradle.properties b/gradle.properties index 96da1b8401..da09dbcb93 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,3 +5,4 @@ version=5.4.0.BUILD-SNAPSHOT kotlinVersion=1.3.70 org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true +org.gradle.caching=true diff --git a/settings.gradle b/settings.gradle index 30e1e1a572..dc2caa9290 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { url 'https://repo.spring.io/plugins-release' } + } +} + +plugins { + id "com.gradle.enterprise" version "3.1.1" + id "io.spring.gradle-enterprise-conventions" version "0.0.2" +} + rootProject.name = 'spring-security' FileTree buildFiles = fileTree(rootDir) {