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

8317126: Redundant entries in Windows tzmappings file #15968

Closed

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented Sep 28, 2023

Removing redundant entries in lib/tzmappings file on Windows. The file maps Windows time zones to Java time zones according to the region. Since 001 means world, no region-specific entries are needed if those time zones are the same. The diff of the generated tzmappings files, before and after the fix, is attached.
tzmappings.diff.txt


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

Issue

  • JDK-8317126: Redundant entries in Windows tzmappings file (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15968

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15968.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 28, 2023

👋 Welcome back naoto! 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 added the rfr Pull request is ready for review label Sep 28, 2023
@naotoj
Copy link
Member Author

naotoj commented Sep 28, 2023

/label add core-libs,i18n

@openjdk openjdk bot added core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@naotoj
The core-libs label was successfully added.

The i18n label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Sep 28, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

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

8317126: Redundant entries in Windows `tzmappings` file

Reviewed-by: lancea, iris, joehw

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

  • cfcbfc6: 8316879: RegionMatches1Tests fails if CompactStrings are disabled after JDK-8302163
  • ca5eee2: 8316445: Mark com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java as vm.flagless
  • 060db1b: 8315031: YoungPLABSize and OldPLABSize not aligned by ObjectAlignmentInBytes
  • 3481a48: 8316974: ListFormat creation is unsuccessful for some of the supported Locales
  • 29348b3: 8316894: make test TEST="jtreg:test/jdk/..." fails on AIX
  • 3f19df6: 8315936: Parallelize gc/stress/TestStressG1Humongous.java test
  • fc98998: 8316580: HttpClient with StructuredTaskScope does not close when a task fails
  • 065203d: 8313631: SA: stack trace printed using "where" command does not show class name
  • 0c55887: 8309599: WeakHandle and OopHandle release should clear obj pointer
  • 1230aed: 8316885: jcmd: Compiler.CodeHeap_Analytics cmd does not inform about missing aggregate
  • ... and 31 more: https://git.openjdk.org/jdk/compare/36ac83904c9e81a01822b0e36ef677cae2808709...master

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 ready Pull request is ready to be integrated label Sep 28, 2023
@naotoj
Copy link
Member Author

naotoj commented Sep 29, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Sep 29, 2023

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

  • fa0697a: 8316998: Remove redundant type arguments in the java.util.stream package
  • 49376e4: 8316000: File.setExecutable silently fails if file does not exist
  • a185be0: 8317139: [JVMCI] oop handles clearing message pollutes event log
  • 179792b: 8317283: jpackage tests run osx-specific checks on windows and linux
  • bd918f4: 8316401: sun/tools/jhsdb/JStackStressTest.java failed with "InternalError: We should have found a thread that owns the anonymous lock"
  • c45308a: 8301327: convert assert to guarantee in Handle_IDiv_Exception
  • bd7bb67: 8317257: RISC-V: llvm build broken
  • 0259da9: 8301686: TLS 1.3 handshake fails if server_name doesn't match resuming session
  • 355811a: 8316559: Refactor some util/Calendar tests to JUnit
  • ecb5e8a: 8317264: Pattern.Bound has static fields that should be static final.
  • ... and 44 more: https://git.openjdk.org/jdk/compare/36ac83904c9e81a01822b0e36ef677cae2808709...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 29, 2023

@naotoj Pushed as commit 014c95a.

💡 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
core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated
4 participants