From jvos at openjdk.java.net Wed May 13 19:04:42 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Wed, 13 May 2020 19:04:42 GMT Subject: RFR: 8244947: fix ios/android build for static libs Message-ID: Add build logic for building static-libs-image for ios and android Fix for JDK-8244947 ------------- Commit messages: - Add build logic for building static-libs-image for ios and android Changes: https://git.openjdk.java.net/mobile/pull/4/files Webrev: https://webrevs.openjdk.java.net/mobile/4/webrev.00 Issue: https://bugs.openjdk.java.net/browse/JDK-8244947 Stats: 154 lines in 17 files changed: 134 ins; 0 del; 20 mod Patch: https://git.openjdk.java.net/mobile/pull/4.diff Fetch: git fetch https://git.openjdk.java.net/mobile pull/4/head:pull/4 PR: https://git.openjdk.java.net/mobile/pull/4 From jvos at openjdk.java.net Wed May 13 19:40:01 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Wed, 13 May 2020 19:40:01 GMT Subject: [Rev 01] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: > Add build logic for building static-libs-image for ios and android > > Fix for JDK-8244947 Johan Vos has updated the pull request incrementally with one additional commit since the last revision: remove typo ------------- Changes: - all: https://git.openjdk.java.net/mobile/pull/4/files - new: https://git.openjdk.java.net/mobile/pull/4/files/305574fe..7db40aff Webrevs: - full: https://webrevs.openjdk.java.net/mobile/4/webrev.01 - incr: https://webrevs.openjdk.java.net/mobile/4/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/mobile/pull/4.diff Fetch: git fetch https://git.openjdk.java.net/mobile pull/4/head:pull/4 PR: https://git.openjdk.java.net/mobile/pull/4 From magnus.ihse.bursie at oracle.com Thu May 14 08:06:54 2020 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Thu, 14 May 2020 10:06:54 +0200 Subject: [Rev 01] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: I added some review comments on github. I hope it works out, it's actually the first time I use Skara/github in practice. /Magnus On 2020-05-13 21:40, Johan Vos wrote: >> Add build logic for building static-libs-image for ios and android >> >> Fix for JDK-8244947 > Johan Vos has updated the pull request incrementally with one additional commit since the last revision: > > remove typo > > ------------- > > Changes: > - all: https://git.openjdk.java.net/mobile/pull/4/files > - new: https://git.openjdk.java.net/mobile/pull/4/files/305574fe..7db40aff > > Webrevs: > - full: https://webrevs.openjdk.java.net/mobile/4/webrev.01 > - incr: https://webrevs.openjdk.java.net/mobile/4/webrev.00-01 > > Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod > Patch: https://git.openjdk.java.net/mobile/pull/4.diff > Fetch: git fetch https://git.openjdk.java.net/mobile pull/4/head:pull/4 > > PR: https://git.openjdk.java.net/mobile/pull/4 From ihse at openjdk.java.net Thu May 14 08:08:35 2020 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 14 May 2020 08:08:35 GMT Subject: [Rev 01] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: On Wed, 13 May 2020 19:40:01 GMT, Johan Vos wrote: >> Add build logic for building static-libs-image for ios and android >> >> Fix for JDK-8244947 > > Johan Vos has updated the pull request incrementally with one additional commit since the last revision: > > remove typo Changes requested by ihse (Reviewer). make/common/JdkNativeCompilation.gmk line 69: > 68: > 69: > 70: # Find a library. Used for declaring dependencies on libraries in different You can remove the extra line breaks that appeared here. make/common/JdkNativeCompilation.gmk line 55: > 54: endif > 55: > 56: FindSrcDirsForLib += \ This needs some work. First of all, FindSrcDirsForLib should only be added to using +=, since the variable can have a prior value from the custom (closed) file. Secondly, later down, FindSrcDirsForLib will have the "standard" directories appended, so no need to duplicate that here. Thirdly, order is important. If two files with the same name is present in the code base, only one will be selected, and the order of the directories in FindSrcDirsForLib will determine the priorites. This code basically says "first ios, then unix, then macosx" or "first android, then unix, then linux". If this order is correct, then a better way to accomplish this is to just append macosx or linux *after* the normal assignment to FindSrcDirsForLib below. ------------- PR: https://git.openjdk.java.net/mobile/pull/4 From jvos at openjdk.java.net Thu May 14 12:37:43 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Thu, 14 May 2020 12:37:43 GMT Subject: [Rev 02] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: > Add build logic for building static-libs-image for ios and android > > Fix for JDK-8244947 Johan Vos has updated the pull request incrementally with one additional commit since the last revision: add macos/linux paths after the default paths ------------- Changes: - all: https://git.openjdk.java.net/mobile/pull/4/files - new: https://git.openjdk.java.net/mobile/pull/4/files/7db40aff..af6a0a14 Webrevs: - full: https://webrevs.openjdk.java.net/mobile/4/webrev.02 - incr: https://webrevs.openjdk.java.net/mobile/4/webrev.01-02 Stats: 22 lines in 1 file changed: 6 ins; 12 del; 4 mod Patch: https://git.openjdk.java.net/mobile/pull/4.diff Fetch: git fetch https://git.openjdk.java.net/mobile pull/4/head:pull/4 PR: https://git.openjdk.java.net/mobile/pull/4 From jvos at openjdk.java.net Thu May 14 12:37:44 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Thu, 14 May 2020 12:37:44 GMT Subject: [Rev 01] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: On Thu, 14 May 2020 08:05:43 GMT, Magnus Ihse Bursie wrote: >> Johan Vos has updated the pull request incrementally with one additional commit since the last revision: >> >> remove typo > > make/common/JdkNativeCompilation.gmk line 55: > >> 54: endif >> 55: >> 56: FindSrcDirsForLib += \ > > This needs some work. First of all, FindSrcDirsForLib should only be added to using +=, since the variable can have a > prior value from the custom (closed) file. Secondly, later down, FindSrcDirsForLib will have the "standard" > directories appended, so no need to duplicate that here. Thirdly, order is important. If two files with the same name > is present in the code base, only one will be selected, and the order of the directories in FindSrcDirsForLib will > determine the priorites. This code basically says "first ios, then unix, then macosx" or "first android, then unix, > then linux". If this order is correct, then a better way to accomplish this is to just append macosx or linux *after* > the normal assignment to FindSrcDirsForLib below. Thanks for that remark, that makes sense. I updated the PR. The problem is that on ios/android, we have 3 possible paths instead of the regular 2 (OPENJDK_TARGET_OS and OPENJDK_TARGET_OS_TYPE) But your suggestion makes it much better to add the third path. ------------- PR: https://git.openjdk.java.net/mobile/pull/4 From ihse at openjdk.java.net Thu May 14 13:01:54 2020 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 14 May 2020 13:01:54 GMT Subject: [Rev 02] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: On Thu, 14 May 2020 12:37:43 GMT, Johan Vos wrote: >> Add build logic for building static-libs-image for ios and android >> >> Fix for JDK-8244947 > > Johan Vos has updated the pull request incrementally with one additional commit since the last revision: > > add macos/linux paths after the default paths Looks good. It's just the extra blank lines left. :) ------------- PR: https://git.openjdk.java.net/mobile/pull/4 From jvos at openjdk.java.net Thu May 14 13:12:07 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Thu, 14 May 2020 13:12:07 GMT Subject: [Rev 03] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: > Add build logic for building static-libs-image for ios and android > > Fix for JDK-8244947 Johan Vos has updated the pull request incrementally with one additional commit since the last revision: remove line breaks ------------- Changes: - all: https://git.openjdk.java.net/mobile/pull/4/files - new: https://git.openjdk.java.net/mobile/pull/4/files/af6a0a14..0bcb9598 Webrevs: - full: https://webrevs.openjdk.java.net/mobile/4/webrev.03 - incr: https://webrevs.openjdk.java.net/mobile/4/webrev.02-03 Stats: 2 lines in 1 file changed: 0 ins; 2 del; 0 mod Patch: https://git.openjdk.java.net/mobile/pull/4.diff Fetch: git fetch https://git.openjdk.java.net/mobile pull/4/head:pull/4 PR: https://git.openjdk.java.net/mobile/pull/4 From jvos at openjdk.java.net Thu May 14 13:12:08 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Thu, 14 May 2020 13:12:08 GMT Subject: [Rev 01] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: On Thu, 14 May 2020 07:53:03 GMT, Magnus Ihse Bursie wrote: >> Johan Vos has updated the pull request incrementally with one additional commit since the last revision: >> >> remove typo > > make/common/JdkNativeCompilation.gmk line 69: > >> 68: >> 69: >> 70: # Find a library. Used for declaring dependencies on libraries in different > > You can remove the extra line breaks that appeared here. done ------------- PR: https://git.openjdk.java.net/mobile/pull/4 From bobv at openjdk.java.net Thu May 14 19:39:32 2020 From: bobv at openjdk.java.net (Bob Vandette) Date: Thu, 14 May 2020 19:39:32 GMT Subject: [Rev 03] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: <6mi0PdYWE4nAwL7fEqoWPNCg0CEB8NpDYXW4uUF3Xt8=.5207090b-5994-4ec0-84d3-109944a2ce74@github.com> On Thu, 14 May 2020 13:12:07 GMT, Johan Vos wrote: >> Add build logic for building static-libs-image for ios and android >> >> Fix for JDK-8244947 > > Johan Vos has updated the pull request incrementally with one additional commit since the last revision: > > remove line breaks These changes look very familiar! ------------- Marked as reviewed by bobv (Committer). PR: https://git.openjdk.java.net/mobile/pull/4 From rwestberg at openjdk.java.net Fri May 15 13:03:07 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 15 May 2020 13:03:07 GMT Subject: FYI: 8245112: fix jcheck conf for Mobile project In-Reply-To: <1jegy6hLFJf7mSjG9P1PK-KMnW48LfRI7DxQkqduMlQ=.d33eb8cd-fd27-4774-8d5d-d0f9da4fd7dd@github.com> References: <1jegy6hLFJf7mSjG9P1PK-KMnW48LfRI7DxQkqduMlQ=.d33eb8cd-fd27-4774-8d5d-d0f9da4fd7dd@github.com> Message-ID: On Fri, 15 May 2020 12:54:18 GMT, Johan Vos wrote: > Update jcheck/conf file > These changes are needed to reflect project name and settings, Looks good! ------------- Marked as reviewed by rwestberg (no project role). PR: https://git.openjdk.java.net/mobile/pull/5 From jvos at openjdk.java.net Fri May 15 13:03:07 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Fri, 15 May 2020 13:03:07 GMT Subject: FYI: 8245112: fix jcheck conf for Mobile project Message-ID: <1jegy6hLFJf7mSjG9P1PK-KMnW48LfRI7DxQkqduMlQ=.d33eb8cd-fd27-4774-8d5d-d0f9da4fd7dd@github.com> Update jcheck/conf file These changes are needed to reflect project name and settings, ------------- Commit messages: - update jcheck/conf file to reflect project name and settings Changes: https://git.openjdk.java.net/mobile/pull/5/files Webrev: https://webrevs.openjdk.java.net/mobile/5/webrev.00 Issue: https://bugs.openjdk.java.net/browse/JDK-8245112 Stats: 39 lines in 1 file changed: 37 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/mobile/pull/5.diff Fetch: git fetch https://git.openjdk.java.net/mobile pull/5/head:pull/5 PR: https://git.openjdk.java.net/mobile/pull/5 From jvos at openjdk.java.net Fri May 15 13:03:07 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Fri, 15 May 2020 13:03:07 GMT Subject: [Integrated] FYI: 8245112: fix jcheck conf for Mobile project In-Reply-To: <1jegy6hLFJf7mSjG9P1PK-KMnW48LfRI7DxQkqduMlQ=.d33eb8cd-fd27-4774-8d5d-d0f9da4fd7dd@github.com> References: <1jegy6hLFJf7mSjG9P1PK-KMnW48LfRI7DxQkqduMlQ=.d33eb8cd-fd27-4774-8d5d-d0f9da4fd7dd@github.com> Message-ID: On Fri, 15 May 2020 12:54:18 GMT, Johan Vos wrote: > Update jcheck/conf file > These changes are needed to reflect project name and settings, This pull request has now been integrated. Changeset: 46d2cad7 Author: Johan Vos Committer: Robin Westberg URL: https://git.openjdk.java.net/mobile/commit/46d2cad7 Stats: 39 lines in 1 file changed: 0 ins; 37 del; 2 mod 8245112: fix jcheck conf for Mobile project Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/mobile/pull/5 From jvos at openjdk.java.net Fri May 15 13:04:22 2020 From: jvos at openjdk.java.net (Johan Vos) Date: Fri, 15 May 2020 13:04:22 GMT Subject: [Integrated] RFR: 8244947: fix ios/android build for static libs In-Reply-To: References: Message-ID: <3Wp9_Pi4_YuOyP-qy9Ci7Ln63w3bnkojktI0Nkd0quQ=.b19bc979-fc23-4788-91fa-f13815dcf616@github.com> On Wed, 13 May 2020 18:51:04 GMT, Johan Vos wrote: > Add build logic for building static-libs-image for ios and android > > Fix for JDK-8244947 This pull request has now been integrated. Changeset: 308cad4a Author: Johan Vos URL: https://git.openjdk.java.net/mobile/commit/308cad4a Stats: 145 lines in 17 files changed: 0 ins; 126 del; 19 mod 8244947: fix ios/android build for static libs Reviewed-by: bobv ------------- PR: https://git.openjdk.java.net/mobile/pull/4 From johan.vos at gluonhq.com Fri May 15 14:30:45 2020 From: johan.vos at gluonhq.com (Johan Vos) Date: Fri, 15 May 2020 16:30:45 +0200 Subject: First PR integrated in openjdk/mobile Message-ID: Hi, It took a while to get everything ready, but we now have the OpenJDK Mobile repository at https://github.com/openjdk/mobile capable of creating java static libraries for iOS and Android. https://github.com/openjdk/mobile is auto-synced from openjdk/jdk and thus contains all the code that is in the JDK. Today, I merged a PR that enables building the static java libs: https://github.com/openjdk/mobile/pull/4 The next goal is to upstream this PR to openjdk/jdk, but that is a different story. I will update the wiki page with instructions, but configuring and building is relative straightforward. The JDK build now allows to run make static-libs-image which creates static JDK libraries (hence no JVM). With the merged PR, you can build static libraries for iOS and Android. These can be used at runtime on those devices. Going from the java static libraries to apps for mobile requires of course additional steps. Those steps are not in scope of the OpenJDK Mobile project, but to give an example: we (Gluon) do this by linking code generated with GraalVM native-image with the Java static libraries. We do this in Gluon Substrate, which is open-source at https://github.com/gluonhq/substrate and samples are given at https://github.com/gluonhq/client-samples Note that we include the JavaFX static libraries in those samples, so that we have an end-to-end OpenJDK based stack for mobile (including cross-platform UI). The JavaFX static libraries are built using 100% the code from OpenJFX. The merged PR is remarkably small, and is mainly based on code from Bob Vandette who did this work for the Java 9 project. Thanks to the auto-sync from upstream jdk (done by the Skara bot), we now have the latest JDK code working for mobile. Pretty cool. I'd like to thank the Skara team for their innovative work, and the OpenJDK team at Oracle who helped in achieving this milestone. Now we can really move things forward. - Johan From bob.vandette at oracle.com Fri May 15 14:41:29 2020 From: bob.vandette at oracle.com (Bob Vandette) Date: Fri, 15 May 2020 10:41:29 -0400 Subject: First PR integrated in openjdk/mobile In-Reply-To: References: Message-ID: Congratulations Johan, this is a great accomplishment! Bob. > On May 15, 2020, at 10:30 AM, Johan Vos wrote: > > Hi, > > It took a while to get everything ready, but we now have the OpenJDK Mobile > repository at https://github.com/openjdk/mobile capable of creating java > static libraries for iOS and Android. > > https://github.com/openjdk/mobile is auto-synced from openjdk/jdk and thus > contains all the code that is in the JDK. > Today, I merged a PR that enables building the static java libs: > https://github.com/openjdk/mobile/pull/4 > > The next goal is to upstream this PR to openjdk/jdk, but that is a > different story. > > I will update the wiki page with instructions, but configuring and building > is relative straightforward. The JDK build now allows to run > > make static-libs-image > > which creates static JDK libraries (hence no JVM). With the merged PR, you > can build static libraries for iOS and Android. These can be used at > runtime on those devices. > > Going from the java static libraries to apps for mobile requires of course > additional steps. Those steps are not in scope of the OpenJDK Mobile > project, but to give an example: we (Gluon) do this by linking code > generated with GraalVM native-image with the Java static libraries. We do > this in Gluon Substrate, which is open-source at > https://github.com/gluonhq/substrate and samples are given at > https://github.com/gluonhq/client-samples > > Note that we include the JavaFX static libraries in those samples, so that > we have an end-to-end OpenJDK based stack for mobile (including > cross-platform UI). The JavaFX static libraries are built using 100% the > code from OpenJFX. > > The merged PR is remarkably small, and is mainly based on code from Bob > Vandette who did this work for the Java 9 project. > Thanks to the auto-sync from upstream jdk (done by the Skara bot), we now > have the latest JDK code working for mobile. Pretty cool. > > I'd like to thank the Skara team for their innovative work, and the OpenJDK > team at Oracle who helped in achieving this milestone. > > Now we can really move things forward. > > - Johan From duke at openjdk.java.net Thu May 21 05:45:52 2020 From: duke at openjdk.java.net (J.Duke) Date: Thu, 21 May 2020 05:45:52 GMT Subject: RFR: Merge jdk:master Message-ID: Hi all, this is an _automatically_ generated pull request to notify you that there are 17 commits from the branch `jdk:master`that can **not** be merged into the branch `master`: The following files contains merge conflicts: - make/autoconf/platform.m4 - make/modules/jdk.net/Lib.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 +2:openjdk-bot-2 $ git checkout openjdk-bot-2 # 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-2:2 _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 - 8245518: Problem list java/net/SocketOption/AfterClose.java - 8238592: JFR: Crash when dumping paths to gc roots on deep heaps - Added tag jdk-15+24 for changeset 497fd9f9129c - Merge - 8244224: Implementation of JEP 381: Remove the Solaris and SPARC Ports - 8235921: jdk/jfr/event/oldobject/TestLargeRootSet.java times out with debug bits - Merge - 8233553: [TESTBUG] JSpinner test bug4973721.java fails on MacOS - 6949753: [TEST BUG]: java/awt/print/PageFormat/PDialogTest.java needs update by removing a infinite loop - ... and 7 more: https://git.openjdk.java.net/mobile/compare/822ec45b...270674ce The webrev contains the conflicts with master: - merge conflicts: https://webrevs.openjdk.java.net/mobile/6/webrev.00.conflicts Changes: https://git.openjdk.java.net/mobile/pull/6/files Stats: 128991 lines in 988 files changed: 806 ins; 127003 del; 1182 mod Patch: https://git.openjdk.java.net/mobile/pull/6.diff Fetch: git fetch https://git.openjdk.java.net/mobile pull/6/head:pull/6 PR: https://git.openjdk.java.net/mobile/pull/6 From duke at openjdk.java.net Thu May 28 14:55:19 2020 From: duke at openjdk.java.net (J.Duke) Date: Thu, 28 May 2020 14:55:19 GMT Subject: [Rev 01] RFR: Merge jdk:master In-Reply-To: References: Message-ID: > Hi all, > > this is an _automatically_ generated pull request to notify you that there are 17 commits from the branch > `jdk:master`that can **not** be merged into the branch `master`: > The following files contains merge conflicts: > > - make/autoconf/platform.m4 > - make/modules/jdk.net/Lib.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 +2:openjdk-bot-2 > $ git checkout openjdk-bot-2 > > # 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-2:2 > > _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 J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 18 commits: - Merge jdk:master - Merge - 8245518: Problem list java/net/SocketOption/AfterClose.java Reviewed-by: dholmes - 8238592: JFR: Crash when dumping paths to gc roots on deep heaps Reviewed-by: mgronlun - Added tag jdk-15+24 for changeset 497fd9f9129c - Merge - 8244224: Implementation of JEP 381: Remove the Solaris and SPARC Ports Reviewed-by: alanb, bchristi, dcubed, dfuchs, eosterlund, erikj, glaubitz, ihse, iignatyev, jjiang, kbarrett, ksrini, kvn, naoto, prr, rriggs, serb, sspitsyn, stefank, tschatzl, valeriep, weijun, weijun - 8235921: jdk/jfr/event/oldobject/TestLargeRootSet.java times out with debug bits Reviewed-by: mgronlun - Merge - 8233553: [TESTBUG] JSpinner test bug4973721.java fails on MacOS Reviewed-by: psadhukhan - ... and 8 more: https://git.openjdk.java.net/mobile/compare/f0dc5cb9...13718c7b /integrate ------------- Changes: https://git.openjdk.java.net/mobile/pull/6/files Webrev: https://webrevs.openjdk.java.net/mobile/6/webrev.01 Stats: 128991 lines in 988 files changed: 806 ins; 127003 del; 1182 mod Patch: https://git.openjdk.java.net/mobile/pull/6.diff Fetch: git fetch https://git.openjdk.java.net/mobile pull/6/head:pull/6 PR: https://git.openjdk.java.net/mobile/pull/6 From duke at openjdk.java.net Thu May 28 14:57:38 2020 From: duke at openjdk.java.net (J.Duke) Date: Thu, 28 May 2020 14:57:38 GMT Subject: [Integrated] RFR: Merge jdk:master In-Reply-To: References: Message-ID: On Thu, 21 May 2020 05:37:05 GMT, J. Duke wrote: > Hi all, > > this is an _automatically_ generated pull request to notify you that there are 17 commits from the branch > `jdk:master`that can **not** be merged into the branch `master`: > The following files contains merge conflicts: > > - make/autoconf/platform.m4 > - make/modules/jdk.net/Lib.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 +2:openjdk-bot-2 > $ git checkout openjdk-bot-2 > > # 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-2:2 > > _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 This pull request has now been integrated. Changeset: 44bde0d0 Author: J. Duke Committer: Johan Vos URL: https://git.openjdk.java.net/mobile/commit/44bde0d0 Stats: 128931 lines in 988 files changed: 126943 ins; 814 del; 1174 mod Merge jdk:master ------------- PR: https://git.openjdk.java.net/mobile/pull/6 From duke at openjdk.java.net Thu May 28 15:19:19 2020 From: duke at openjdk.java.net (J.Duke) Date: Thu, 28 May 2020 15:19:19 GMT Subject: FYI: Merge jdk:master In-Reply-To: <4YKM7VnkUziJJvDgJRO1NVZLt8aLwCu1YRJB4vBOBIc=.2c4ade20-5095-43de-a218-95ba547688e8@github.com> References: <4YKM7VnkUziJJvDgJRO1NVZLt8aLwCu1YRJB4vBOBIc=.2c4ade20-5095-43de-a218-95ba547688e8@github.com> Message-ID: On Thu, 28 May 2020 14:54:32 GMT, J. Duke wrote: > 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 /integrate This pull request has now been integrated. Changeset: ad3bbbbd Author: J. Duke Committer: Johan Vos URL: https://git.openjdk.java.net/mobile/commit/ad3bbbbd Stats: 132881 lines in 1290 files changed: 67385 ins; 59783 del; 5713 mod Merge jdk:master ------------- PR: https://git.openjdk.java.net/mobile/pull/7 From duke at openjdk.java.net Thu May 28 15:19:17 2020 From: duke at openjdk.java.net (J.Duke) Date: Thu, 28 May 2020 15:19:17 GMT Subject: FYI: Merge jdk:master Message-ID: <4YKM7VnkUziJJvDgJRO1NVZLt8aLwCu1YRJB4vBOBIc=.2c4ade20-5095-43de-a218-95ba547688e8@github.com> 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