From c58cdf2cb0fbe19f0877748a29388d393f2d6b67 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Thu, 1 Feb 2024 13:50:43 -0800 Subject: [PATCH] Revert "CI: Rename global-settings to mvn-glob..." This reverts commit b2b26d4b275f686897b9cc88649cd4f68370ea6a. Though some jobs have mvn-global-settings listed as the global settings file, renaming to "global-settings" is a standard that will carry forward to all projects for Github Actions. Since we are currently transitioning to GHA, this shouldn't be renamed. If JJB jobs still need to use this file, they should be modified to use "global-settings." Change-Id: Ib1190de829939d11b022361ebf72868e7152c3cc Issue-ID: LF-Jira RELENG-4799 Signed-off-by: Eric Ball --- .../{mvn-global-settings => global-settings}/config-params.yaml | 2 +- .../{mvn-global-settings => global-settings}/content | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename jenkins-config/managed-config-files/globalMavenSettings/{mvn-global-settings => global-settings}/config-params.yaml (60%) rename jenkins-config/managed-config-files/globalMavenSettings/{mvn-global-settings => global-settings}/content (100%) diff --git a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml similarity index 60% rename from jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml rename to jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml index 20690cb..cf85503 100644 --- a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml +++ b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml @@ -1,3 +1,3 @@ --- -name: "mvn-global-settings" +name: "global-settings" comment: "Maven Global Settings file" diff --git a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/content b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/content similarity index 100% rename from jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/content rename to jenkins-config/managed-config-files/globalMavenSettings/global-settings/content -- 2.16.6