Skip to content

Commit 8422916

Browse files
authored
Merge pull request #652 from gradle/erichaagdev/ge-deprecations
Gradle Enterprise deprecation warnings aren't printed to the console for Maven builds using Develocity extension
2 parents 10889a8 + 29f1dbb commit 8422916

5 files changed

+29
-7
lines changed

components/scripts/lib/maven.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,12 @@ invoke_maven() {
4646
fi
4747

4848
if [ -n "${ge_server}" ]; then
49-
args+=("-Dgradle.enterprise.url=${ge_server}")
50-
args+=("-Dgradle.enterprise.allowUntrustedServer=false")
49+
args+=(
50+
-Dgradle.enterprise.url="${ge_server}"
51+
-Dgradle.enterprise.allowUntrustedServer=false
52+
-Ddevelocity.url="${ge_server}"
53+
-Ddevelocity.allowUntrustedServer=false
54+
)
5155
fi
5256

5357
args+=(
@@ -58,6 +62,7 @@ invoke_maven() {
5862
-Dcom.gradle.enterprise.build-validation.runNum="${run_num}"
5963
-Dcom.gradle.enterprise.build-validation.scriptsVersion="${SCRIPT_VERSION}"
6064
-Dgradle.scan.captureGoalInputFiles=true
65+
-Ddevelocity.scan.captureFileFingerprints=true
6166
-Dpts.enabled=false
6267
)
6368

components/scripts/maven/01-validate-local-build-caching-same-location.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,12 @@ execute_build() {
136136
invoke_maven "${run_num}" \
137137
-Dgradle.cache.local.enabled=true \
138138
-Dgradle.cache.local.storeEnabled=true \
139-
-Dgradle.cache.remote.enabled=false \
140139
-Dgradle.cache.local.directory="${BUILD_CACHE_DIR}" \
140+
-Dgradle.cache.remote.enabled=false \
141+
-Ddevelocity.cache.local.enabled=true \
142+
-Ddevelocity.cache.local.storeEnabled=true \
143+
-Ddevelocity.cache.local.directory="${BUILD_CACHE_DIR}" \
144+
-Ddevelocity.cache.remote.enabled=false \
141145
clean ${tasks}
142146
}
143147

components/scripts/maven/02-validate-local-build-caching-different-locations.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,12 @@ execute_build() {
140140
invoke_maven "${run_num}" \
141141
-Dgradle.cache.local.enabled=true \
142142
-Dgradle.cache.local.storeEnabled=true \
143-
-Dgradle.cache.remote.enabled=false \
144143
-Dgradle.cache.local.directory="${BUILD_CACHE_DIR}" \
144+
-Dgradle.cache.remote.enabled=false \
145+
-Ddevelocity.cache.local.enabled=true \
146+
-Ddevelocity.cache.local.storeEnabled=true \
147+
-Ddevelocity.cache.local.directory="${BUILD_CACHE_DIR}" \
148+
-Ddevelocity.cache.remote.enabled=false \
145149
clean ${tasks}
146150
}
147151

components/scripts/maven/04-validate-remote-build-caching-ci-local.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,17 @@ validate_build_config() {
193193

194194
execute_build() {
195195
local args
196-
args=(-Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=true)
196+
args=(
197+
-Dgradle.cache.local.enabled=false
198+
-Dgradle.cache.remote.enabled=true
199+
-Ddevelocity.cache.local.enabled=false
200+
-Ddevelocity.cache.remote.enabled=true
201+
)
197202
if [ -n "${remote_build_cache_url}" ]; then
198-
args+=("-Dgradle.cache.remote.url=${remote_build_cache_url}")
203+
args+=(
204+
-Dgradle.cache.remote.url="${remote_build_cache_url}"
205+
-Ddevelocity.cache.remote.url="${remote_build_cache_url}"
206+
)
199207
fi
200208

201209
# shellcheck disable=SC2206 # we want tasks to expand with word splitting in this case

release/changes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
- [NEW] Predictive Test Selection is disabled when running builds
1+
- [NEW] Predictive Test Selection is disabled when running builds
2+
- [FIX] Gradle Enterprise deprecation warnings are printed to the console for Maven builds using Develocity extension

0 commit comments

Comments
 (0)