Fix deprecation warnings + Update ArtifactArchiver to no longer consu…

…lt with environment variables injected by EnvironmentContributingActions during the build (#4933) * fixed deprecation warnings * reverted changes * fixed typeo in javadoc * Update core/src/main/java/hudson/tasks/ArtifactArchiver.java Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> * Update core/src/main/java/hudson/cli/BuildCommand.java Co-authored-by: Jesse Glick <jglick@cloudbees.com> * fixed imports Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> Co-authored-by: Jesse Glick <jglick@cloudbees.com>
jenkinsci · Oct 14, 2020 · 93428a4 · 93428a4
1 parent 7602cf3
commit 93428a4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
@@ -967,7 +967,7 @@ public static List<Descriptor<Publisher>> getPublisherDescriptors(AbstractProjec
     }
 
     public static List<SCMDescriptor<?>> getSCMDescriptors(AbstractProject<?,?> project) {
-        return SCM._for(project);
+        return SCM._for((Job) project);
     }
 
     /**

diff --git a/core/src/main/java/hudson/cli/BuildCommand.java b/core/src/main/java/hudson/cli/BuildCommand.java
@@ -49,6 +49,7 @@
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.Option;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -252,7 +253,7 @@ public CLICause(String startedBy){
 
         @Override
         public String getShortDescription() {
-            User user = User.get(startedBy, false);
+            User user = User.getById(startedBy, false);
             String userName = user != null ? user.getDisplayName() : startedBy;
             return Messages.BuildCommand_CLICause_ShortDescription(userName);
         }
@@ -274,4 +275,3 @@ public int hashCode() {
         }
     }
 }
-
diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -260,7 +260,7 @@ public void perform(Run<?,?> build, FilePath ws, EnvVars environment, Launcher l
                     f.setExcludes(excludes);
                     f.setDefaultExcludes(defaultExcludes);
                     f.setCaseSensitive(caseSensitive);
-                    f.perform(build, ws, launcher, listener);
+                    f.perform(build, ws, environment, launcher, listener);
                 }
             } else {
                 result = build.getResult();

diff --git a/core/src/main/java/hudson/util/IncompatibleAntVersionDetected.java b/core/src/main/java/hudson/util/IncompatibleAntVersionDetected.java
@@ -54,6 +54,6 @@ public String getMessage() {
     }
 
     public URL getWhereAntIsLoaded() throws IOException {
-        return Which.jarURL(antClass);
+        return Which.classFileUrl(antClass);
     }
 }
diff --git a/core/src/main/java/hudson/util/IncompatibleServletVersionDetected.java b/core/src/main/java/hudson/util/IncompatibleServletVersionDetected.java
@@ -45,6 +45,6 @@ public IncompatibleServletVersionDetected(Class servletClass) {
     }
 
     public URL getWhereServletIsLoaded() throws IOException {
-        return Which.jarURL(servletClass);
+        return Which.classFileUrl(servletClass);
     }
 }
diff --git a/core/src/main/java/jenkins/util/JSONSignatureValidator.java b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
@@ -9,7 +9,6 @@
 import net.sf.json.JSONObject;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.io.Charsets;
 import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.io.output.TeeOutputStream;
 import org.jvnet.hudson.crypto.CertificateUtil;
@@ -184,7 +183,7 @@ private FormValidation checkSpecificSignature(JSONObject json, JSONObject signat
         //
         // Jenkins should ignore "digest"/"signature" pair. Accepting it creates a vulnerability that allows
         // the attacker to inject a fragment at the end of the json.
-        json.writeCanonical(new OutputStreamWriter(new TeeOutputStream(dos,sos), Charsets.UTF_8)).close();
+        json.writeCanonical(new OutputStreamWriter(new TeeOutputStream(dos,sos), StandardCharsets.UTF_8)).close();
 
         // did the digest match? this is not a part of the signature validation, but if we have a bug in the c14n
         // (which is more likely than someone tampering with update center), we can tell