-
Notifications
You must be signed in to change notification settings - Fork 200
8070: Move to JDK 17 leftovers #483
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.
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
Conversation
So one can run docker-compose even if jetty:run is running on the host.
|
👋 Welcome back bdutheil! A progress list of the required criteria for merging this PR into |
|
Looks good overall. You need to create a JBS issue, though. And, any particular reason for using azul and not e.g. eclipse temurin? |
| public static <T, U> ViewerDropAdapter createLocalDropListTarget( | ||
| Viewer viewer, Class<T> targetType, Class<U> srcType, IDropAction<List<? extends U>, T> action, | ||
| IDropValidator<List<? extends U>, T> validator) { | ||
| Viewer viewer, | ||
| Class<T> targetType, | ||
| Class<U> srcType, | ||
| IDropAction<List<U>, T> action, | ||
| IDropValidator<List<U>, T> validator | ||
| ) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
question: It seems this change is not accepted by the formatter, I can change it back, but do you think we could improve readability if the formatter rules were updated.
Error: Failed to execute goal com.diffplug.spotless:spotless-maven-plugin:2.17.2:check (default-cli) on project org.openjdk.jmc.ui: The following files had format violations:
Error: src/main/java/org/openjdk/jmc/ui/misc/DndToolkit.java
Error: @@ -112,12 +112,8 @@
Error: \t}
Error:
Error: \tpublic·static·<T,·U>·ViewerDropAdapter·createLocalDropListTarget(
Error: -\t\tViewer·viewer,
Error: -\t\tClass<T>·targetType,
Error: -\t\tClass<U>·srcType,
Error: -\t\tIDropAction<List<U>,·T>·action,
Error: -\t\tIDropValidator<List<U>,·T>·validator
Error: -\t)·{
Error: +\t\tViewer·viewer,·Class<T>·targetType,·Class<U>·srcType,·IDropAction<List<U>,·T>·action,
Error: +\t\tIDropValidator<List<U>,·T>·validator)·{
Error: \t\treturn·createLocalDropTarget(viewer,·targetType,·new·IDropAction<ISelection,·T>()·{
Error:
Error: \t\t\t@SuppressWarnings("unchecked")
Error: Run 'mvn spotless:apply' to fix these violations.
Error: -> [Help 1]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, just seen that. From this output it's not clear to me where the formatting violation is... that's not nice
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After spotless:apply the code becomes less readable in my opinion:
public static <T, U> ViewerDropAdapter createLocalDropListTarget(
- Viewer viewer,
- Class<T> targetType,
- Class<U> srcType,
- IDropAction<List<U>, T> action,
- IDropValidator<List<U>, T> validator
- ) {
+ Viewer viewer, Class<T> targetType, Class<U> srcType, IDropAction<List<U>, T> action,
+ IDropValidator<List<U>, T> validator) {
No real reason, it was the first I found that was up-to-date after the removal of openjdk images. |
|
In a similar vein to the eclipse temurin over azul, I was wondering about the toolchains example in the readme (I was just a slow submitting review comments on the last pr!). I wasn't sure if the vendor should be generic, and if you had intended on using your own |
Webrevs
|
I can change to something more generic ; I did that way in the dev guide to be a concrete example that matches what the screenshots have. |
Ah makes sense, good to know it wasn't an accidental copy/paste. It's more of a personal nit that I liked the front-page readme to be more generic from a vendor perspective, I think if the example |
RealCLanger
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good overall, thanks for cleaning this up. I made a few suggestions. Please also check the files you touched to update the copyright year where applicable.
...ion/src/main/java/org/openjdk/jmc/flightrecorder/configuration/internal/DefaultValueMap.java
Outdated
Show resolved
Hide resolved
RealCLanger
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good. As stated before, please update copyright years before integration.
|
@bric3 This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 2 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealCLanger) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
RealCLanger
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect. Go for it. :)
|
/integrate |
|
/sponsor |
|
Going to push as commit 80ab189.
Your commit was automatically rebased without conflicts. |
|
@RealCLanger @bric3 Pushed as commit 80ab189. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
In #482 I forgot to update the Docker build, as well as remove some old profiles in the parent pom. This PR, fixes that. Also I noticed a few quirks around ECJ compiler that I think should be removed as they are not working when using a regular OpenJDK compiler.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jmc.git pull/483/head:pull/483$ git checkout pull/483Update a local copy of the PR:
$ git checkout pull/483$ git pull https://git.openjdk.org/jmc.git pull/483/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 483View PR using the GUI difftool:
$ git pr show -t 483Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jmc/pull/483.diff
Webrev
Link to Webrev Comment