From 0ac06696f70a64656558d9c2237328e89ae0baa0 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 27 Sep 2024 13:18:51 -0700 Subject: [PATCH] Be defensive when accessing properties in SpringRepositorySupport.groovy See gh-42333 --- buildSrc/SpringRepositorySupport.groovy | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/buildSrc/SpringRepositorySupport.groovy b/buildSrc/SpringRepositorySupport.groovy index 145d8dfae44..6101dbfc632 100644 --- a/buildSrc/SpringRepositorySupport.groovy +++ b/buildSrc/SpringRepositorySupport.groovy @@ -36,8 +36,17 @@ def apply(settings) { } private def property(settings, name) { - def value = settings.gradle.parent?.rootProject?.findProperty(name) - value = (value != null) ? value : settings.ext.find(name) + def value = null + try { + value = settings.gradle.parent?.rootProject?.findProperty(name) + } + catch (Exception ex) { + } + try { + value = (value != null) ? value : settings.ext.find(name) + } + catch (Exception ex) { + } value = (value != null) ? value : loadProperty(settings, name) return value }