Updating to Java 11

jenkinsci · Mar 19, 2024 · 8f18eef · 8f18eef
1 parent aa857ee
commit 8f18eef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,13 +1,13 @@
 def comonVersion = "2.356"
 def recentLTS = "2.346.1"
 def configurations = [
-    [ platform: "linux", jdk: "8", jenkins: null ],
+    [ platform: "linux", jdk: "11", jenkins: null ],
     // windows 
-    [ platform: "windows", jdk: "8", jenkins: comonVersion ],
+    [ platform: "windows", jdk: "11", jenkins: comonVersion ],
     // java 11 
     [ platform: "linux", jdk: "11", jenkins: comonVersion ],
     // windows
-    [ platform: "windows", jdk: "8", jenkins: recentLTS ],
+    [ platform: "windows", jdk: "11", jenkins: recentLTS ],
     // java 11
     [ platform: "linux", jdk: "11", jenkins: recentLTS ],
 ]

diff --git a/pom.xml b/pom.xml
@@ -100,7 +100,11 @@
         <version>${configuration-as-code.version}</version>
         <scope>test</scope>
     </dependency>
-
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>20240303</version>
+    </dependency>
     <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
     <dependency>
       <groupId>org.mockito</groupId>

diff --git a/src/test/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfigurationTest.java b/src/test/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfigurationTest.java
@@ -29,7 +29,7 @@ public class DatadogGlobalConfigurationTest {
 
     static {
         jenkinsRule = new JenkinsRule();
-        jenkinsRule.timeout = 300; // default value of 180 is too small for all the test cases in this class
+        jenkinsRule.timeout = 600; // default value of 180 is too small for all the test cases in this class
     }
 
     @Rule public JenkinsConfiguredWithCodeRule r = new JenkinsConfiguredWithCodeRule();