Skip to content

Commit ae76835

Browse files
committed
Migrate from Gradle Enterprise extension to the latest Develocity extension
Update Common Custom User Data Maven extension to latest version Enable Build Scan publishing only if authenticated Update Jenkins jobs to use DEVELOCITY_ACCESS_KEY env var Update GitHub Actions workflows to use DEVELOCITY_ACCESS_KEY env var
1 parent e5a9ba8 commit ae76835

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ jobs:
6262
./mvnw $MAVEN_ARGS ${{ matrix.os.maven.args }} clean install \
6363
-Pjqassistant -Pdist -Pci-build -DskipITs
6464
env:
65-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
65+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6666
- name: Running integration tests in the default environment
6767
run: |
6868
./mvnw $MAVEN_ARGS ${{ matrix.os.maven.args }} clean verify \
6969
-Pskip-checks \
7070
${{ github.event.pull_request.base.ref && format('-Dincremental -Dgib.referenceBranch=refs/remotes/origin/{0}', github.event.pull_request.base.ref) || '' }}
7171
env:
72-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
72+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ nb-configuration.xml
3838
# Local environment
3939
.env
4040

41-
# Gradle Enterprise/Develocity
42-
/.mvn/.gradle-enterprise
41+
# Develocity
42+
/.mvn/.develocity

.mvn/gradle-enterprise.xml renamed to .mvn/develocity.xml

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<gradleEnterprise
2-
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
1+
<develocity
2+
xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
44
<server>
55
<url>https://ge.hibernate.org</url>
66
<allowUntrusted>false</allowUntrusted>
@@ -16,12 +16,17 @@
1616
<!--
1717
Expression support is documented here: https://docs.gradle.com/enterprise/maven-extension/#expression_support
1818
-->
19+
<publishing>
20+
<onlyIf>
21+
<![CDATA[authenticated]]>
22+
</onlyIf>
23+
</publishing>
1924
<obfuscation>
20-
<!-- Don't share ip addresses-->
21-
<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
25+
<!-- Don't share ip addresses-->
26+
<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
2227
</obfuscation>
2328
<capture>
24-
<goalInputFiles>true</goalInputFiles>
29+
<fileFingerprints>true</fileFingerprints>
2530
</capture>
2631
<!-- https://docs.gradle.com/enterprise/maven-extension/#manual_access_key_configuration -->
2732
<backgroundBuildScanUpload>#{env['CI'] == null}</backgroundBuildScanUpload>
@@ -38,4 +43,4 @@
3843
</server>
3944
</remote>
4045
</buildCache>
41-
</gradleEnterprise>
46+
</develocity>

.mvn/extensions.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<extensions>
22
<extension>
33
<groupId>com.gradle</groupId>
4-
<artifactId>gradle-enterprise-maven-extension</artifactId>
5-
<version>1.20.1</version>
4+
<artifactId>develocity-maven-extension</artifactId>
5+
<version>1.23.2</version>
66
</extension>
77
<extension>
88
<groupId>com.gradle</groupId>
99
<artifactId>common-custom-user-data-maven-extension</artifactId>
10-
<version>1.13</version>
10+
<version>2.0.1</version>
1111
</extension>
1212
</extensions>

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def withMavenWorkspace(Closure body) {
66
junitPublisher(disabled: true)
77
]) {
88
withCredentials([string(credentialsId: 'ge.hibernate.org-access-key',
9-
variable: 'GRADLE_ENTERPRISE_ACCESS_KEY')]) {
9+
variable: 'DEVELOCITY_ACCESS_KEY')]) {
1010
withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline
1111
body()
1212
}

0 commit comments

Comments
 (0)