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

Jump to bottom

Backport #877 to 3653.x #879

Open
wants to merge 1 commit into
base: 3653.x
Choose a base branch
from
Open

Backport #877 to 3653.x #879

wants to merge 1 commit into from

Conversation

dwnusbaum
Copy link
Member

Backports #877 to 3653.x.

Note that I copied ErrorLoggingExecutorService from core (jenkinsci/jenkins#7284) into CpsVmExecutorService as an inner class to avoid having to update dependencies here. If preferred, we could instead update dependencies, or just drop the ErrorLoggingExecutorService from threadPool in the backport.

Testing done

Submitter checklist

Edit tasklist title
Beta Give feedback Tasklist Submitter checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
    Options
  2. Ensure that the pull request title represents the desired changelog entry
    Options
  3. Please describe what you did
    Options
  4. Link to relevant issues in GitHub or Jira
    Options
  5. Link to relevant pull requests, esp. upstream and downstream changes
    Options
  6. Ensure you have provided tests - that demonstrates feature works or fixes the issue
    Options

@dwnusbaum
Merge pull request jenkinsci#877 from jglick/GroovyCategorySupport
222c015 
More efficient use of `GroovyCategorySupport`

(cherry picked from commit d0f0248)
@dwnusbaum dwnusbaum requested a review from a team as a code owner April 2, 2024 20:04
dwnusbaum
dwnusbaum commented Apr 2, 2024
View reviewed changes
plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java
@@ -177,4 +214,32 @@ private void tearDown(ThreadContext context) {
static ThreadLocal<ClassLoader> ORIGINAL_CONTEXT_CLASS_LOADER = new ThreadLocal<>();

private static final Logger LOGGER = Logger.getLogger(CpsVmExecutorService.class.getName());

// NOTE: Copied from Jenkins core when backporting d0f0248b to avoid having to update dependencies.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed in the PR description.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jglick jglick jglick approved these changes

@rsandell rsandell rsandell approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@dwnusbaum @jglick @rsandell