diff --git a/Jenkinsfile b/Jenkinsfile index 9fe87f9d7..09c110c4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ def p = [:] node { - checkout scm - p = readProperties interpolate: true, file: 'ci/pipeline.properties' + checkout scm + p = readProperties interpolate: true, file: 'ci/pipeline.properties' } pipeline { @@ -18,7 +18,7 @@ pipeline { } stages { - stage("test: baseline (Java 17)") { + stage("test: baseline (main)") { when { beforeAgent(true) anyOf { @@ -39,7 +39,6 @@ pipeline { steps { script { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) { - sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" sh "PROFILE=ci,all-dbs ci/test.sh" sh "ci/clean.sh" } @@ -47,6 +46,35 @@ pipeline { } } + stage("Test other configurations") { + when { + beforeAgent(true) + allOf { + branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP") + not { triggeredBy 'UpstreamCause' } + } + } + parallel { + stage("test: baseline (next)") { + agent { + label 'data' + } + options { timeout(time: 30, unit: 'MINUTES') } + environment { + ARTIFACTORY = credentials("${p['artifactory.credentials']}") + } + steps { + script { + docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) { + sh "PROFILE=ci,all-dbs ci/test.sh" + sh "ci/clean.sh" + } + } + } + } + } + } + stage('Release to artifactory') { when { beforeAgent(true) diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index aa6936d76..573b188bc 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -163,6 +163,12 @@ assertj-core ${assertj} test + + + net.bytebuddy + byte-buddy + + diff --git a/spring-data-r2dbc/pom.xml b/spring-data-r2dbc/pom.xml index 1b6e10540..4637d7395 100644 --- a/spring-data-r2dbc/pom.xml +++ b/spring-data-r2dbc/pom.xml @@ -167,6 +167,12 @@ assertj-core ${assertj} test + + + net.bytebuddy + byte-buddy + + diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index 71d009990..043fbccb6 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -62,6 +62,12 @@ assertj-core ${assertj} test + + + net.bytebuddy + byte-buddy + +