This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 1c7d652d0a remove obsolete teamcity properties search
1c7d652d0a is described below
commit 1c7d652d0a2d94be5b295ec6d5030793d6af0988
Author: Paul King <[email protected]>
AuthorDate: Mon Sep 7 11:47:26 2026 +1000
remove obsolete teamcity properties search
---
.gitignore | 3 +++
.../org/apache/groovy/gradle/SharedConfiguration.groovy | 12 +++---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index e6abe6e790..a7d0f5c593 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,9 @@ out/
verification-metadata.dryrun.xml
verification-keyring.dryrun.keys
+# local Artifactory credentials, read only from the repo root (never commit)
+**/artifactory.properties
+
.claude/
.apache-steward/
.apache-steward.local.lock
diff --git
a/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
b/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
index fb9108029e..1513c499e6 100644
---
a/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
+++
b/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
@@ -21,7 +21,6 @@ package org.apache.groovy.gradle
import groovy.transform.CompileStatic
import org.gradle.StartParameter
import org.gradle.api.execution.TaskExecutionGraph
-import org.gradle.api.file.Directory
import org.gradle.api.file.ProjectLayout
import org.gradle.api.file.RegularFile
import org.gradle.api.logging.Logger
@@ -137,14 +136,9 @@ class SharedConfiguration {
private static Provider<RegularFile> artifactoryFile(ProviderFactory
providers, ProjectLayout layout) {
providers.provider {
- // try to read artifactory.properties
- Directory base = layout.projectDirectory
- RegularFile artifactoryFile =
base.file('artifactory.properties')
- while (!artifactoryFile.asFile.exists() && base.asFile.parent)
{
- base = base.dir('..')
- artifactoryFile = base.file('artifactory.properties')
- }
- artifactoryFile
+ // read artifactory.properties from the repository root only;
do not walk
+ // ancestor directories, where a parent could inject
credentials
+ layout.projectDirectory.file('artifactory.properties')
}
}