From 38f5a89c8a52e58033dbe3455b988f099923d8fa Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Wed, 3 Jul 2019 12:47:19 -0500 Subject: [PATCH] DATAES-583 - Polishing. --- Jenkinsfile | 174 +++++++++--------- pom.xml | 517 ++++++++++++++++++++++++++-------------------------- 2 files changed, 347 insertions(+), 344 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 80ba212c3..fb474314b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,97 +1,97 @@ pipeline { - agent none + agent none - triggers { - pollSCM 'H/10 * * * *' - upstream(upstreamProjects: "spring-data-commons/2.1.x", threshold: hudson.model.Result.SUCCESS) - } + triggers { + pollSCM 'H/10 * * * *' + upstream(upstreamProjects: "spring-data-commons/2.1.x", threshold: hudson.model.Result.SUCCESS) + } - options { - disableConcurrentBuilds() - } + options { + disableConcurrentBuilds() + } - stages { - stage("Test") { - when { - anyOf { - branch '3.1.x' - not { triggeredBy 'UpstreamCause' } - } - } - parallel { - stage("test: baseline") { - agent { - docker { - image 'adoptopenjdk/openjdk8:latest' - args '-v $HOME/.m2:/tmp/spring-data-maven-repository' - } - } - options { timeout(time: 30, unit: 'MINUTES') } - steps { - sh 'rm -rf ?' - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw clean dependency:list test -Dsort -B' - } - } - } - } - stage('Release to artifactory') { - when { - branch 'issue/*' - not { triggeredBy 'UpstreamCause' } - } - agent { - docker { - image 'adoptopenjdk/openjdk8:latest' - args '-v $HOME/.m2:/tmp/spring-data-maven-repository' - } - } - options { timeout(time: 20, unit: 'MINUTES') } + stages { + stage("Test") { + when { + anyOf { + branch '3.1.x' + not { triggeredBy 'UpstreamCause' } + } + } + parallel { + stage("test: baseline") { + agent { + docker { + image 'adoptopenjdk/openjdk8:latest' + args '-v $HOME/.m2:/tmp/spring-data-maven-repository' + } + } + options { timeout(time: 30, unit: 'MINUTES') } + steps { + sh 'rm -rf ?' + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw clean dependency:list test -Dsort -B' + } + } + } + } + stage('Release to artifactory') { + when { + branch 'issue/*' + not { triggeredBy 'UpstreamCause' } + } + agent { + docker { + image 'adoptopenjdk/openjdk8:latest' + args '-v $HOME/.m2:/tmp/spring-data-maven-repository' + } + } + options { timeout(time: 20, unit: 'MINUTES') } - environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') - } + environment { + ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + } - steps { - sh 'rm -rf ?' - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B' - } - } - stage('Release to artifactory with docs') { - when { - branch '3.1.x' - } - agent { - docker { - image 'adoptopenjdk/openjdk8:latest' - args '-v $HOME/.m2:/tmp/spring-data-maven-repository' - } - } - options { timeout(time: 20, unit: 'MINUTES') } + steps { + sh 'rm -rf ?' + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B' + } + } + stage('Release to artifactory with docs') { + when { + branch '3.1.x' + } + agent { + docker { + image 'adoptopenjdk/openjdk8:latest' + args '-v $HOME/.m2:/tmp/spring-data-maven-repository' + } + } + options { timeout(time: 20, unit: 'MINUTES') } - environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') - } + environment { + ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + } - steps { - sh 'rm -rf ?' - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B' - } - } - } + steps { + sh 'rm -rf ?' + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B' + } + } + } - post { - changed { - script { - slackSend( - color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger', - channel: '#spring-data-dev', - message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}") - emailext( - subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}", - mimeType: 'text/html', - recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']], - body: "${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}") - } - } - } + post { + changed { + script { + slackSend( + color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger', + channel: '#spring-data-dev', + message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}") + emailext( + subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}", + mimeType: 'text/html', + recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']], + body: "${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}") + } + } + } } diff --git a/pom.xml b/pom.xml index f9c6d9236..c1197560c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,240 +1,241 @@ - - 4.0.0 + + 4.0.0 - org.springframework.data - spring-data-elasticsearch - 3.1.10.BUILD-SNAPSHOT + org.springframework.data + spring-data-elasticsearch + 3.1.10.BUILD-SNAPSHOT - - org.springframework.data.build - spring-data-parent - 2.1.10.BUILD-SNAPSHOT - + + org.springframework.data.build + spring-data-parent + 2.1.10.BUILD-SNAPSHOT + - Spring Data Elasticsearch - Spring Data Implementation for Elasticsearch - https://github.com/spring-projects/spring-data-elasticsearch + Spring Data Elasticsearch + Spring Data Implementation for Elasticsearch + https://github.com/spring-projects/spring-data-elasticsearch - - 3.2.1 - 2.6 - 6.2.2 - 2.9.1 - 2.1.10.BUILD-SNAPSHOT - spring.data.elasticsearch - + + 3.2.1 + 2.6 + 6.2.2 + 2.9.1 + 2.1.10.BUILD-SNAPSHOT + spring.data.elasticsearch + - + - - - org.springframework - spring-context - - - commons-logging - commons-logging - - - + + + org.springframework + spring-context + + + commons-logging + commons-logging + + + - - org.springframework - spring-tx - + + org.springframework + spring-tx + - - - org.springframework.data - spring-data-commons - ${springdata.commons} - + + + org.springframework.data + spring-data-commons + ${springdata.commons} + - - - commons-lang - commons-lang - ${commonslang} - test - + + + commons-lang + commons-lang + ${commonslang} + test + - - - joda-time - joda-time - ${jodatime} - + + + joda-time + joda-time + ${jodatime} + - - - org.elasticsearch.client - transport - ${elasticsearch} - - - commons-logging - commons-logging - - - + + + org.elasticsearch.client + transport + ${elasticsearch} + + + commons-logging + commons-logging + + + - - org.slf4j - log4j-over-slf4j - ${slf4j} - test - + + org.slf4j + log4j-over-slf4j + ${slf4j} + test + - - org.apache.logging.log4j - log4j-core - ${log4j} - test - + + org.apache.logging.log4j + log4j-core + ${log4j} + test + - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + - - - javax.enterprise - cdi-api - ${cdi} - provided - true - + + + javax.enterprise + cdi-api + ${cdi} + provided + true + - - - org.springframework - spring-test - test - - - ch.qos.logback - logback-classic - - - + + + org.springframework + spring-test + test + + + ch.qos.logback + logback-classic + + + - - org.apache.openwebbeans.test - cditest-owb - 1.2.8 - test - - - org.apache.geronimo.specs - geronimo-jcdi_1.0_spec - - - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - - - + + org.apache.openwebbeans.test + cditest-owb + 1.2.8 + test + + + org.apache.geronimo.specs + geronimo-jcdi_1.0_spec + + + org.apache.geronimo.specs + geronimo-atinject_1.0_spec + + + - - - org.apache.xbean - xbean-asm5-shaded - 4.5 - test - + + + org.apache.xbean + xbean-asm5-shaded + 4.5 + test + - - javax.servlet - servlet-api - 3.0-alpha-1 - test - + + javax.servlet + servlet-api + 3.0-alpha-1 + test + - - - org.elasticsearch.plugin - transport-netty4-client - ${elasticsearch} - - + + + org.elasticsearch.plugin + transport-netty4-client + ${elasticsearch} + + - - org.projectlombok - lombok - ${lombok} - test - + + org.projectlombok + lombok + ${lombok} + test + - + - - - - org.apache.maven.plugins - maven-assembly-plugin - - - org.codehaus.mojo - wagon-maven-plugin - - - org.asciidoctor - asciidoctor-maven-plugin - - - + + + + org.apache.maven.plugins + maven-assembly-plugin + + + org.codehaus.mojo + wagon-maven-plugin + + + org.asciidoctor + asciidoctor-maven-plugin + + + - - - snapshot + + + snapshot - - - - org.jfrog.buildinfo - artifactory-maven-plugin - 2.6.1 - false - - - build-info - - publish - - - - {{BUILD_URL}} - - - spring-data-elasticsearch - spring-data-elasticsearch - false - *:*:*:*@zip - - - https://repo.spring.io - {{ARTIFACTORY_USR}} - {{ARTIFACTORY_PSW}} - libs-snapshot-local - libs-snapshot-local - - - - - - - - + + + + org.jfrog.buildinfo + artifactory-maven-plugin + 2.6.1 + false + + + build-info + + publish + + + + {{BUILD_URL}} + + + spring-data-elasticsearch + spring-data-elasticsearch + false + *:*:*:*@zip + + + https://repo.spring.io + {{ARTIFACTORY_USR}} + {{ARTIFACTORY_PSW}} + libs-snapshot-local + libs-snapshot-local + + + + + + + + + + - - ci @@ -249,11 +250,13 @@ - + **/* - .git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy + + .git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy + ./ @@ -263,56 +266,56 @@ - release - - - - org.jfrog.buildinfo - artifactory-maven-plugin - false - - - - - + release + + + + org.jfrog.buildinfo + artifactory-maven-plugin + false + + + + + - - - biomedcentral - BioMed Central Development Team - +0 - - + + + biomedcentral + BioMed Central Development Team + +0 + + - - - spring-libs-snapshot - https://repo.spring.io/libs-snapshot - - + + + spring-libs-snapshot + https://repo.spring.io/libs-snapshot + + - - - spring-plugins-release - https://repo.spring.io/plugins-release - - + + + spring-plugins-release + https://repo.spring.io/plugins-release + + - - https://github.com/spring-projects/spring-data-elasticsearch - scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git - scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git - - + + https://github.com/spring-projects/spring-data-elasticsearch + scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git + scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git + + - - Bamboo - https://build.spring.io/browse/SPRINGDATAES - + + Bamboo + https://build.spring.io/browse/SPRINGDATAES + - - JIRA - https://jira.spring.io/browse/DATAES - + + JIRA + https://jira.spring.io/browse/DATAES +