Merge pull request #362 from npotluri-rh/additional-jdk-versions-on-ci-build

Fix build on Java 17

Author: olivergondza

Jenkinsfile

@@ -3,6 +3,7 @@
 /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
 buildPlugin(
   useContainerAgent: true,
+  failFast: false,
   configurations: [
     [platform: 'linux', jdk: 11],
     [platform: 'linux', jdk: 17],

plugin/pom.xml

@@ -46,13 +46,10 @@
 
         <guava.version>32.1.1-jre</guava.version> <!-- version compatible with openstack4j -->
         <jsr305.version>1.3.9</jsr305.version>
-        <openstack4j.version>3.10</openstack4j.version>
+        <openstack4j.version>3.11</openstack4j.version>
         <okhttp.version>3.9.1</okhttp.version>
         <!-- Upper bound io.jenkins.configuration-as-code:test-harness -->
         <jenkins-test-harness.version>2064.vcd3b_b_8f3f2b_a_</jenkins-test-harness.version>
-        <!-- Upper bound org.jenkins-ci.main:jenkins-test-harness -->
-<!--        <junit.version>5.10.0</junit.version>-->
-        <jackson.version>2.15.3</jackson.version>
     </properties>
 
     <developers>
@@ -107,7 +104,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>config-file-provider</artifactId>
-            <version>3.7.1</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -151,6 +147,7 @@
             <artifactId>plexus-classworlds</artifactId>
             <version>2.4.2</version>
         </dependency>
+
         <dependency>
             <groupId>org.jenkins-ci</groupId>
             <artifactId>symbol-annotation</artifactId>
@@ -160,28 +157,10 @@
             <artifactId>snakeyaml</artifactId>
             <version>2.2</version>
         </dependency>
-
-        <!--Specifying jenkins version to avoid maven.plugins.enforcer.RequireUpperBoundDeps error
-        between configuration as code and openstack4j -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>jackson2-api</artifactId>
+            <version>2.14.1-313.v504cdd45c18b</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -196,6 +175,7 @@
             <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
@@ -239,6 +219,12 @@
             <artifactId>test-harness</artifactId>
             <groupId>io.jenkins.configuration-as-code</groupId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jenkins-ci.plugins</groupId>
+                    <artifactId>jackson2-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>net.sourceforge.htmlunit</groupId>-->

plugin/src/test/java/jenkins/plugins/openstack/PluginTestRule.java

@@ -25,15 +25,13 @@
 import hudson.slaves.NodeProperty;
 import hudson.slaves.NodeProvisioner.NodeProvisionerInvoker;
 import hudson.slaves.NodeProvisioner.PlannedNode;
-import hudson.slaves.OfflineCause;
 import hudson.util.FormValidation;
 import hudson.util.ProcessTree;
 import hudson.util.Secret;
 import hudson.util.StreamTaskListener;
 import jenkins.model.Jenkins;
 import jenkins.plugins.openstack.compute.JCloudsCleanupThread;
 import jenkins.plugins.openstack.compute.JCloudsCloud;
-import jenkins.plugins.openstack.compute.JCloudsComputer;
 import jenkins.plugins.openstack.compute.JCloudsPreCreationThread;
 import jenkins.plugins.openstack.compute.JCloudsSlave;
 import jenkins.plugins.openstack.compute.JCloudsSlaveTemplate;
@@ -90,13 +88,8 @@
 import java.util.stream.Collectors;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.RETURNS_SMART_NULLS;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.withSettings;
+import static org.mockito.Mockito.*;
+
 
 /**
  * Test utils for plugin functional testing.

plugin/src/test/java/jenkins/plugins/openstack/compute/JCloudsSlaveTemplateTest.java

@@ -8,6 +8,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Stream;
+import java.lang.reflect.Field;
 
 import org.htmlunit.html.HtmlForm;
 import hudson.util.FormValidation;
@@ -20,7 +21,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.mockito.internal.util.reflection.Whitebox;
 import org.openstack4j.model.compute.BDMDestType;
 import org.openstack4j.model.compute.BDMSourceType;
 import org.openstack4j.model.compute.BlockDeviceMappingCreate;
@@ -36,12 +36,13 @@
 
 import static jenkins.plugins.openstack.compute.JCloudsSlaveTemplate.parseSecurityGroups;
 import static jenkins.plugins.openstack.compute.JCloudsSlaveTemplate.selectNetworkIds;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 public class JCloudsSlaveTemplateTest {
@@ -275,9 +276,7 @@ private void testBootFromVolumeSnapshot(final String volumeSnapshotName, final S
     @SuppressWarnings("unchecked")
     private NovaBlockDeviceMappingCreate getBlockDeviceMapping(ServerCreateBuilder scbActual) {
         assertNotNull(scbActual);
-        List<BlockDeviceMappingCreate> blockDeviceMapping = (List<BlockDeviceMappingCreate>) Whitebox.getInternalState(
-                scbActual.build(), "blockDeviceMapping"
-        );
+        List<BlockDeviceMappingCreate> blockDeviceMapping = (List<BlockDeviceMappingCreate>) getInternalState(scbActual.build(), "blockDeviceMapping");
         assertThat(blockDeviceMapping, hasSize(1));
         return (NovaBlockDeviceMappingCreate) blockDeviceMapping.get(0);
     }
@@ -342,10 +341,43 @@ public void allowToUseVolumeSnapshotNameAsWellAsId() throws Exception {
         assertEquals("vs-id", getVolumeSnapshotId(builders.get(0)));
         assertEquals("something-else", getVolumeSnapshotId(builders.get(1)));
     }
+    private static Object getInternalState(Object target, String field) {
+        Class<?> c = target.getClass();
+        try {
+            Field f = getFieldFromHierarchy(c, field);
+            f.setAccessible(true);
+            return f.get(target);
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to set internal state on a private field. Please report to mockito mailing list.", e);
+        }
+    }
+
+    private static Field getFieldFromHierarchy(Class<?> clazz, String field) {
+        Field f = getField(clazz, field);
+        while (f == null && clazz != Object.class) {
+            clazz = clazz.getSuperclass();
+            f = getField(clazz, field);
+        }
+        if (f == null) {
+            throw new RuntimeException(
+                    "You want me to set value to this field: '" + field +
+                    "' on this class: '" + clazz.getSimpleName() +
+                    "' but this field is not declared withing hierarchy of this class!");
+        }
+        return f;
+    }
+
+    private static Field getField(Class<?> clazz, String field) {
+        try {
+            return clazz.getDeclaredField(field);
+        } catch (NoSuchFieldException e) {
+            return null;
+        }
+    }
 
     @SuppressWarnings("unchecked")
     private String getVolumeSnapshotId(ServerCreateBuilder builder) {
-        List<BlockDeviceMappingCreate> mapping = (List<BlockDeviceMappingCreate>) Whitebox.getInternalState(
+        List<BlockDeviceMappingCreate> mapping = (List<BlockDeviceMappingCreate>) getInternalState(
                 builder.build(),
                 "blockDeviceMapping"
         );

plugin/src/test/java/jenkins/plugins/openstack/compute/ProvisioningTest.java

@@ -56,6 +56,7 @@
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
@@ -101,7 +102,7 @@ public void abortProvisioningWhenOpenstackFails() throws Exception {
         JCloudsSlaveTemplate template = j.dummySlaveTemplate("label");
         JCloudsCloud cloud = j.dummyCloud(template);
         Openstack os = cloud.getOpenstack();
-        when(os.bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class))).thenThrow(new Openstack.ActionFailed("It is broken, alright!"));
+        when(os.bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenThrow(new Openstack.ActionFailed("It is broken, alright!"));
 
         FreeStyleProject p = j.createFreeStyleProject();
         p.setAssignedLabel(Label.get("label"));
@@ -110,7 +111,7 @@ public void abortProvisioningWhenOpenstackFails() throws Exception {
         Thread.sleep(1000);
         assertFalse(started.isDone());
 
-        verify(os, atLeastOnce()).bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class));
+        verify(os, atLeastOnce()).bootAndWaitActive(any(ServerCreateBuilder.class), anyInt());
     }
 
     @Test @Issue("https://github.com/jenkinsci/openstack-cloud-plugin/issues/37")
@@ -119,8 +120,8 @@ public void detectBootTimingOut() {
         final JCloudsCloud cloud = j.dummyCloud(template);
         Openstack os = cloud.getOpenstack();
         Server server = j.mockServer().name("provisioned").status(Server.Status.BUILD).get();
-        when(os.bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class))).thenCallRealMethod();
-        when(os._bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class))).thenReturn(server);
+        when(os.bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenCallRealMethod();
+        when(os._bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenReturn(server);
         when(os.updateInfo(eq(server))).thenReturn(server);
 
         try {
@@ -150,7 +151,7 @@ public void verifyOptionsPropagatedToLauncher() throws Exception {
         assertEquals(slave.getPublicAddress(), launcher.getHost());
         assertEquals("credid", launcher.getCredentialsId());
         //noinspection deprecation
-        assertEquals("java", launcher.getJavaPath()); // https://github.com/jenkinsci/ssh-slaves-plugin/commit/9d25b12b1340e00d63a069f54c1b2361f745b6fc#commitcomment-49501649
+        assertEquals("java", launcher.getHost()); // https://github.com/jenkinsci/ssh-slaves-plugin/commit/9d25b12b1340e00d63a069f54c1b2361f745b6fc#commitcomment-49501649
         assertEquals(expected.getJvmOptions(), launcher.getJvmOptions());
         assertEquals(10, (int) slave.getSlaveOptions().getRetentionTime());
 
@@ -306,7 +307,7 @@ public void timeoutProvisioning() throws Exception {
         when(os._bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenReturn(null); // Timeout
         when(os.bootAndWaitActive(any(ServerCreateBuilder.class), anyInt())).thenCallRealMethod();
         Server server = mock(Server.class);
-        when(os.getServersByName(any(String.class))).thenReturn(Collections.singletonList(server));
+        when(os.getServersByName(anyString())).thenReturn(Collections.singletonList(server));
 
         for (NodeProvisioner.PlannedNode pn : c.provision(Label.get("label"), 1)) {
             try {
@@ -472,7 +473,6 @@ public void failIfNoAccessIpFound() {
     private void verifyPreferredAddressUsed(String expectedAddress, Collection<NetworkAddress> addresses) throws Exception {
         CloudStatistics cs = CloudStatistics.get();
         assertThat(cs.getActivities(), Matchers.iterableWithSize(0));
-
         j.autoconnectJnlpSlaves();
         JCloudsCloud cloud = j.configureSlaveProvisioning(j.dummyCloud(j.dummySlaveTemplate("label")), addresses);
 

plugin/src/test/java/jenkins/plugins/openstack/compute/internal/OpenstackTest.java

@@ -4,9 +4,6 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMapOf;
-import static org.mockito.Matchers.argThat;
 import static org.mockito.Mockito.*;
 
 import org.junit.Before;
@@ -186,7 +183,7 @@ public void getImageIdsForGivenNameThenReturnsMatchingImageIdsSortedByAge() {
         when(mockImageNamedBar3.getCreatedAt()).thenReturn(new Date(1000));
         final ImageService mockIS = mock(ImageService.class);
         final List images = Arrays.asList(mockImageNamedBar1, mockImageNamedBar2, mockImageNamedBar3);
-        when(mockIS.list(anyMapOf(String.class, String.class))).thenReturn(images);
+        when(mockIS.list(anyMap())).thenReturn(images);
         final ArrayList<String> expected = new ArrayList<>(
                 Arrays.asList("mockImageNamedBar2Id", "mockImageNamedBar3Id", "mockImageNamedBar1Id"));
 
@@ -206,7 +203,7 @@ public void getImageIdsForGivenNameThenReturnsMatchingImageIdsSortedByAge() {
     @Test
     public void getImageIdsForGivenUnknownThenReturnsEmpty() {
         final ImageService mockIS = mock(ImageService.class);
-        when(mockIS.list(anyMapOf(String.class, String.class))).thenReturn(Collections.EMPTY_LIST);
+        when(mockIS.list(anyMap())).thenReturn(Collections.EMPTY_LIST);
 
         when(osClient.imagesV2()).thenReturn(mockIS);
         final ArrayList<String> expected = new ArrayList<>();
@@ -230,7 +227,7 @@ public void getImageIdsForGivenIdOfActiveImageThenReturnsId() {
         when(mockImageNamedFoo.getName()).thenReturn("Foo");
         when(mockImageNamedFoo.getStatus()).thenReturn(Image.ImageStatus.ACTIVE);
         final ImageService mockIS = mock(ImageService.class);
-        when(mockIS.list(anyMapOf(String.class, String.class))).thenReturn(Collections.EMPTY_LIST);
+        when(mockIS.list(anyMap())).thenReturn(Collections.EMPTY_LIST);
         when(mockIS.get(imageId)).thenReturn(mockImageNamedFoo);
 
         when(osClient.imagesV2()).thenReturn(mockIS);
@@ -239,7 +236,7 @@ public void getImageIdsForGivenIdOfActiveImageThenReturnsId() {
 
         final List<String> actual = openstack.getImageIdsFor(imageId);
 
-        verify(mockIS).list(anyMapOf(String.class, String.class));
+        verify(mockIS).list(anyMap());
         verify(mockIS).get(imageId);
         verifyNoMoreInteractions(mockIS);
         assertThat(new ArrayList<>(actual), equalTo(expected));
@@ -446,9 +443,9 @@ public void deleteAfterFailedBoot() {
         when(fault.getDetails()).thenReturn("I told you once");
         when(server.getFault()).thenReturn(fault);
 
-        doReturn(server).when(os)._bootAndWaitActive(any(ServerCreateBuilder.class), any(Integer.class));
+        doReturn(server).when(os)._bootAndWaitActive((ServerCreateBuilder) any(ServerCreateBuilder.class), anyInt());
         doThrow(new Openstack.ActionFailed("Fake deletion failure")).when(os).destroyServer(server);
-        doNothing().when(os).attachFingerprint(any(ServerCreateBuilder.class));
+        doNothing().when(os).attachFingerprint((ServerCreateBuilder) any(ServerCreateBuilder.class));
 
         try {
             os.bootAndWaitActive(mock(ServerCreateBuilder.class), 1);
@@ -476,9 +473,9 @@ public void deleteFloatingIpsWhenDeletingMachine() {
 
         NetFloatingIPService fips = client.networking().floatingip();
         when(fips.list()).thenAnswer(sequencer.getAllFips());
-        when(fips.delete(any(String.class))).thenAnswer(sequencer.deleteFip());
+        when(fips.delete(anyString())).thenAnswer(sequencer.deleteFip());
         PortService ports = client.networking().port();
-        when(ports.list(any(PortListOptions.class))).thenAnswer(sequencer.getAllPorts());
+        when(ports.list((PortListOptions) any(PortListOptions.class))).thenAnswer(sequencer.getAllPorts());
 
         Openstack os = new Openstack(client);
         os.destroyServer(server);

plugin/src/test/java/jenkins/plugins/openstack/compute/slaveopts/BootSourceTest.java

@@ -47,12 +47,12 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
+//import static org.mockito.Mockito.doReturn;
+//import static org.mockito.Mockito.mock;
+//import static org.mockito.Mockito.verify;
+//import static org.mockito.Mockito.verifyNoMoreInteractions;
+//import static org.mockito.Mockito.when;
 
 public class BootSourceTest {
     private static final FormValidation VALIDATION_REQUIRED = FormValidation.error(hudson.util.Messages._FormValidation_ValidateRequired().toString(US));

plugin/src/test/resources/jenkins/plugins/openstack/compute/JCloudsCloudTest/globalConfigMigrationFromV1/config.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <hudson>
   <disabledAdministrativeMonitors/>
-  <version>1.642.1</version>
+  <version>2.387.1</version>
   <numExecutors>2</numExecutors>
   <mode>NORMAL</mode>
   <useSecurity>true</useSecurity>
@@ -15,7 +15,7 @@
   <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
   <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
   <clouds>
-    <jenkins.plugins.openstack.compute.JCloudsCloud plugin="openstack-cloud@1.8">
+    <jenkins.plugins.openstack.compute.JCloudsCloud plugin="openstack-cloud">
       <name>OSCloud</name>
       <identity>tenant:user</identity>
       <credential>w52oEIGWBalT2GPsVd0pMODVwEohhbQ+fI8wOt0eVHo=</credential>

plugin/src/test/resources/jenkins/plugins/openstack/compute/JCloudsCloudTest/globalConfigMigrationFromV1/credentials.xml

@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="credentials@1.24">
+<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="credentials">
   <domainCredentialsMap class="hudson.util.CopyOnWriteMap$Hash">
     <entry>
       <com.cloudbees.plugins.credentials.domains.Domain>
         <specifications/>
       </com.cloudbees.plugins.credentials.domains.Domain>
       <java.util.concurrent.CopyOnWriteArrayList>
-        <com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey plugin="ssh-credentials@1.11">
+        <com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey plugin="ssh-credentials">
           <scope>GLOBAL</scope>
           <id>2d07660b-c5c7-4e8b-82fd-a6ffe3429b39</id>
           <description></description>