Fix "SETTINGS" typo (#40)

* Fix "SETTINGS" typo * Add legacy constant in order to keep backwards compatibility
wcm-io-devops · Dec 16, 2019 · 855e76c · 855e76c
1 parent a5808c9
commit 855e76c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/jenkinsfiles/integration-tests.groovy b/jenkinsfiles/integration-tests.groovy
@@ -179,7 +179,7 @@ node() {
       ManagedFileConstants managedFileConstants = new ManagedFileConstants()
       log.info(ManagedFileConstants.GLOBAL_MAVEN_SETTINGS_PATH,  ManagedFileConstants.GLOBAL_MAVEN_SETTINGS_PATH)
       log.info(ManagedFileConstants.GLOBAL_MAVEN__SETTINGS_ENV,  ManagedFileConstants.GLOBAL_MAVEN__SETTINGS_ENV)
-      log.info(ManagedFileConstants.MAVEN_SETTINS_PATH,  ManagedFileConstants.MAVEN_SETTINS_PATH)
+      log.info(ManagedFileConstants.MAVEN_SETTINGS_PATH,  ManagedFileConstants.MAVEN_SETTINGS_PATH)
       log.info(ManagedFileConstants.MAVEN_SETTING_ENV,  ManagedFileConstants.MAVEN_SETTING_ENV)
       log.info(ManagedFileConstants.NPM_CONFIG_USERCONFIG_PATH,  ManagedFileConstants.NPM_CONFIG_USERCONFIG_PATH)
       log.info(ManagedFileConstants.NPM_CONFIG_USERCONFIG_ENV,  ManagedFileConstants.NPM_CONFIG_USERCONFIG_ENV)

diff --git a/src/io/wcm/devops/jenkins/pipeline/managedfiles/ManagedFileConstants.groovy b/src/io/wcm/devops/jenkins/pipeline/managedfiles/ManagedFileConstants.groovy
@@ -29,7 +29,9 @@ class ManagedFileConstants implements Serializable {
   static final String GLOBAL_MAVEN_SETTINGS_PATH = "managedfiles/maven/global-settings.json"
   static final String GLOBAL_MAVEN__SETTINGS_ENV = "MVN_GLOBAL_SETTINGS"
 
+  // DEPRECATED, MAVEN_SETTINS_PATH will be removed in next major version
   static final String MAVEN_SETTINS_PATH = "managedfiles/maven/settings.json"
+  static final String MAVEN_SETTINGS_PATH = "managedfiles/maven/settings.json"
   static final String MAVEN_SETTING_ENV = "MVN_SETTINGS"
 
   static final String NPM_CONFIG_USERCONFIG_PATH = "managedfiles/npm/npm-config-userconfig.json"

diff --git a/test/io/wcm/devops/jenkins/pipeline/utils/PatternMatcherMavenSettingsTest.groovy b/test/io/wcm/devops/jenkins/pipeline/utils/PatternMatcherMavenSettingsTest.groovy
@@ -39,7 +39,7 @@ class PatternMatcherMavenSettingsTest extends DSLTestBase {
   void setUp() throws Exception {
     super.setUp()
     underTest = new PatternMatcher()
-    JsonLibraryResource res = new JsonLibraryResource(this.dslMock.getMock(), ManagedFileConstants.MAVEN_SETTINS_PATH)
+    JsonLibraryResource res = new JsonLibraryResource(this.dslMock.getMock(), ManagedFileConstants.MAVEN_SETTINGS_PATH)
     ManagedFileParser parser = new ManagedFileParser()
     managedFiles = parser.parse(res.load())
   }

diff --git a/vars/execMaven.groovy b/vars/execMaven.groovy
@@ -70,7 +70,7 @@ void call(Map config = null) {
     // retrieve settingsId
     if (commandBuilder.getSettingsId() == null) {
         // use autolookup for maven global settingsId
-        ManagedFile mavenSettingsManagedFile = autoLookupMavenSettings(ManagedFileConstants.MAVEN_SETTINS_PATH, scmUrl, log)
+        ManagedFile mavenSettingsManagedFile = autoLookupMavenSettings(ManagedFileConstants.MAVEN_SETTINGS_PATH, scmUrl, log)
         if (mavenSettingsManagedFile) {
             commandBuilder.setSettingsId(mavenSettingsManagedFile.getId())
         }