Skip to content

Commit 3c8f1d7

Browse files
authored
Merge pull request #688 from batmat/remove-obsolete-tt
Replace <tt> by <code> to fix javadoc failure on Java 11
2 parents e9d15cd + f7b1313 commit 3c8f1d7

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Test plugin compatibility to recent Jenkins LTS
44
// Allow failing tests to retry execution
5-
buildPlugin(jenkinsVersions: [null, '2.150.1'],
5+
buildPlugin(configurations: buildPlugin.recommendedConfigurations(),
66
findbugs: [run:true, archive:true, unstableTotalAll: '0'],
77
failFast: false)
88

pom.xml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.jenkins-ci.plugins</groupId>
55
<artifactId>plugin</artifactId>
6-
<version>3.37</version>
6+
<version>3.40</version>
77
<relativePath />
88
</parent>
99

@@ -26,7 +26,7 @@
2626
<properties>
2727
<revision>4.0.0-beta8</revision>
2828
<changelist>-SNAPSHOT</changelist>
29-
<jenkins.version>2.107.3</jenkins.version>
29+
<jenkins.version>2.121.1</jenkins.version>
3030
<java.level>8</java.level>
3131
<no-test-jar>false</no-test-jar>
3232
<concurrency>1C</concurrency>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>org.jenkins-ci.plugins</groupId>
8080
<artifactId>structs</artifactId>
81-
<version>1.10</version>
81+
<version>1.17</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>org.jenkins-ci.plugins</groupId>
@@ -99,17 +99,11 @@
9999
<groupId>org.jenkins-ci.plugins</groupId>
100100
<artifactId>scm-api</artifactId>
101101
<version>${scm-api-plugin.version}</version>
102-
<exclusions>
103-
<exclusion>
104-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
105-
<artifactId>workflow-step-api</artifactId>
106-
</exclusion>
107-
</exclusions>
108102
</dependency>
109103
<dependency>
110104
<groupId>org.jenkins-ci.plugins.workflow</groupId>
111105
<artifactId>workflow-step-api</artifactId>
112-
<version>2.11</version>
106+
<version>2.19</version>
113107
</dependency>
114108
<dependency>
115109
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -269,14 +263,14 @@
269263
<dependency>
270264
<groupId>org.jenkins-ci.plugins.workflow</groupId>
271265
<artifactId>workflow-api</artifactId>
272-
<version>2.18</version>
266+
<version>2.30</version>
273267
<scope>test</scope>
274268
</dependency>
275269
<!-- Satisfy upper bounds dependency warnings -->
276270
<dependency>
277271
<groupId>org.jenkins-ci.plugins.workflow</groupId>
278272
<artifactId>workflow-support</artifactId>
279-
<version>2.14</version>
273+
<version>3.2</version>
280274
<scope>test</scope>
281275
</dependency>
282276
</dependencies>

src/main/java/hudson/plugins/git/util/InverseBuildChooser.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* Git build chooser which will select all branches <b>except</b> for those which match the
1818
* configured branch specifiers.
1919
* <p>
20-
* e.g. If <tt>&#x2a;&#x2a;/master</tt> and <tt>&#x2a;&#x2a;/release-&#x2a;</tt> are configured as
20+
* e.g. If <code>&#x2a;&#x2a;/master</code> and <code>&#x2a;&#x2a;/release-&#x2a;</code> are configured as
2121
* "Branches to build" then any branches matching those patterns <b>will not</b> be built, unless
2222
* another branch points to the same revision.
2323
* <p>
24-
* This is useful, for example, when you have jobs building your <tt>master</tt> and various
25-
* <tt>release</tt> branches and you want a second job which builds all new feature branches &mdash;
24+
* This is useful, for example, when you have jobs building your <code>master</code> and various
25+
* <code>release</code> branches and you want a second job which builds all new feature branches &mdash;
2626
* i.e. branches which do not match these patterns &mdash; without redundantly building
27-
* <tt>master</tt> and the release branches again each time they change.
27+
* <code>master</code> and the release branches again each time they change.
2828
*
2929
* @author Christopher Orr
3030
*/

0 commit comments

Comments
 (0)