Skip to content

Commit 4b53be9

Browse files
committed
Use Java 17 to build snapshots for Artifactory.
Closes #2095
1 parent c1a1ea9 commit 4b53be9

File tree

1 file changed

+3
-31
lines changed

1 file changed

+3
-31
lines changed

Jenkinsfile

+3-31
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pipeline {
7272
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7373
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
7474
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
75-
sh 'PROFILE=java11 ci/verify.sh'
75+
sh 'PROFILE=none ci/verify.sh'
7676
sh "ci/clean.sh"
7777
}
7878
}
@@ -96,7 +96,7 @@ pipeline {
9696
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
9797
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
9898
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
99-
sh 'PROFILE=java11 ci/verify.sh'
99+
sh 'PROFILE=none ci/verify.sh'
100100
sh "ci/clean.sh"
101101
}
102102
}
@@ -125,7 +125,7 @@ pipeline {
125125
steps {
126126
script {
127127
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
128-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
128+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
129129
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
130130
'-Dartifactory.server=https://repo.spring.io ' +
131131
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -139,34 +139,6 @@ pipeline {
139139
}
140140
}
141141
}
142-
stage('Publish documentation') {
143-
when {
144-
branch 'main'
145-
}
146-
agent {
147-
label 'data'
148-
}
149-
options { timeout(time: 20, unit: 'MINUTES') }
150-
151-
environment {
152-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
153-
}
154-
155-
steps {
156-
script {
157-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
158-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
159-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
160-
'-Dartifactory.server=https://repo.spring.io ' +
161-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
162-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
163-
"-Dartifactory.distribution-repository=temp-private-local " +
164-
'-Dmaven.test.skip=true clean deploy -U -B'
165-
}
166-
}
167-
}
168-
}
169-
}
170142
}
171143

172144
post {

0 commit comments

Comments
 (0)