Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-49089] Whitelist problems #112

Merged
merged 4 commits into from
Jan 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buildPlugin platforms: ['linux'], jenkinsVersions: [null, '2.89.2']
buildPlugin platforms: ['linux'], jenkinsVersions: [null, '2.103']
4 changes: 2 additions & 2 deletions src/main/java/hudson/maven/ModuleDependency.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/hudson/maven/SplittableBuildListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -53,7 +53,7 @@
* @author Kohsuke Kawaguchi
* @since 1.133
*/
final class SplittableBuildListener extends AbstractTaskListener implements BuildListener, Serializable {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final class SplittableBuildListener implements BuildListener, Serializable {
/**
* The actual {@link BuildListener} where the output goes.
*/
Expand Down Expand Up @@ -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);
}
Expand Down
83 changes: 0 additions & 83 deletions src/test/java/hudson/maven/ModuleDependencyLocator.java

This file was deleted.