Skip to content

Conversation

@bric3
Copy link
Collaborator

@bric3 bric3 commented May 17, 2023

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

  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 Committer)

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jmc.git pull/483/head:pull/483
$ git checkout pull/483

Update a local copy of the PR:
$ git checkout pull/483
$ git pull https://git.openjdk.org/jmc.git pull/483/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 483

View PR using the GUI difftool:
$ git pr show -t 483

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jmc/pull/483.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 17, 2023

👋 Welcome back bdutheil! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@RealCLanger
Copy link
Collaborator

Looks good overall. You need to create a JBS issue, though. And, any particular reason for using azul and not e.g. eclipse temurin?

Comment on lines 114 to 120
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
) {
Copy link
Collaborator Author

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]

Copy link
Collaborator

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

Copy link
Collaborator Author

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) {

@bric3
Copy link
Collaborator Author

bric3 commented May 17, 2023

@RealCLanger

any particular reason for using azul and not e.g. eclipse temurin?

No real reason, it was the first I found that was up-to-date after the removal of openjdk images.

@bric3 bric3 changed the title Move to JDK 17 leftovers 8070: Move to JDK 17 leftovers May 17, 2023
@openjdk openjdk bot added the rfr label May 17, 2023
@aptmac
Copy link
Member

aptmac commented May 17, 2023

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 jdkHome path in the jdk17 example (I had thought of something like /path/to/jdk/17 like the Apache toolchain documentation). Also if the jdk11 toolchain could be removed to place emphasis on the jdk17 toolchain for those who may be new to this file.

@mlbridge
Copy link

mlbridge bot commented May 17, 2023

Webrevs

@bric3
Copy link
Collaborator Author

bric3 commented May 17, 2023

I wasn't sure if the vendor should be generic, and if you had intended on using your own jdkHome path in the jdk17 example (I had thought of something like /path/to/jdk/17 like the Apache toolchain documentation). Also if the jdk11 toolchain could be removed to place emphasis on the jdk17 toolchain for those who may be new to this file.

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.

@aptmac
Copy link
Member

aptmac commented May 17, 2023

I wasn't sure if the vendor should be generic, and if you had intended on using your own jdkHome path in the jdk17 example (I had thought of something like /path/to/jdk/17 like the Apache toolchain documentation). Also if the jdk11 toolchain could be removed to place emphasis on the jdk17 toolchain for those who may be new to this file.

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 toolchain.xml was posted alongside the screenshots in the devguide I would have made the connection a bit better.

Copy link
Collaborator

@RealCLanger RealCLanger left a 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.

Copy link
Collaborator

@RealCLanger RealCLanger left a 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.

@openjdk
Copy link

openjdk bot commented May 19, 2023

@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:

8070: Move to JDK 17 leftovers

Reviewed-by: clanger

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 master branch:

  • 200d0f8: 7457: Unnecessary imports should fail the build
  • 3c70560: 8050: JMC Automated Analysis should improve the messages when ignoring to evaluate some rules.

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

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 /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label May 19, 2023
Copy link
Collaborator

@RealCLanger RealCLanger left a 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. :)

@bric3
Copy link
Collaborator Author

bric3 commented May 22, 2023

/integrate

@openjdk openjdk bot added the sponsor label May 22, 2023
@openjdk
Copy link

openjdk bot commented May 22, 2023

@bric3
Your change (at version 7da8ec7) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Collaborator

/sponsor

@openjdk
Copy link

openjdk bot commented May 22, 2023

Going to push as commit 80ab189.
Since your change was applied there have been 2 commits pushed to the master branch:

  • 200d0f8: 7457: Unnecessary imports should fail the build
  • 3c70560: 8050: JMC Automated Analysis should improve the messages when ignoring to evaluate some rules.

Your commit was automatically rebased without conflicts.

@openjdk
Copy link

openjdk bot commented May 22, 2023

@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.

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

Development

Successfully merging this pull request may close these issues.

3 participants