Merge pull request #63 from batmat/java11-readiness

Make the plugin Java 11 ready -- Remove JAXB usage
jenkinsci · Mar 21, 2019 · bbf9667 · bbf9667
2 parents 406ca6f + 59801ae
commit bbf9667
Show file tree

Hide file tree

Showing 5 changed files with 32 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
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>3.24</version>
+    <version>3.40</version>
     <relativePath />
   </parent>
 
@@ -65,10 +65,10 @@
   </scm>
 
   <properties>
-    <revision>2.3.3</revision>
+    <revision>2.4.0</revision>
     <changelist>-SNAPSHOT</changelist>
-    <jenkins.version>2.7.3</jenkins.version>
-    <java.level>7</java.level>
+    <jenkins.version>2.60.3</jenkins.version>
+    <java.level>8</java.level>
     <no-test-jar>false</no-test-jar>
   </properties>
 

diff --git a/src/main/java/jenkins/scm/impl/form/NamedArrayList.java b/src/main/java/jenkins/scm/impl/form/NamedArrayList.java
@@ -26,6 +26,8 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,6 +40,8 @@
  *
  * @param <E> the type of element.
  */
+@SuppressFBWarnings(value = "EQ_DOESNT_OVERRIDE_EQUALS",
+        justification = "On purpose ignoring 'name' field, not changing current behavior present since ~2 years")
 public class NamedArrayList<E> extends ArrayList<E> {
     /**
      * The associated name.

diff --git a/src/test/java/jenkins/scm/impl/mock/MockSCMController.java b/src/test/java/jenkins/scm/impl/mock/MockSCMController.java
@@ -50,6 +50,7 @@
 import java.util.regex.Pattern;
 import jenkins.scm.api.SCMFile;
 import jenkins.scm.api.SCMNavigatorOwner;
+import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jvnet.hudson.test.recipes.LocalData;
@@ -601,7 +602,7 @@ public String getHash() {
                         sha.update(e.getKey().getBytes(StandardCharsets.UTF_8));
                         sha.update(e.getValue());
                     }
-                    hash = javax.xml.bind.DatatypeConverter.printHexBinary(sha.digest()).toLowerCase();
+                    this.hash = toHexBinary(sha.digest());
                 } catch (NoSuchAlgorithmException e) {
                     throw new IllegalStateException("SHA-1 message digest mandated by JLS");
                 }
@@ -610,6 +611,10 @@ public String getHash() {
         }
     }
 
+    static String toHexBinary(byte[] bytes) {
+        return new String(Hex.encodeHex(bytes));
+    }
+
     public static final class LogEntry {
         private final String hash;
         private final long timestamp;

diff --git a/src/test/java/jenkins/scm/impl/mock/MockSCMControllerTest.java b/src/test/java/jenkins/scm/impl/mock/MockSCMControllerTest.java
@@ -0,0 +1,17 @@
+package jenkins.scm.impl.mock;
+
+import org.junit.Test;
+
+import java.security.MessageDigest;
+
+import static org.junit.Assert.assertEquals;
+
+public class MockSCMControllerTest {
+
+    @Test
+    public void toHexBinary() throws Exception {
+        final MessageDigest msg = MessageDigest.getInstance("SHA-1");
+        msg.update("blah".getBytes());
+        assertEquals("5bf1fd927dfb8679496a2e6cf00cbe50c1c87145", MockSCMController.toHexBinary(msg.digest()));
+    }
+}