Fix JENKINS-56237 IllegalArgumentException: providerId can NOT be nul…

…l when using npmConfig
jenkinsci · Feb 22, 2019 · 68c56cd · 68c56cd
1 parent 5804311
commit 68c56cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,7 @@
     <properties>
         <powermock.version>1.7.3</powermock.version>
         <jenkins.version>2.60.3</jenkins.version>
-        <java.level>7</java.level>
+        <java.level>8</java.level>
     </properties>
 
     <dependencies>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>config-file-provider</artifactId>
-            <version>2.16.4</version>
+            <version>3.5</version>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>

diff --git a/src/main/java/jenkins/plugins/nodejs/configfiles/NPMConfig.java b/src/main/java/jenkins/plugins/nodejs/configfiles/NPMConfig.java
@@ -60,8 +60,8 @@ public class NPMConfig extends Config {
     private final List<NPMRegistry> registries;
 
     @DataBoundConstructor
-    public NPMConfig(@Nonnull String id, String name, String comment, String content, @Nonnull String providerId, List<NPMRegistry> registries) {
-        super(id, Util.fixEmptyAndTrim(name), Util.fixEmptyAndTrim(comment), Util.fixEmptyAndTrim(content), providerId);
+    public NPMConfig(@Nonnull String id, String name, String comment, String content, List<NPMRegistry> registries) {
+        super(id, Util.fixEmptyAndTrim(name), Util.fixEmptyAndTrim(comment), Util.fixEmptyAndTrim(content));
         this.registries = registries == null ? new ArrayList<NPMRegistry>(3) : registries;
     }
 
@@ -113,7 +113,7 @@ public String getDisplayName() {
 
         @Override
         public Config newConfig(@Nonnull String configId) {
-            return new NPMConfig(configId, "MyNpmrcConfig", "user config", loadTemplateContent(), getProviderId(), null);
+            return new NPMConfig(configId, "MyNpmrcConfig", "user config", loadTemplateContent(), null);
         }
 
         protected String loadTemplateContent() {