Merge pull request #115 from batmat/java11-readiness

Java 11 readiness: build both on JDK8 and JDK11
jenkinsci · Jun 28, 2019 · 828f54f · 828f54f
2 parents cbe283c + e6202f8
commit 828f54f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin()
+buildPlugin(configurations: buildPlugin.recommendedConfigurations())
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.8.5</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/src/main/java/hudson/tasks/junit/TestResult.java b/src/main/java/hudson/tasks/junit/TestResult.java
@@ -459,7 +459,7 @@ public int getSkipCount() {
     }
 
     /**
-     * Returns <tt>true</tt> if this doesn't have any any test results.
+     * Returns <code>true</code> if this doesn't have any any test results.
      *
      * @return whether this doesn't contain any test results.
      * @since 1.511

diff --git a/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/src/main/java/hudson/tasks/test/AbstractTestResultAction.java
@@ -202,7 +202,7 @@ public Api getApi() {
      *
      * <p>
      * If such a concept doesn't make sense for a particular subtype,
-     * return <tt>this</tt>.
+     * return <code>this</code>.
      */
     public abstract Object getResult();
 

diff --git a/src/main/java/hudson/tasks/test/package.html b/src/main/java/hudson/tasks/test/package.html
@@ -24,6 +24,6 @@
 
 <html><head/><body>
 Defines contracts that need to be implemented by a test reporting
-action (such as the built-in JUnit one). This contract allows <tt>Project</tt>
+action (such as the built-in JUnit one). This contract allows <code>Project</code>
 to display a test result trend history.
-</body></html>
+</body></html>