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

Make workflow-api compatible with Guava 21.0 and newer #135

Merged
merged 12 commits into from
Mar 15, 2021
Merged

Make workflow-api compatible with Guava 21.0 and newer #135

merged 12 commits into from
Mar 15, 2021

Conversation

timja
Copy link
Member

@timja timja commented Jan 16, 2021

No description provided.

@timja timja mentioned this pull request Jan 17, 2021
Merged
@timja timja mentioned this pull request Mar 3, 2021
Merged
@car-roll car-roll changed the title Upgrade guava Make workflow-api support later versions of Guava Mar 3, 2021
@car-roll car-roll changed the title Make workflow-api support later versions of Guava Make workflow-api compatible with Guava 21.0 and newer Mar 4, 2021
@amuniz
Copy link
Member

amuniz commented Mar 4, 2021

@timja timja#1

@timja timja marked this pull request as ready for review March 8, 2021 08:05
@timja timja requested a review from jglick March 8, 2021 08:05
@timja
Copy link
Member Author

timja commented Mar 8, 2021

@car-roll @dwnusbaum @bitwiseman PTAL

jglick
jglick reviewed Mar 8, 2021
View reviewed changes
src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecutionList.java Outdated Show resolved Hide resolved
src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecutionList.java Outdated
@@ -194,7 +198,7 @@ public void onFailure(Throwable t) {
LOGGER.log(WARNING, "Failed to load " + e, t);
}
}
});
}, newExecutorService());
Copy link
Member

Choose a reason for hiding this comment

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

Not sure I get it. The original code was not specifying an executor service, so why do we need to add this code now?

Copy link
Member Author

Choose a reason for hiding this comment

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

Deprecated in v22 https://github.com/google/guava/blob/v22.0/guava/src/com/google/common/util/concurrent/Futures.java#L1073

Removed in v26
https://github.com/google/guava/blob/v26.0/guava/src/com/google/common/util/concurrent/Futures.java (not there anymore)

Copy link
Member

Choose a reason for hiding this comment

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

https://github.com/google/guava/blob/v22.0/guava/src/com/google/common/util/concurrent/Futures.java#L1158-L1167 I guess you mean. 👍

@timja timja requested a review from jglick March 8, 2021 13:54
jglick
jglick approved these changes Mar 8, 2021
View reviewed changes
src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecutionList.java Outdated
@@ -194,7 +198,7 @@ public void onFailure(Throwable t) {
LOGGER.log(WARNING, "Failed to load " + e, t);
}
}
});
}, newExecutorService());
Copy link
Member

Choose a reason for hiding this comment

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

https://github.com/google/guava/blob/v22.0/guava/src/com/google/common/util/concurrent/Futures.java#L1158-L1167 I guess you mean. 👍

@timja
Copy link
Member Author

timja commented Mar 13, 2021

@car-roll @dwnusbaum @bitwiseman ping

basil
basil reviewed Mar 14, 2021
View reviewed changes
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Alternatively I think you could take the MoreExecutors and DirectExecutor classes from jenkinsci/workflow-support-plugin#117 and then pass MoreExecutors.directExecutor() without having to use reflection here.

@car-roll car-roll merged commit a4b9535 into jenkinsci:master Mar 15, 2021
@timja timja deleted the upgrade-guava branch March 15, 2021 21:37
@timja
Copy link
Member Author

timja commented Mar 15, 2021

release please? ❤️

@jglick
Copy link
Member

jglick commented Mar 15, 2021

https://github.com/jenkinsci/jep/blob/master/jep/229/README.adoc#motivation

This was referenced Mar 17, 2021
Merged
Closed
Closed
@basil basil mentioned this pull request Oct 2, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@car-roll car-roll car-roll approved these changes

@jglick jglick jglick approved these changes

@basil basil basil approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@timja @amuniz @jglick @basil @car-roll