Skip to content

Commit 35dffd0

Browse files
authored
Merge pull request #425 from mawinter69/remove-eclipse
remove dependency to eclipse
2 parents bd758b5 + db026c5 commit 35dffd0

File tree

4 files changed

+9
-26
lines changed

4 files changed

+9
-26
lines changed

pom.xml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<jenkins.baseline>2.492</jenkins.baseline>
1717
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
1818
<jackson-dataformat.version>2.18.3</jackson-dataformat.version>
19-
<eclipse-collections.version>11.1.0</eclipse-collections.version>
2019
</properties>
2120

2221
<groupId>io.jenkins.plugins</groupId>
@@ -105,10 +104,6 @@
105104
<groupId>io.jenkins.plugins</groupId>
106105
<artifactId>data-tables-api</artifactId>
107106
</dependency>
108-
<dependency>
109-
<groupId>jakarta.servlet</groupId>
110-
<artifactId>jakarta.servlet-api</artifactId>
111-
</dependency>
112107
<dependency>
113108
<groupId>io.jenkins.plugins</groupId>
114109
<artifactId>echarts-api</artifactId>
@@ -122,17 +117,7 @@
122117
<artifactId>jackson-dataformat-csv</artifactId>
123118
<version>${jackson-dataformat.version}</version>
124119
</dependency>
125-
<!-- Project Library Dependencies -->
126-
<dependency>
127-
<groupId>org.eclipse.collections</groupId>
128-
<artifactId>eclipse-collections-api</artifactId>
129-
<version>${eclipse-collections.version}</version>
130-
</dependency>
131-
<dependency>
132-
<groupId>org.eclipse.collections</groupId>
133-
<artifactId>eclipse-collections</artifactId>
134-
<version>${eclipse-collections.version}</version>
135-
</dependency>
120+
136121
<!-- Workflow dependencies -->
137122
<dependency>
138123
<groupId>org.jenkins-ci.plugins.workflow</groupId>

src/main/java/io/jenkins/plugins/reporter/ReportDetails.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public ReportDetails(final Run<?, ?> owner, final String url, final ReportResult
6565
this.item = item;
6666
this.displayName = displayName;
6767

68-
infoMessages.addAll(result.getInfoMessages().castToList());
69-
errorMessages.addAll(result.getErrorMessages().castToList());
68+
infoMessages.addAll(result.getInfoMessages());
69+
errorMessages.addAll(result.getErrorMessages());
7070
}
7171

7272
ReportResult getResult() {

src/main/java/io/jenkins/plugins/reporter/ReportResult.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import hudson.model.Run;
44
import io.jenkins.plugins.reporter.model.Report;
5-
import org.eclipse.collections.api.list.ImmutableList;
6-
import org.eclipse.collections.impl.factory.Lists;
5+
import java.util.Collections;
76

87
import java.io.Serializable;
98
import java.util.ArrayList;
@@ -46,11 +45,11 @@ public Report getReport() {
4645
return report;
4746
}
4847

49-
public ImmutableList<String> getErrorMessages() {
50-
return Lists.immutable.withAll(errors);
48+
public List<String> getErrorMessages() {
49+
return Collections.unmodifiableList(errors);
5150
}
5251

53-
public ImmutableList<String> getInfoMessages() {
54-
return Lists.immutable.withAll(messages);
52+
public List<String> getInfoMessages() {
53+
return Collections.unmodifiableList(messages);
5554
}
5655
}

src/main/java/io/jenkins/plugins/reporter/steps/PublishReportStep.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.jenkins.plugins.util.JenkinsFacade;
1818
import jenkins.model.Jenkins;
1919
import org.apache.commons.lang3.StringUtils;
20-
import org.eclipse.collections.impl.factory.Sets;
2120
import org.jenkinsci.plugins.workflow.graph.FlowNode;
2221
import org.jenkinsci.plugins.workflow.steps.*;
2322
import org.kohsuke.stapler.AncestorInPath;
@@ -114,7 +113,7 @@ public static class Descriptor extends StepDescriptor {
114113

115114
@Override
116115
public Set<Class<?>> getRequiredContext() {
117-
return Sets.immutable.of(FlowNode.class, Run.class, TaskListener.class).castToSet();
116+
return Set.of(FlowNode.class, Run.class, TaskListener.class);
118117
}
119118

120119
@Override

0 commit comments

Comments
 (0)