Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated dependencies #125

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Updated dependencies #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b8286e
Updated dependencies
raymondwu1 Oct 21, 2024
6d10e48
Updated tests
raymondwu1 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.88</version>
<version>5.2</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/GlobalEventsPluginTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,6 +19,8 @@ import static groovy.test.GroovyAssert.shouldFail
* Created by [email protected].
*/
class GlobalEventsPluginTest {
@Rule
public JenkinsRule jenkinsRule = new JenkinsRule()

private GlobalEventsPlugin.DescriptorImpl plugin
private LoggerTrap logger
Expand All @@ -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)
}
Expand Down
4 changes: 4 additions & 0 deletions src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/AcceptanceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
3 changes: 0 additions & 3 deletions src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/StepDefs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down
4 changes: 4 additions & 0 deletions src/test/groovy/org/jenkinsci/plugins/globalEventsPlugin/acceptance/WipAcceptanceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
3 changes: 1 addition & 2 deletions ...urces/org/jenkinsci/plugins/globalEventsPlugin/acceptance/Groovy Script - Runtime.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""
Expand Down