Merge pull request #112 from jglick/JEP-200-JENKINS-49089

[JENKINS-49089] Whitelist problems
jenkinsci · Jan 24, 2018 · ab7e259 · ab7e259
2 parents 4c3b42b + fb9fab6
commit ab7e259
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 88 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin platforms: ['linux'], jenkinsVersions: [null, '2.89.2']
+buildPlugin platforms: ['linux'], jenkinsVersions: [null, '2.103']
diff --git a/src/main/java/hudson/maven/ModuleDependency.java b/src/main/java/hudson/maven/ModuleDependency.java
@@ -63,14 +63,14 @@ public final class ModuleDependency implements Serializable {
      *
      * @see #getVersionAsRange()
      */
-    private VersionRange range;
+    private transient VersionRange range;
 
     /**
      * Cache of the parsed form of {@link #version}
      *
      * @see #parseVersion()
      */
-    private ArtifactVersion parsedVersion;
+    private transient ArtifactVersion parsedVersion;
 
     /**
      * @since 2.2

diff --git a/src/main/java/hudson/maven/SplittableBuildListener.java b/src/main/java/hudson/maven/SplittableBuildListener.java
@@ -24,13 +24,13 @@
 package hudson.maven;
 
 import hudson.console.ConsoleNote;
+import hudson.console.HyperlinkNote;
 import hudson.model.BuildListener;
 import hudson.model.Cause;
 import hudson.model.Result;
 import hudson.model.StreamBuildListener;
 import hudson.remoting.Channel;
 import hudson.remoting.Future;
-import hudson.util.AbstractTaskListener;
 import jenkins.security.MasterToSlaveCallable;
 import jenkins.util.MarkFindingOutputStream;
 import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -53,7 +53,7 @@
  * @author Kohsuke Kawaguchi
  * @since 1.133
  */
-final class SplittableBuildListener extends AbstractTaskListener implements BuildListener, Serializable {
+final class SplittableBuildListener implements BuildListener, Serializable {
     /**
      * The actual {@link BuildListener} where the output goes.
      */
@@ -233,6 +233,12 @@ public void annotate(ConsoleNote ann) throws IOException {
         core.annotate(ann);
     }
 
+    @Override // TODO 2.92+ delete
+    public void hyperlink(String url, String text) throws IOException {
+        annotate(new HyperlinkNote(url,text.length()));
+        getLogger().print(text);
+    }
+
     private Object writeReplace() throws IOException {
         return new StreamBuildListener(logger);
     }

diff --git a/src/test/java/hudson/maven/ModuleDependencyLocator.java b/src/test/java/hudson/maven/ModuleDependencyLocator.java