From 98071aad85aaa8d20a4dc3a86b0ceef6e6dc5f74 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Tue, 21 Sep 2021 11:46:43 +0200
Subject: [PATCH] Simplify build pipeline.

See #1537
---
 Jenkinsfile | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b272030d..dceb9a68 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,12 +13,6 @@ pipeline {
 
 	stages {
 		stage("test: baseline (jdk8)") {
-			when {
-				anyOf {
-					branch 'main'
-					not { triggeredBy 'UpstreamCause' }
-				}
-			}
 			agent {
 				label 'data'
 			}
@@ -39,10 +33,7 @@ pipeline {
 
 		stage("Test other configurations") {
 			when {
-				allOf {
-					branch 'main'
-					not { triggeredBy 'UpstreamCause' }
-				}
+				branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 			}
 			parallel {
 				stage("test: baseline (jdk11)") {
@@ -64,7 +55,7 @@ pipeline {
 					}
 				}
 
-				stage("test: baseline (jdk16)") {
+				stage("test: baseline (jdk17)") {
 					agent {
 						label 'data'
 					}
@@ -75,7 +66,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk16:latest').inside('-v $HOME:/tmp/jenkins-home') {
+								docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
 									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
 								}
 							}
@@ -86,12 +77,6 @@ pipeline {
 		}
 
 		stage('Build project and release to artifactory') {
-			when {
-				anyOf {
-					branch 'main'
-					not { triggeredBy 'UpstreamCause' }
-				}
-			}
 			agent {
 				label 'data'
 			}