FYI: Merge jdk:master

J.Duke duke at openjdk.java.net
Thu May 28 15:19:17 UTC 2020


Hi all,

this is an _automatically_ generated pull request to notify you that there are 80 commits from the branch
`jdk:master`that can **not** be merged into the branch `master`:

The following file contains merge conflicts:

- make/modules/java.base/lib/CoreLibraries.gmk

All Committers in this [project](https://openjdk.java.net/census#Optional[mobile]) have access to my [personal
fork](https://github.com/openjdk-bot/mobile) and can therefore help resolve these merge conflicts (you may want to
coordinate who should do this). The following paragraphs will give an example on how to solve these merge conflicts and
push the resulting merge commit to this pull request. The below commands should be run in a local clone of your
[personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
[openjdk/mobile](https://github.com/openjdk/mobile) repository.

# Ensure target branch is up to date
$ git checkout master
$ git pull https://github.com/openjdk/mobile master

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/mobile +3:openjdk-bot-3
$ git checkout openjdk-bot-3

# Merge the target branch
$ git merge master

When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create
a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge jdk:master'


When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/mobile openjdk-bot-3:3

_Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.

Thanks,
J. Duke

-------------

Commit messages:
 - Merge jdk:master
 - 8244504: C2: refactor counted loop code in preparation for long counted loop
 - 8230827: javac gives inappropriate warning about potentially ambiguous methods
 - 8245786: Scope is wrong for ClassTree representing record
 - 8246027: Minimal fastdebug build broken after JDK-8245801
 - 8246034: Remove java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js and java.base/share/classes/jdk/internal/jrtfs/jrtls.js
 - 8243936: NonWriteable system properties are actually writeable
 - Added tag jdk-15+25 for changeset 588330449887
 - 8245062: HtmlStyle: group and document members for nav, header, summary, details
 - 8245264: Test runtime/cds/appcds/SignedJar.java fails
 - ... and 71 more: https://git.openjdk.java.net/mobile/compare/44bde0d0...c38f0064

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - master: https://webrevs.openjdk.java.net/mobile/7/webrev.00.0
 - jdk:master: https://webrevs.openjdk.java.net/mobile/7/webrev.00.1

Changes: https://git.openjdk.java.net/mobile/pull/7/files
  Stats: 132899 lines in 1290 files changed: 59801 ins; 67403 del; 5695 mod
  Patch: https://git.openjdk.java.net/mobile/pull/7.diff
  Fetch: git fetch https://git.openjdk.java.net/mobile pull/7/head:pull/7

PR: https://git.openjdk.java.net/mobile/pull/7


More information about the mobile-dev mailing list