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.

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

1150: Migrate skara tooling for client code to reference the new client-libs-dev list #1216

Closed
wants to merge 4 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Sep 7, 2021

Here is my attempt at trying to rewrite the rules for automatic labeling for the new "client" label and client-libs-dev mailing list. I took the combined contents of the previous 2d, awt, sound and swing labels, sorted the lines and then tried to manually merge as much as possible. It's possible I didn't get everything correct or at least not fully optimized.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-1150: Migrate skara tooling for client code to reference the new client-libs-dev list

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1216/head:pull/1216
$ git checkout pull/1216

Update a local copy of the PR:
$ git checkout pull/1216
$ git pull https://git.openjdk.java.net/skara pull/1216/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1216

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1216.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 7, 2021

👋 Welcome back erikj! 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.

@openjdk openjdk bot changed the title SKARA-1150 1150: Migrate skara tooling for client code to reference the new client-libs-dev list Sep 7, 2021
@openjdk openjdk bot added the rfr label Sep 7, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 7, 2021

Webrevs

@kevinrushforth
Copy link
Member

kevinrushforth commented Sep 7, 2021

@prrace should take a look at this.

It can probably be optimized further if we assume that everything under src/java.desktop, with the exception of the two directories that are part of java.beans should get the client label. This will pick up a couple directories (for accessibility) and a handful of other files that weren't included before, but I suspect that was probably an oversight.

With that assumption, I think this would be the minimal reduction:

src/java.desktop/aix
src/java.desktop/linux
src/java.desktop/macosx
src/java.desktop/share/classes/com/sun/accessibility
src/java.desktop/share/classes/com/sun/imageio
src/java.desktop/share/classes/com/sun/java
src/java.desktop/share/classes/com/sun/media
src/java.desktop/share/classes/com/sun/swing
src/java.desktop/share/classes/java/applet
src/java.desktop/share/classes/java/awt
src/java.desktop/share/classes/javax
src/java.desktop/share/classes/sun
src/java.desktop/share/conf
src/java.desktop/share/legal
src/java.desktop/share/native
src/java.desktop/unix
src/java.desktop/windows

And then you would probably add the 3 beans files that formerly had the 2d label, plus the build and test files from your PR. Let's see what Phil says.

@prrace
Copy link
Contributor

prrace commented Sep 7, 2021

And then you would probably add the 3 beans files that formerly had the 2d label, plus the build and test files from your PR. Let's see what Phil says.

Phil doesn't understand why beans is still separate.

In the JBS I wrote
"All subscribers to client mailing lists - those for the above groups and also the beans-dev list have been subscribed to the new client-libs-dev list."

So beans-dev is going away too .. so the entire java.desktop module should be mapped to client-libs-dev
It should be one trivial mapping except for a double-mapping to client and build for the build related files
that reside in the desktop module .. although I don't know that I see them there in this change ?
Actually neither before, nor after, the change. Perhaps they moved after skara built this mapping.

You may also find it useful to look at what I put here : https://openjdk.java.net/groups/client-libs/

It enumerates all the source, demo, test, make/build files I could identify that are handled by client-libs
jdk.unsupported.desktop is there but unless I'm missing something is unmapped.
You can cross-reference the tests + demos between the json and that web page too.

@erikj79
Copy link
Member Author

erikj79 commented Sep 7, 2021

Thanks for the input Phil and Kevin, I missed that beans was also included. I will simplify this further.

magicus
magicus approved these changes Sep 8, 2021
@openjdk
Copy link

openjdk bot commented Sep 8, 2021

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

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

After integration, the commit message for the final commit will be:

1150: Migrate skara tooling for client code to reference the new client-libs-dev list

Reviewed-by: ihse, kcr

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Sep 8, 2021
@erikj79
Copy link
Member Author

erikj79 commented Sep 9, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Sep 9, 2021

Going to push as commit e398e44.

@openjdk openjdk bot closed this Sep 9, 2021
@openjdk openjdk bot added integrated and removed ready labels Sep 9, 2021
@openjdk
Copy link

openjdk bot commented Sep 9, 2021

@erikj79 Pushed as commit e398e44.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@openjdk openjdk bot removed the rfr label Sep 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants