Skip to content

8338144: [8u] Remove duplicate license files #557

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

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Aug 10, 2024

This removes the duplicate copies of the three licensing files - LICENSE, ASSEMBLY_EXCEPTION and THIRD_PARTY_README - from the top of each of the old subrepositories - corba, jaxp, jaxws, langtools, jdk, hotspot and nashorn. The Images.gmk makefile under the jdk tree has to be updated to use the top-level versions rather than the jdk ones.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8338144 needs maintainer approval

Issue

  • JDK-8338144: [8u] Remove duplicate license files (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/557/head:pull/557
$ git checkout pull/557

Update a local copy of the PR:
$ git checkout pull/557
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/557/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 557

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/557.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 10, 2024

👋 Welcome back andrew! 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
Copy link

openjdk bot commented Aug 10, 2024

@gnu-andrew This change now passes all automated pre-integration checks.

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

8338144: [8u] Remove duplicate license files

Reviewed-by: phh, serb

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 5 new commits pushed to the master branch:

  • 4106121: 8281096: Flags introduced by configure script are not passed to ADLC build
  • b4fc8e7: 8337312: [8u] Windows x86 VS2010 build broken by JDK-8320097
  • 09bab6e: 8145919: sun/management/jmxremote/bootstrap/RmiSslBootstrapTest failed with Connection failed for no credentials
  • d4adbe3: 8152207: Perform array bound checks while getting a length of bytecode instructions
  • 047b08a: 8324723: GHA: Upgrade some actions to avoid deprecated Node 16

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.

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 10, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 10, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 12, 2024

⚠️ @gnu-andrew This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@gnu-andrew
Copy link
Member Author

Thanks for the review, @phohensee
/approval request This change removes duplicate license files which still remain from when 8u spanned multiple repositories. All the copies are identical and serve no purpose other than to create duplicate work when an update is needed (common for THIRD_PARTY_README when third party libraries are updated). Only the jdk copy was ever included in the final image. This change switches this to the root copy and removes the duplicates in the subtrees. It was reviewed by Paul Hohensee.

@openjdk
Copy link

openjdk bot commented Aug 14, 2024

@gnu-andrew
8338144: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Aug 14, 2024
@jerboaa
Copy link
Contributor

jerboaa commented Aug 16, 2024

/approve yes

@openjdk
Copy link

openjdk bot commented Aug 16, 2024

@jerboaa
8338144: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Aug 16, 2024
@gnu-andrew
Copy link
Member Author

Thanks @jerboaa
/integrate

@openjdk
Copy link

openjdk bot commented Aug 17, 2024

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

  • fb0a658: 8335894: [8u] Fix SupplementalJapaneseEraTest.java for jdks with symlinked conf dir
  • 4538bba: 8335851: [8u] Test JMXStartStopTest.java fails after JDK-8334415
  • 4106121: 8281096: Flags introduced by configure script are not passed to ADLC build
  • b4fc8e7: 8337312: [8u] Windows x86 VS2010 build broken by JDK-8320097
  • 09bab6e: 8145919: sun/management/jmxremote/bootstrap/RmiSslBootstrapTest failed with Connection failed for no credentials
  • d4adbe3: 8152207: Perform array bound checks while getting a length of bytecode instructions
  • 047b08a: 8324723: GHA: Upgrade some actions to avoid deprecated Node 16

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 17, 2024
@openjdk openjdk bot closed this Aug 17, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 17, 2024
@openjdk
Copy link

openjdk bot commented Aug 17, 2024

@gnu-andrew Pushed as commit ea76f37.

💡 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
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants