Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d560893

Browse files
Migrate build to Spring Develocity Conventions extension.
* Migrate build to Spring Develocity Conventions extension. * Adopt Develocity environment variables. Closes #3130 
1 parent 431a1f5 commit d560893

File tree

5 files changed

+4
-53
lines changed

5 files changed

+4
-53
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ src/ant/.ant-targets-upload-dist.xml
1818
node
1919
node_modules
2020
package-lock.json
21-
.mvn/.gradle-enterprise
21+
.mvn/.develocity

‎.mvn/extensions.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<extensions>
33
<extension>
4-
<groupId>com.gradle</groupId>
5-
<artifactId>gradle-enterprise-maven-extension</artifactId>
6-
<version>1.19.3</version>
7-
</extension>
8-
<extension>
9-
<groupId>com.gradle</groupId>
10-
<artifactId>common-custom-user-data-maven-extension</artifactId>
11-
<version>1.12.4</version>
4+
<groupId>io.spring.develocity.conventions</groupId>
5+
<artifactId>develocity-conventions-maven-extension</artifactId>
6+
<version>0.0.19</version>
127
</extension>
138
</extensions>

‎.mvn/gradle-enterprise.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎Jenkinsfile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,13 @@ pipeline {
3232
options { timeout(time: 30, unit: 'MINUTES') }
3333
environment {
3434
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
35-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
3635
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
3736
}
3837
steps {
3938
script {
4039
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
4140
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
4241
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
43-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
44-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
45-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
4642
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B -U"
4743
}
4844
}
@@ -66,17 +62,13 @@ pipeline {
6662
options { timeout(time: 30, unit: 'MINUTES') }
6763
environment {
6864
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
69-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
7065
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
7166
}
7267
steps {
7368
script {
7469
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
7570
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
7671
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
77-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
78-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
79-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
8072
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
8173
}
8274
}
@@ -101,7 +93,6 @@ pipeline {
10193

10294
environment {
10395
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
104-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
10596
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
10697
}
10798

@@ -110,9 +101,6 @@ pipeline {
110101
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
111102
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
112103
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
113-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
114-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
115-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
116104
"./mvnw -s settings.xml -Pci,artifactory " +
117105
"-Dartifactory.server=${p['artifactory.url']} " +
118106
"-Dartifactory.username=${ARTIFACTORY_USR} " +

‎ci/pipeline.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,5 @@ docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
3131
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
3232
artifactory.url=https://repo.spring.io
3333
artifactory.repository.snapshot=libs-snapshot-local
34-
develocity.cache.credentials=gradle_enterprise_cache_user
3534
develocity.access-key=gradle_enterprise_secret_access_key
3635
jenkins.user.name=spring-builds+jenkins

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /