Merge pull request #125 from raymondwu1/rwu/update_dependencies

Updated dependencies
jenkinsci · Nov 27, 2024 · 06cd065 · 06cd065
2 parents 8a9b47f + 6d10e48
commit 06cd065
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.2</version>
     <relativePath />
   </parent>
 
@@ -38,9 +38,9 @@
 
   <properties>
     <revision>2</revision>
-    <changelist>999999-SNAPSHOT</changelist>
+    <changelist>-SNAPSHOT</changelist>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.version>2.387.3</jenkins.version>
+    <jenkins.version>2.479</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
     <!-- TODO GMavenPlus does not support Javadoc -->
     <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -52,8 +52,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.387.x</artifactId>
-        <version>2543.vfb_1a_5fb_9496d</version>
+        <artifactId>bom-2.479.x</artifactId>
+        <version>3722.vcc62e7311580</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/GlobalEventsPluginTest.groovy b/src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/GlobalEventsPluginTest.groovy
@@ -5,6 +5,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
+import org.jvnet.hudson.test.JenkinsRule
 
 import java.util.concurrent.Callable
 import java.util.concurrent.ExecutorService
@@ -18,6 +19,8 @@ import static groovy.test.GroovyAssert.shouldFail
  * Created by nickgrealy@gmail.com.
  */
 class GlobalEventsPluginTest {
+    @Rule
+    public JenkinsRule jenkinsRule = new JenkinsRule()
 
     private GlobalEventsPlugin.DescriptorImpl plugin
     private LoggerTrap logger
@@ -27,8 +30,6 @@ class GlobalEventsPluginTest {
 
     @Before
     void setup() {
-        // disable load method, create new plugin...
-        GlobalEventsPlugin.DescriptorImpl.metaClass.load = {}
         plugin = new GlobalEventsPlugin.DescriptorImpl(ClassLoader.getSystemClassLoader())
         logger = new LoggerTrap(GlobalEventsPluginTest.name)
     }

diff --git a/src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/AcceptanceTests.java b/src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/AcceptanceTests.java
@@ -2,12 +2,16 @@
 
 import io.cucumber.junit.Cucumber;
 import io.cucumber.junit.CucumberOptions;
+import org.junit.ClassRule;
 import org.junit.runner.RunWith;
+import org.jvnet.hudson.test.JenkinsRule;
 
 @RunWith(Cucumber.class)
 @CucumberOptions(
         plugin = {"pretty"},
         tags = "not @ignore"
 )
 public class AcceptanceTests {
+    @ClassRule
+    public static JenkinsRule jenkinsRule = new JenkinsRule();
 }
diff --git a/src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/StepDefs.groovy b/src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/StepDefs.groovy
@@ -15,7 +15,6 @@ import org.jenkinsci.plugins.globalEventsPlugin.GlobalQueueListener
 import org.jenkinsci.plugins.globalEventsPlugin.LoggerTrap
 
 class StepDefs {
-
     GlobalEventsPlugin.DescriptorImpl plugin
     GlobalRunListener runListener
     GlobalComputerListener computerListener
@@ -30,8 +29,6 @@ class StepDefs {
 
     @Before
     void setup() {
-        // disable load method, create new plugin...
-        GlobalEventsPlugin.DescriptorImpl.metaClass.load = {}
         plugin = new GlobalEventsPlugin.DescriptorImpl(ClassLoader.getSystemClassLoader())
         logger = new LoggerTrap(GlobalEventsPluginTest.name)
 

diff --git a/src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/WipAcceptanceTests.java b/src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/WipAcceptanceTests.java
@@ -2,12 +2,16 @@
 
 import io.cucumber.junit.Cucumber;
 import io.cucumber.junit.CucumberOptions;
+import org.junit.ClassRule;
 import org.junit.runner.RunWith;
+import org.jvnet.hudson.test.JenkinsRule;
 
 @RunWith(Cucumber.class)
 @CucumberOptions(
         plugin = {"pretty"},
         tags = "@wip and not @ignore"
 )
 public class WipAcceptanceTests {
+    @ClassRule
+    public static JenkinsRule jenkinsRule = new JenkinsRule();
 }
diff --git a/...urces/org/jenkinsci/plugins/globalEventsPlugin/acceptance/Groovy Script - Runtime.feature b/...urces/org/jenkinsci/plugins/globalEventsPlugin/acceptance/Groovy Script - Runtime.feature
@@ -63,12 +63,11 @@ Feature: Groovy Script - Runtime
   Scenario: All relevant job parameters should passed into the script, so that I don't have to manually retrieve data
     Given the script
     """
-    log.info("${log.class}, $listener, $jenkins, $context, $run, $event, $env")
+    log.info("${log.class}, $listener, null, $context, $run, $event, $env")
     """
     When the Run.onStarted event is triggered
     Then the log level info should display 'class org.jenkinsci.plugins.globalEventsPlugin.LoggerTrap, null, null, [:], null, RunListener.onStarted, [:]'
 
-
   Scenario: If the script outputs a map, it should be placed into the cache for subsequent executions, so that the script can keep "memory"
     Given the script
     """