Skip to content

Commit 818160d

Browse files
gounthargounthar
authored
Merge branch 'master' into dependabot/maven/commons-beanutils-commons-beanutils-1.9.4
2 parents e365c78 + 364aff4 commit 818160d

File tree

4 files changed

+217
-12
lines changed

4 files changed

+217
-12
lines changed

‎Jenkinsfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
// Build the plugin using https://github.com/jenkins-infra/pipeline-library
2-
buildPlugin()
2+
buildPlugin(failFast: false,
3+
configurations: [
4+
[platform: 'linux', jdk: '17', jenkins: '2.371'],
5+
[platform: 'linux', jdk: '11', jenkins: '2.361.1'],
6+
[platform: 'windows', jdk: '8'],
7+
])

‎pom.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.14</version>
7+
<version>4.49</version>
88
<relativePath />
99
</parent>
1010

@@ -16,10 +16,9 @@
1616
<url>https://github.com/jenkinsci/cvs-plugin</url>
1717

1818
<properties>
19-
<jenkins.version>2.235.5</jenkins.version>
20-
<java.level>8</java.level>
21-
<!-- TODO: Enable once FindBugs issues are fixed -->
22-
<spotbugs.skip>true</spotbugs.skip>
19+
<jenkins.version>2.346.3</jenkins.version>
20+
<spotbugs.effort>Max</spotbugs.effort>
21+
<spotbugs.threshold>Low</spotbugs.threshold>
2322
</properties>
2423

2524

@@ -45,8 +44,8 @@
4544
<dependencies>
4645
<dependency>
4746
<groupId>io.jenkins.tools.bom</groupId>
48-
<artifactId>bom-2.235.x</artifactId>
49-
<version>19</version>
47+
<artifactId>bom-2.346.x</artifactId>
48+
<version>1607.va_c1576527071</version>
5049
<scope>import</scope>
5150
<type>pom</type>
5251
</dependency>
@@ -78,7 +77,7 @@
7877
<dependency>
7978
<groupId>org.reflections</groupId>
8079
<artifactId>reflections</artifactId>
81-
<version>0.9.9</version>
80+
<version>0.10.2</version>
8281
<scope>test</scope>
8382
</dependency>
8483

‎src/main/java/hudson/scm/CVSChangeLogSet.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,7 @@ public void toFile(final java.io.File changelogFile) throws IOException {
695695
output.println("\t\t<file>");
696696
output.println("\t\t\t<name><![CDATA[" + file.getName() + "]]></name>");
697697

698-
if (file.getFullName() != null) {
699-
output.println("\t\t\t<fullName><![CDATA[" + file.getFullName() + "]]></fullName>");
700-
}
698+
output.println("\t\t\t<fullName><![CDATA[" + file.getFullName() + "]]></fullName>");
701699

702700
output.println("\t\t\t<revision>" + file.getRevision() + "</revision>");
703701

‎src/spotbugs/excludesFilter.xml

+203
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<FindBugsFilter>
3+
<!--
4+
Exclusions in this section have been triaged and determined to be
5+
false positives.
6+
-->
7+
8+
<!--
9+
Here lies technical debt. Exclusions in this section have not yet
10+
been triaged. When working on this section, pick an exclusion to
11+
triage, then:
12+
13+
- Add a @SuppressFBWarnings(value = "[...]", justification = "[...]")
14+
annotation if it is a false positive. Indicate the reason why
15+
it is a false positive, then remove the exclusion from this
16+
section.
17+
18+
- If it is not a false positive, fix the bug, then remove the
19+
exclusion from this section.
20+
-->
21+
<Match>
22+
<Bug pattern="DM_CONVERT_CASE"/>
23+
<Class name="hudson.scm.AbstractCvs"/>
24+
<Method name="checkout"/>
25+
</Match>
26+
<Match>
27+
<Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
28+
<Class name="hudson.scm.AbstractCvs"/>
29+
<Or>
30+
<Method name="checkout"/>
31+
<Method name="compareRemoteRevisionWith"/>
32+
</Or>
33+
</Match>
34+
<Match>
35+
<Or>
36+
<Bug pattern="SE_INNER_CLASS"/>
37+
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
38+
</Or>
39+
<Or>
40+
<Class name="hudson.scm.AbstractCvs"/>
41+
<Class name="hudson.scm.AbstractCvs$1"/>
42+
<Class name="hudson.scm.AbstractCvs$2"/>
43+
<Class name="hudson.scm.AbstractCvs$3"/>
44+
<Class name="hudson.scm.AbstractCvs$4"/>
45+
<Class name="hudson.scm.AbstractCvs$5"/>
46+
<Class name="hudson.scm.CvsTagsParamDefinition"/>
47+
</Or>
48+
</Match>
49+
<Match>
50+
<Bug pattern="STCAL_STATIC_SIMPLE_DATE_FORMAT_INSTANCE"/>
51+
<Class name="hudson.scm.AbstractCvs"/>
52+
<Field name="DATE_FORMATTER"/>
53+
</Match>
54+
<Match>
55+
<Bug pattern="SE_NO_SERIALVERSIONID"/>
56+
<Or>
57+
<Class name="hudson.scm.CVSChangeLogSet$CVSChangeLog"/>
58+
<Class name="hudson.scm.CVSChangeLogSet$File"/>
59+
<Class name="hudson.scm.CvsChangeSet"/>
60+
<Class name="hudson.scm.CvsProjectset"/>
61+
<Class name="hudson.scm.CvsRepositoryItem"/>
62+
<Class name="hudson.scm.CvsTagsParamDefinition"/>
63+
<Class name="hudson.scm.CvsTagsParamValue"/>
64+
<Class name="hudson.scm.ExcludedRegion"/>
65+
<Class name="hudson.scm.browsers.CvsFacadeRepositoryBrowser"/>
66+
<Class name="hudson.scm.browsers.OpenGrok"/>
67+
</Or>
68+
</Match>
69+
<Match>
70+
<Bug pattern="EI_EXPOSE_REP"/>
71+
<Or>
72+
<Class name="hudson.scm.CVSSCM"/>
73+
<Class name="hudson.scm.CvsProjectset"/>
74+
</Or>
75+
<Method name="getRepositories"/>
76+
</Match>
77+
<Match>
78+
<Bug pattern="EI_EXPOSE_REP"/>
79+
<Class name="hudson.scm.CvsRepository"/>
80+
<Method name="getExcludedRegions"/>
81+
</Match>
82+
<Match>
83+
<Bug pattern="EI_EXPOSE_REP"/>
84+
<Class name="hudson.scm.CvsRepositoryItem"/>
85+
<Method name="getModules"/>
86+
</Match>
87+
<Match>
88+
<Bug pattern="UC_USELESS_OBJECT"/>
89+
<Class name="hudson.scm.CVSSCM"/>
90+
<Method name="readResolve"/>
91+
</Match>
92+
<Match>
93+
<Bug pattern="NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE"/>
94+
<Class name="hudson.scm.CVSSCM$DescriptorImpl"/>
95+
</Match>
96+
<Match>
97+
<Bug pattern="UUF_UNUSED_FIELD"/>
98+
<Class name="hudson.scm.CVSSCM$DescriptorImpl"/>
99+
<Or>
100+
<Field name="browsers"/>
101+
<Field name="cvsExe"/>
102+
</Or>
103+
</Match>
104+
<Match>
105+
<Bug pattern="UWF_UNWRITTEN_FIELD"/>
106+
<Class name="hudson.scm.CVSSCM$DescriptorImpl"/>
107+
<Or>
108+
<Field name="cvsPassFile"/>
109+
<Field name="noCompression"/>
110+
</Or>
111+
</Match>
112+
<Match>
113+
<Bug pattern="EI_EXPOSE_REP"/>
114+
<Class name="hudson.scm.CVSSCM$DescriptorImpl"/>
115+
<Method name="getAuthentication"/>
116+
</Match>
117+
<Match>
118+
<Bug pattern="UUF_UNUSED_FIELD"/>
119+
<Class name="hudson.scm.CVSSCM$DescriptorImpl$RepositoryBrowser"/>
120+
<Field name="browseURL"/>
121+
</Match>
122+
<Match>
123+
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC"/>
124+
<Class name="hudson.scm.CVSSCM$DescriptorImpl$RepositoryBrowser"/>
125+
</Match>
126+
<Match>
127+
<Bug pattern="UUF_UNUSED_FIELD"/>
128+
<Class name="hudson.scm.CVSSCM$DescriptorImpl$RepositoryBrowser"/>
129+
<Field name="diffURL"/>
130+
</Match>
131+
<Match>
132+
<Bug pattern="DP_DO_INSIDE_DO_PRIVILEGED"/>
133+
<Class name="hudson.scm.CVSSCM$TagAction"/>
134+
<Method name="readResolve"/>
135+
</Match>
136+
<Match>
137+
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
138+
<Class name="hudson.scm.CvsChangeSet"/>
139+
<Or>
140+
<Field name="branchNames"/>
141+
<Field name="tagNames"/>
142+
</Or>
143+
</Match>
144+
<Match>
145+
<Or>
146+
<Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>
147+
<Bug pattern="OS_OPEN_STREAM_EXCEPTION_PATH"/>
148+
<Bug pattern="SF_SWITCH_FALLTHROUGH"/>
149+
</Or>
150+
<Class name="hudson.scm.CvsLog"/>
151+
<Method name="mapCvsLog"/>
152+
</Match>
153+
<Match>
154+
<!-- Visible with Jenkins 2.371 but not with Jenkins 2.361.1 -->
155+
<Bug pattern="OS_OPEN_STREAM_EXCEPTION_PATH"/>
156+
<Class name="hudson.scm.CVSChangeLogSet"/>
157+
<Method name="toFile"/>
158+
</Match>
159+
<Match>
160+
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
161+
<Class name="hudson.scm.CvsModule"/>
162+
<Field name="moduleLocation"/>
163+
</Match>
164+
<Match>
165+
<Bug pattern="EI_EXPOSE_REP2"/>
166+
<Or>
167+
<Class name="hudson.scm.CvsProjectset"/>
168+
<Class name="hudson.scm.CvsRepositoryItem"/>
169+
</Or>
170+
</Match>
171+
<Match>
172+
<Bug pattern="DM_DEFAULT_ENCODING"/>
173+
<Or>
174+
<Class name="hudson.scm.CvsTagsParamDefinition"/>
175+
<Class name="hudson.scm.CvsTagsParamDefinition$1"/>
176+
<Class name="hudson.scm.LegacyConvertor"/>
177+
</Or>
178+
</Match>
179+
<Match>
180+
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
181+
<Class name="hudson.scm.browsers.CvsFacadeRepositoryBrowser"/>
182+
<Field name="changeToBrowserMap"/>
183+
</Match>
184+
<Match>
185+
<Bug pattern="WMI_WRONG_MAP_ITERATOR"/>
186+
<Class name="hudson.scm.cvstagging.CvsTagAction"/>
187+
<Method name="doSubmit"/>
188+
</Match>
189+
<Match>
190+
<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
191+
<Class name="hudson.scm.CvsTagsParamDefinition$2"/>
192+
<Method name="dispose"/>
193+
</Match>
194+
<Match>
195+
<Bug pattern="MS_SHOULD_BE_FINAL"/>
196+
<Class name="jenkins.scm.cvs.QuietPeriodCompleted"/>
197+
<Or>
198+
<Field name="REMOTE_HOSTS"/>
199+
<Field name="REMOTE_NOTE"/>
200+
<Field name="UPDATE_REPEATS"/>
201+
</Or>
202+
</Match>
203+
</FindBugsFilter>

0 commit comments

Comments
 (0)