diff --git a/src/main/java/hudson/matrix/Axis.java b/src/main/java/hudson/matrix/Axis.java index e1f5b07f..167cb807 100644 --- a/src/main/java/hudson/matrix/Axis.java +++ b/src/main/java/hudson/matrix/Axis.java @@ -216,7 +216,7 @@ public AxisDescriptor getDescriptor() { @Override public String toString() { - return new StringBuilder().append(name).append("={").append(Util.join(values,",")).append('}').toString(); + return new StringBuilder().append(name).append("={").append(String.join(",", values)).append('}').toString(); } /** diff --git a/src/main/java/hudson/matrix/LabelAxis.java b/src/main/java/hudson/matrix/LabelAxis.java index de8b6d10..a1a49f34 100644 --- a/src/main/java/hudson/matrix/LabelAxis.java +++ b/src/main/java/hudson/matrix/LabelAxis.java @@ -25,7 +25,6 @@ import hudson.Extension; import hudson.Functions; -import hudson.Util; import jenkins.model.Jenkins; import hudson.model.labels.LabelAtom; import org.kohsuke.stapler.DataBoundConstructor; @@ -50,7 +49,7 @@ public boolean isSystem() { @Override public String getValueString() { - return Util.join(getValues(),"/"); + return String.join("/", getValues()); } @Extension diff --git a/src/main/java/hudson/matrix/MatrixProject.java b/src/main/java/hudson/matrix/MatrixProject.java index c618d419..ca065499 100644 --- a/src/main/java/hudson/matrix/MatrixProject.java +++ b/src/main/java/hudson/matrix/MatrixProject.java @@ -852,7 +852,7 @@ public JDK getJDK() { Set