From magnus.ihse.bursie at oracle.com Thu Apr 1 08:18:11 2021 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Thu, 1 Apr 2021 10:18:11 +0200 Subject: Announcement: Skara update to support CVS and SourceForge Message-ID: <6acde917-7014-5ed7-222d-391cd0cd4ba9@oracle.com> The Skara team is proud to present the latest additions to the Skara tooling, support for the CVS revision system and the SourceForge code repository and developer hub. This recently added support to the Skara tooling will allow us to aggressively push a conversion away from the johnny-come-lately "git" version system, to the trusty and well-understood CVS. Abandoning this dependency of git will consequently allow us to leave the controversial GitHub provider, and instead relying on SourceForge, the developer central with the longest and richest history in source collaboration on Internet. Starting today, all OpenJDK project repos will be available at their new home on SourceForge[1]. The initiative presented today will allow us to shut down the OpenJDK presence on GitHub completely a year after this, on April 1, 2022. About CVS CVS is a revolutionary revision control system, which allow concurrent usage from multiple, independent developers. The ability to host CVS on a remote server has made it extremely popular for development projects which has run into scalability issues with local RCS, or RCS over NFS. CVS also introduces the concept of a "branch", which allows for a single repository to contain multiple, independent versions of a software product to be developed, in parallel. About SourceForge SourceForge is the leading center of software development on Internet. It has jump-started from obscurity to being "the place to be" for all open source developers. With it's modern suite of collaboration tools, including online accessible SVN repositories, per-project mailing lists, and an option to use the new secure "https" protocol, it offers world-class support to make any open source project a success. /Magnus [1] http://sourceforge.net/projects/ohnojdk/ From john.r.rose at oracle.com Thu Apr 1 09:23:05 2021 From: john.r.rose at oracle.com (John Rose) Date: Thu, 1 Apr 2021 09:23:05 +0000 Subject: Announcement: Skara update to support CVS and SourceForge In-Reply-To: <1700577606.228646.1617267302978.JavaMail.zimbra@u-pem.fr> References: <6acde917-7014-5ed7-222d-391cd0cd4ba9@oracle.com> <1700577606.228646.1617267302978.JavaMail.zimbra@u-pem.fr> Message-ID: On Apr 1, 2021, at 1:55 AM, Remi Forax wrote: > > Hi Magnus, > at last ! > We can now say that the OpenJDK is pulling forward. > > Is there a SCCS addon somewhere, because it will be hard for me to migrate otherwise ? > > R?mi No, Remi, there is no SCCS view, because RCS is superior. RCS uses backward deltas, as any reasonable versioning scheme must, because deriving the current version of a file must be faster than deriving a historic version. SCCS is wrong-headedly out of step with history, because it uses forward deltas, and thus requires the CPU-wasting recapitulation of the entire history of a file in order to materialize its most recent version. Thus, SCCS is almost as dumb as a loser-system which which would store bit-images of *every* version of a file, and then (magically, as if it were possible) would retrieve those bit images on demand by some sort of magic name. Hah, as if one could build some sort of interplanetary file system (they?d call it ?IPFS?, the losers) that just shared files by *wishing* for them! ? John P.S. I once wrote an SCCS ingester in Java, when HotSpot was stored in SCCS. I lost it. True facts, those. From rwestberg at openjdk.java.net Tue Apr 6 08:39:30 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 6 Apr 2021 08:39:30 GMT Subject: RFR: 715: Generated email wrongly includes previous unrelated comments Message-ID: When selecting a parent for a new comment, use the last revision email as parent if no quote / mention is found, as just using the latest one can be confusing if that's not really the intended context. ------------- Commit messages: - Use last revision email as parent if no quote / mention is found Changes: https://git.openjdk.java.net/skara/pull/1108/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1108&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-715 Stats: 31 lines in 2 files changed: 12 ins; 8 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/1108.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1108/head:pull/1108 PR: https://git.openjdk.java.net/skara/pull/1108 From rwestberg at openjdk.java.net Tue Apr 6 15:15:29 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 6 Apr 2021 15:15:29 GMT Subject: RFR: 715: Generated email wrongly includes previous unrelated comments [v2] In-Reply-To: References: Message-ID: > When selecting a parent for a new comment, use the last revision email as parent if no quote / mention is found, as just using the latest one can be confusing if that's not really the intended context. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix failing test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1108/files - new: https://git.openjdk.java.net/skara/pull/1108/files/d6e88b67..2abc2747 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1108&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1108&range=00-01 Stats: 19 lines in 1 file changed: 10 ins; 0 del; 9 mod Patch: https://git.openjdk.java.net/skara/pull/1108.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1108/head:pull/1108 PR: https://git.openjdk.java.net/skara/pull/1108 From erikj at openjdk.java.net Tue Apr 6 22:50:52 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 6 Apr 2021 22:50:52 GMT Subject: RFR: 715: Generated email wrongly includes previous unrelated comments [v2] In-Reply-To: References: Message-ID: <8jn-2uIQS4WY4dXYOJfBBHLLdG9zk9npe8sZidKGZS4=.6155bb9b-1deb-48b4-8135-cf9b9c2c520c@github.com> On Tue, 6 Apr 2021 15:15:29 GMT, Robin Westberg wrote: >> When selecting a parent for a new comment, use the last revision email as parent if no quote / mention is found, as just using the latest one can be confusing if that's not really the intended context. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix failing test Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1108 From rwestberg at openjdk.java.net Thu Apr 8 09:44:55 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 8 Apr 2021 09:44:55 GMT Subject: RFR: 958: Add test cases for known corner cases for synclabel bot Message-ID: <7iO1vCbwUPhZe_NP2M4R3uWoIuJygQOuuQTZikeNaOA=.62c22c83-d20a-4f98-848b-6b3846bf621f@github.com> Add special exclude list, proper BPR detection for 9+, and tests. ------------- Commit messages: - Add special exclude list, proper BPR detection for 9+, and tests Changes: https://git.openjdk.java.net/skara/pull/1109/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1109&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-958 Stats: 306 lines in 2 files changed: 301 ins; 1 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1109.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1109/head:pull/1109 PR: https://git.openjdk.java.net/skara/pull/1109 From rwestberg at openjdk.java.net Thu Apr 8 10:05:43 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 8 Apr 2021 10:05:43 GMT Subject: Integrated: 715: Generated email wrongly includes previous unrelated comments In-Reply-To: References: Message-ID: On Tue, 6 Apr 2021 08:36:18 GMT, Robin Westberg wrote: > When selecting a parent for a new comment, use the last revision email as parent if no quote / mention is found, as just using the latest one can be confusing if that's not really the intended context. This pull request has now been integrated. Changeset: 4ca65deb Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/4ca65deb Stats: 50 lines in 3 files changed: 22 ins; 8 del; 20 mod 715: Generated email wrongly includes previous unrelated comments Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1108 From erikj at openjdk.java.net Thu Apr 8 12:47:54 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 8 Apr 2021 12:47:54 GMT Subject: RFR: 958: Add test cases for known corner cases for synclabel bot In-Reply-To: <7iO1vCbwUPhZe_NP2M4R3uWoIuJygQOuuQTZikeNaOA=.62c22c83-d20a-4f98-848b-6b3846bf621f@github.com> References: <7iO1vCbwUPhZe_NP2M4R3uWoIuJygQOuuQTZikeNaOA=.62c22c83-d20a-4f98-848b-6b3846bf621f@github.com> Message-ID: On Thu, 8 Apr 2021 09:41:28 GMT, Robin Westberg wrote: > Add special exclude list, proper BPR detection for 9+, and tests. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1109 From rwestberg at openjdk.java.net Thu Apr 8 12:57:33 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 8 Apr 2021 12:57:33 GMT Subject: RFR: 958: Add test cases for known corner cases for synclabel bot [v2] In-Reply-To: <7iO1vCbwUPhZe_NP2M4R3uWoIuJygQOuuQTZikeNaOA=.62c22c83-d20a-4f98-848b-6b3846bf621f@github.com> References: <7iO1vCbwUPhZe_NP2M4R3uWoIuJygQOuuQTZikeNaOA=.62c22c83-d20a-4f98-848b-6b3846bf621f@github.com> Message-ID: > Add special exclude list, proper BPR detection for 9+, and tests. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Adjust config tests to not use known ignored version 8u4x ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1109/files - new: https://git.openjdk.java.net/skara/pull/1109/files/77302fa8..71cc0fab Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1109&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1109&range=00-01 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1109.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1109/head:pull/1109 PR: https://git.openjdk.java.net/skara/pull/1109 From rwestberg at openjdk.java.net Thu Apr 8 13:11:17 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 8 Apr 2021 13:11:17 GMT Subject: Integrated: 958: Add test cases for known corner cases for synclabel bot In-Reply-To: <7iO1vCbwUPhZe_NP2M4R3uWoIuJygQOuuQTZikeNaOA=.62c22c83-d20a-4f98-848b-6b3846bf621f@github.com> References: <7iO1vCbwUPhZe_NP2M4R3uWoIuJygQOuuQTZikeNaOA=.62c22c83-d20a-4f98-848b-6b3846bf621f@github.com> Message-ID: On Thu, 8 Apr 2021 09:41:28 GMT, Robin Westberg wrote: > Add special exclude list, proper BPR detection for 9+, and tests. This pull request has now been integrated. Changeset: f12ee73c Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/f12ee73c Stats: 309 lines in 3 files changed: 301 ins; 1 del; 7 mod 958: Add test cases for known corner cases for synclabel bot Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1109 From erikj at openjdk.java.net Thu Apr 8 20:47:37 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 8 Apr 2021 20:47:37 GMT Subject: RFR: Backport security level should be inherited from main issue Message-ID: This is a change Robin prepared, but we need to deploy it ASAP to match the new behavior in the backport plugin after the Jira upgrade. The security level of a backport should simply be based on the security level of the primary bug. ------------- Commit messages: - Backport security level should be inherited from main issue Changes: https://git.openjdk.java.net/skara/pull/1110/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1110&range=00 Stats: 25 lines in 5 files changed: 7 ins; 12 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1110.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1110/head:pull/1110 PR: https://git.openjdk.java.net/skara/pull/1110 From kcr at openjdk.java.net Thu Apr 8 21:00:41 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Thu, 8 Apr 2021 21:00:41 GMT Subject: RFR: Backport security level should be inherited from main issue In-Reply-To: References: Message-ID: On Thu, 8 Apr 2021 20:30:39 GMT, Erik Joelsson wrote: > This is a change Robin prepared, but we need to deploy it ASAP to match the new behavior in the backport plugin after the Jira upgrade. The security level of a backport should simply be based on the security level of the primary bug. Looks good to me (although I am not a Skara project Reviewer). bots/notify/src/test/java/org/openjdk/skara/bots/notify/issue/IssueNotifierTests.java line 1069: > 1067: if (level != null) { > 1068: assertEquals(level.asString(), backport.properties().get("security").asString()); > 1069: } Maybe also worth also checking that if level is null, the returned property is empty? This could be done as a follow-up given the need to get this in right away. ------------- Marked as reviewed by kcr (no project role). PR: https://git.openjdk.java.net/skara/pull/1110 From darcy at openjdk.java.net Thu Apr 8 21:00:41 2021 From: darcy at openjdk.java.net (Joe Darcy) Date: Thu, 8 Apr 2021 21:00:41 GMT Subject: RFR: Backport security level should be inherited from main issue In-Reply-To: References: Message-ID: On Thu, 8 Apr 2021 20:30:39 GMT, Erik Joelsson wrote: > This is a change Robin prepared, but we need to deploy it ASAP to match the new behavior in the backport plugin after the Jira upgrade. The security level of a backport should simply be based on the security level of the primary bug. Marked as reviewed by darcy (Lead). ------------- PR: https://git.openjdk.java.net/skara/pull/1110 From erikj at openjdk.java.net Thu Apr 8 21:00:41 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 8 Apr 2021 21:00:41 GMT Subject: RFR: Backport security level should be inherited from main issue In-Reply-To: References: Message-ID: <3UunvLN4ahEGlKWjUVMCb_v7RconZEf0hDlHtt02LYY=.2c03ddf9-c250-42d1-a06e-b59b0c81b048@github.com> On Thu, 8 Apr 2021 20:53:54 GMT, Kevin Rushforth wrote: >> This is a change Robin prepared, but we need to deploy it ASAP to match the new behavior in the backport plugin after the Jira upgrade. The security level of a backport should simply be based on the security level of the primary bug. > > Looks good to me (although I am not a Skara project Reviewer). The tests failed because they were run while JBS was down. There are apparently tests needing to touch JBS in there. I have rerun locally after JBS came up and it's all green. ------------- PR: https://git.openjdk.java.net/skara/pull/1110 From erikj at openjdk.java.net Thu Apr 8 21:00:42 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 8 Apr 2021 21:00:42 GMT Subject: Integrated: Backport security level should be inherited from main issue In-Reply-To: References: Message-ID: On Thu, 8 Apr 2021 20:30:39 GMT, Erik Joelsson wrote: > This is a change Robin prepared, but we need to deploy it ASAP to match the new behavior in the backport plugin after the Jira upgrade. The security level of a backport should simply be based on the security level of the primary bug. This pull request has now been integrated. Changeset: 35dd1da1 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/35dd1da1 Stats: 25 lines in 5 files changed: 7 ins; 12 del; 6 mod Backport security level should be inherited from main issue Reviewed-by: kcr, darcy ------------- PR: https://git.openjdk.java.net/skara/pull/1110 From rwestberg at openjdk.java.net Fri Apr 9 15:06:25 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 9 Apr 2021 15:06:25 GMT Subject: RFR: 769: Replies to e-mail comments on GitHub are threaded incorrectly Message-ID: If a comment is done in reply to a bridged email, setup reply-to headers correctly pointing to the source of the bridged comment. ------------- Commit messages: - Initial implementation Changes: https://git.openjdk.java.net/skara/pull/1111/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1111&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-769 Stats: 251 lines in 7 files changed: 210 ins; 29 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1111.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1111/head:pull/1111 PR: https://git.openjdk.java.net/skara/pull/1111 From rwestberg at openjdk.java.net Fri Apr 9 15:34:03 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 9 Apr 2021 15:34:03 GMT Subject: RFR: 905: Github UI code markdown can fail to get copied correctly into email Message-ID: When filtering out certain markdown for sending plain-text emails, only remove multiline code formatting block markers and retain inline ones. ------------- Commit messages: - Only remove multi-line code markers Changes: https://git.openjdk.java.net/skara/pull/1112/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1112&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-905 Stats: 10 lines in 2 files changed: 8 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1112.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1112/head:pull/1112 PR: https://git.openjdk.java.net/skara/pull/1112 From erikj at openjdk.java.net Fri Apr 9 22:11:39 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 9 Apr 2021 22:11:39 GMT Subject: RFR: 769: Replies to e-mail comments on GitHub are threaded incorrectly In-Reply-To: References: Message-ID: On Fri, 9 Apr 2021 15:03:04 GMT, Robin Westberg wrote: > If a comment is done in reply to a bridged email, setup reply-to headers correctly pointing to the source of the bridged comment. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1111 From erikj at openjdk.java.net Fri Apr 9 22:13:07 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 9 Apr 2021 22:13:07 GMT Subject: RFR: 905: Github UI code markdown can fail to get copied correctly into email In-Reply-To: References: Message-ID: On Fri, 9 Apr 2021 15:30:42 GMT, Robin Westberg wrote: > When filtering out certain markdown for sending plain-text emails, only remove multiline code formatting block markers and retain inline ones. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1112 From rwestberg at openjdk.java.net Mon Apr 12 07:54:03 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 12 Apr 2021 07:54:03 GMT Subject: Integrated: 905: Github UI code markdown can fail to get copied correctly into email In-Reply-To: References: Message-ID: On Fri, 9 Apr 2021 15:30:42 GMT, Robin Westberg wrote: > When filtering out certain markdown for sending plain-text emails, only remove multiline code formatting block markers and retain inline ones. This pull request has now been integrated. Changeset: 1137b55a Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/1137b55a Stats: 10 lines in 2 files changed: 8 ins; 0 del; 2 mod 905: Github UI code markdown can fail to get copied correctly into email Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1112 From rwestberg at openjdk.java.net Mon Apr 12 07:54:05 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 12 Apr 2021 07:54:05 GMT Subject: Integrated: 769: Replies to e-mail comments on GitHub are threaded incorrectly In-Reply-To: References: Message-ID: On Fri, 9 Apr 2021 15:03:04 GMT, Robin Westberg wrote: > If a comment is done in reply to a bridged email, setup reply-to headers correctly pointing to the source of the bridged comment. This pull request has now been integrated. Changeset: d9b551d4 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/d9b551d4 Stats: 251 lines in 7 files changed: 210 ins; 29 del; 12 mod 769: Replies to e-mail comments on GitHub are threaded incorrectly Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1111 From ehelin at openjdk.java.net Mon Apr 12 08:27:29 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 12 Apr 2021 08:27:29 GMT Subject: Integrated: pr: only create backport branch once In-Reply-To: References: Message-ID: On Wed, 31 Mar 2021 13:57:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that the `/backport` commit command will only create the backport commit (and corresponding branch) once. There is no need to try to do this multiple times, the cherry picking will result in the same result every time. If a user for some reasons issues the `/backport` command twice on a commit then this will now work. > > Thanks, > Erik This pull request has now been integrated. Changeset: 2ff465bc Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2ff465bc Stats: 129 lines in 2 files changed: 79 ins; 18 del; 32 mod pr: only create backport branch once Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1107 From ehelin at openjdk.java.net Mon Apr 12 08:28:46 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 12 Apr 2021 08:28:46 GMT Subject: Integrated: build: update to JUnit 5.7.1 In-Reply-To: References: Message-ID: On Mon, 22 Mar 2021 09:49:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates JUnit to version `5.7.1` (and JUnit Platform to `1.7.1`). > > Thanks, > Erik This pull request has now been integrated. Changeset: cd6a10f2 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/cd6a10f2 Stats: 4 lines in 1 file changed: 0 ins; 0 del; 4 mod build: update to JUnit 5.7.1 Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1087 From ehelin at openjdk.java.net Mon Apr 12 13:37:48 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 12 Apr 2021 13:37:48 GMT Subject: RFR: build: update to Gradle 7.0 Message-ID: <-rHXDBQA96JgGifj5qL8oilySt83HRzoCR0DZV80RFg=.ed3bf4c0-f8a2-42a4-b2af-577316a6d604@github.com> Hi all, please review this patch that updates Gradle to version `7.0`. Gradle is a bit stricter in 7.0 when it comes to consuming task output, so I had to ensure that the `Output` properties per task were unique. Thanks, Erik ------------- Commit messages: - build: update to Gradle 7.0 Changes: https://git.openjdk.java.net/skara/pull/1113/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1113&range=00 Stats: 33 lines in 4 files changed: 5 ins; 18 del; 10 mod Patch: https://git.openjdk.java.net/skara/pull/1113.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1113/head:pull/1113 PR: https://git.openjdk.java.net/skara/pull/1113 From ehelin at openjdk.java.net Mon Apr 12 14:08:17 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 12 Apr 2021 14:08:17 GMT Subject: RFR: Update to JDK 16 Message-ID: Hi all, please review this patch that updates the JDK used for building and running Skara to JDK 16. As part of the update I had to remove `--illegal-access=deny` from Skara's module plugin and I also had use `LogRecord.getLongThreadId` instead of the (since JDK 16) deprecated method `LogRecord.getThreadId`. Testing: - [x] `make images` locally - [x] `make test` locally Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1113 Commit messages: - Update to JDK 16 Changes: https://git.openjdk.java.net/skara/pull/1114/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1114&range=00 Stats: 21 lines in 7 files changed: 0 ins; 1 del; 20 mod Patch: https://git.openjdk.java.net/skara/pull/1114.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1114/head:pull/1114 PR: https://git.openjdk.java.net/skara/pull/1114 From ehelin at openjdk.java.net Mon Apr 12 14:10:34 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 12 Apr 2021 14:10:34 GMT Subject: RFR: build: update to Gradle 7.0 [v2] In-Reply-To: <-rHXDBQA96JgGifj5qL8oilySt83HRzoCR0DZV80RFg=.ed3bf4c0-f8a2-42a4-b2af-577316a6d604@github.com> References: <-rHXDBQA96JgGifj5qL8oilySt83HRzoCR0DZV80RFg=.ed3bf4c0-f8a2-42a4-b2af-577316a6d604@github.com> Message-ID: > Hi all, > > please review this patch that updates Gradle to version `7.0`. Gradle is a bit stricter in 7.0 when it comes to consuming task output, so I had to ensure that the `Output` properties per task were unique. > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Update gradle-wrapper.properties ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1113/files - new: https://git.openjdk.java.net/skara/pull/1113/files/4fd8578c..75de0947 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1113&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1113&range=00-01 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1113.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1113/head:pull/1113 PR: https://git.openjdk.java.net/skara/pull/1113 From erikj at openjdk.java.net Mon Apr 12 16:29:06 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 12 Apr 2021 16:29:06 GMT Subject: RFR: build: update to Gradle 7.0 [v2] In-Reply-To: References: <-rHXDBQA96JgGifj5qL8oilySt83HRzoCR0DZV80RFg=.ed3bf4c0-f8a2-42a4-b2af-577316a6d604@github.com> Message-ID: On Mon, 12 Apr 2021 14:10:34 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that updates Gradle to version `7.0`. Gradle is a bit stricter in 7.0 when it comes to consuming task output, so I had to ensure that the `Output` properties per task were unique. >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Update gradle-wrapper.properties Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1113 From rwestberg at openjdk.java.net Tue Apr 13 08:41:53 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 13 Apr 2021 08:41:53 GMT Subject: RFR: 964: Should only consider Fixed bugs for hgupdate-sync Message-ID: When deciding which issues should receive the hgupdate-sync label, only consider resolved issues that also have a resolution of "Fixed". ------------- Commit messages: - Only consider Fixed issues for sync labelling Changes: https://git.openjdk.java.net/skara/pull/1115/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1115&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-964 Stats: 39 lines in 3 files changed: 36 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1115.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1115/head:pull/1115 PR: https://git.openjdk.java.net/skara/pull/1115 From kcr at openjdk.java.net Tue Apr 13 11:54:00 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Tue, 13 Apr 2021 11:54:00 GMT Subject: RFR: 964: Should only consider Fixed bugs for hgupdate-sync In-Reply-To: References: Message-ID: On Tue, 13 Apr 2021 08:38:46 GMT, Robin Westberg wrote: > When deciding which issues should receive the hgupdate-sync label, only consider resolved issues that also have a resolution of "Fixed". Marked as reviewed by kcr (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1115 From erikj at openjdk.java.net Tue Apr 13 13:04:59 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 13 Apr 2021 13:04:59 GMT Subject: RFR: 964: Should only consider Fixed bugs for hgupdate-sync In-Reply-To: References: Message-ID: On Tue, 13 Apr 2021 08:38:46 GMT, Robin Westberg wrote: > When deciding which issues should receive the hgupdate-sync label, only consider resolved issues that also have a resolution of "Fixed". Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1115 From rwestberg at openjdk.java.net Tue Apr 13 13:40:59 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 13 Apr 2021 13:40:59 GMT Subject: RFR: 965: hgupdate-sync mistakenly added to 16.0.2 backport record Message-ID: <4apqrGh9tVjkbVjXwq2Lg6L6vw6nz4ooGkXEaFs7Kkg=.8efda3e9-785d-4bf3-8cc4-7eb838e4ca70@github.com> A BPR release stream can start before update version 3, so check for that as well. ------------- Commit messages: - A bpr stream can start before update version 3 Changes: https://git.openjdk.java.net/skara/pull/1116/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1116&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-965 Stats: 17 lines in 2 files changed: 15 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1116.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1116/head:pull/1116 PR: https://git.openjdk.java.net/skara/pull/1116 From kcr at openjdk.java.net Tue Apr 13 14:06:20 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Tue, 13 Apr 2021 14:06:20 GMT Subject: RFR: 965: hgupdate-sync mistakenly added to 16.0.2 backport record In-Reply-To: <4apqrGh9tVjkbVjXwq2Lg6L6vw6nz4ooGkXEaFs7Kkg=.8efda3e9-785d-4bf3-8cc4-7eb838e4ca70@github.com> References: <4apqrGh9tVjkbVjXwq2Lg6L6vw6nz4ooGkXEaFs7Kkg=.8efda3e9-785d-4bf3-8cc4-7eb838e4ca70@github.com> Message-ID: On Tue, 13 Apr 2021 13:37:31 GMT, Robin Westberg wrote: > A BPR release stream can start before update version 3, so check for that as well. Marked as reviewed by kcr (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1116 From rwestberg at openjdk.java.net Tue Apr 13 14:27:25 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 13 Apr 2021 14:27:25 GMT Subject: RFR: 964: Should only consider Fixed bugs for hgupdate-sync [v2] In-Reply-To: References: Message-ID: > When deciding which issues should receive the hgupdate-sync label, only consider resolved issues that also have a resolution of "Fixed". Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix failing CSR bot test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1115/files - new: https://git.openjdk.java.net/skara/pull/1115/files/2d0bf4ce..ea55b7e3 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1115&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1115&range=00-01 Stats: 3 lines in 1 file changed: 1 ins; 1 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1115.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1115/head:pull/1115 PR: https://git.openjdk.java.net/skara/pull/1115 From rwestberg at openjdk.java.net Tue Apr 13 14:56:59 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 13 Apr 2021 14:56:59 GMT Subject: RFR: 964: Should only consider Fixed bugs for hgupdate-sync [v3] In-Reply-To: References: Message-ID: > When deciding which issues should receive the hgupdate-sync label, only consider resolved issues that also have a resolution of "Fixed". Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix another failing CSR bot test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1115/files - new: https://git.openjdk.java.net/skara/pull/1115/files/ea55b7e3..10601ead Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1115&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1115&range=01-02 Stats: 3 lines in 1 file changed: 1 ins; 1 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1115.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1115/head:pull/1115 PR: https://git.openjdk.java.net/skara/pull/1115 From rwestberg at openjdk.java.net Tue Apr 13 16:24:09 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 13 Apr 2021 16:24:09 GMT Subject: Integrated: 964: Should only consider Fixed bugs for hgupdate-sync In-Reply-To: References: Message-ID: On Tue, 13 Apr 2021 08:38:46 GMT, Robin Westberg wrote: > When deciding which issues should receive the hgupdate-sync label, only consider resolved issues that also have a resolution of "Fixed". This pull request has now been integrated. Changeset: 995a8584 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/995a8584 Stats: 45 lines in 5 files changed: 38 ins; 2 del; 5 mod 964: Should only consider Fixed bugs for hgupdate-sync Reviewed-by: kcr, erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1115 From rwestberg at openjdk.java.net Tue Apr 13 16:28:11 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 13 Apr 2021 16:28:11 GMT Subject: RFR: 965: hgupdate-sync mistakenly added to 16.0.2 backport record [v2] In-Reply-To: <4apqrGh9tVjkbVjXwq2Lg6L6vw6nz4ooGkXEaFs7Kkg=.8efda3e9-785d-4bf3-8cc4-7eb838e4ca70@github.com> References: <4apqrGh9tVjkbVjXwq2Lg6L6vw6nz4ooGkXEaFs7Kkg=.8efda3e9-785d-4bf3-8cc4-7eb838e4ca70@github.com> Message-ID: > A BPR release stream can start before update version 3, so check for that as well. Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains two commits: - Latest master - A bpr stream can start before update version 3 ------------- Changes: https://git.openjdk.java.net/skara/pull/1116/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1116&range=01 Stats: 17 lines in 2 files changed: 15 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1116.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1116/head:pull/1116 PR: https://git.openjdk.java.net/skara/pull/1116 From erikj at openjdk.java.net Tue Apr 13 20:14:42 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 13 Apr 2021 20:14:42 GMT Subject: RFR: 965: hgupdate-sync mistakenly added to 16.0.2 backport record [v2] In-Reply-To: References: <4apqrGh9tVjkbVjXwq2Lg6L6vw6nz4ooGkXEaFs7Kkg=.8efda3e9-785d-4bf3-8cc4-7eb838e4ca70@github.com> Message-ID: On Tue, 13 Apr 2021 16:28:11 GMT, Robin Westberg wrote: >> A BPR release stream can start before update version 3, so check for that as well. > > Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains two commits: > > - Latest master > - A bpr stream can start before update version 3 Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1116 From rwestberg at openjdk.java.net Wed Apr 14 06:48:18 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 06:48:18 GMT Subject: Integrated: 965: hgupdate-sync mistakenly added to 16.0.2 backport record In-Reply-To: <4apqrGh9tVjkbVjXwq2Lg6L6vw6nz4ooGkXEaFs7Kkg=.8efda3e9-785d-4bf3-8cc4-7eb838e4ca70@github.com> References: <4apqrGh9tVjkbVjXwq2Lg6L6vw6nz4ooGkXEaFs7Kkg=.8efda3e9-785d-4bf3-8cc4-7eb838e4ca70@github.com> Message-ID: <7YGikLRB2K4RaLykvdoyT91wBRRpTmUZ6nQTEF-emGk=.cac48ae7-aadb-4387-b119-59613a55d855@github.com> On Tue, 13 Apr 2021 13:37:31 GMT, Robin Westberg wrote: > A BPR release stream can start before update version 3, so check for that as well. This pull request has now been integrated. Changeset: ea2dc184 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/ea2dc184 Stats: 17 lines in 2 files changed: 15 ins; 0 del; 2 mod 965: hgupdate-sync mistakenly added to 16.0.2 backport record Reviewed-by: kcr, erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1116 From ehelin at openjdk.java.net Wed Apr 14 07:04:23 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 14 Apr 2021 07:04:23 GMT Subject: Integrated: build: update to Gradle 7.0 In-Reply-To: <-rHXDBQA96JgGifj5qL8oilySt83HRzoCR0DZV80RFg=.ed3bf4c0-f8a2-42a4-b2af-577316a6d604@github.com> References: <-rHXDBQA96JgGifj5qL8oilySt83HRzoCR0DZV80RFg=.ed3bf4c0-f8a2-42a4-b2af-577316a6d604@github.com> Message-ID: On Mon, 12 Apr 2021 13:34:49 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates Gradle to version `7.0`. Gradle is a bit stricter in 7.0 when it comes to consuming task output, so I had to ensure that the `Output` properties per task were unique. > > Thanks, > Erik This pull request has now been integrated. Changeset: 0a79bfc7 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/0a79bfc7 Stats: 35 lines in 5 files changed: 5 ins; 18 del; 12 mod build: update to Gradle 7.0 Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1113 From ehelin at openjdk.java.net Wed Apr 14 07:04:48 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 14 Apr 2021 07:04:48 GMT Subject: RFR: Update to JDK 16 [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that updates the JDK used for building and running Skara to JDK 16. As part of the update I had to remove `--illegal-access=deny` from Skara's module plugin and I also had use `LogRecord.getLongThreadId` instead of the (since JDK 16) deprecated method `LogRecord.getThreadId`. > > Testing: > - [x] `make images` locally > - [x] `make test` locally > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1114/files - new: https://git.openjdk.java.net/skara/pull/1114/files/49ad26f4..49ad26f4 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1114&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1114&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1114.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1114/head:pull/1114 PR: https://git.openjdk.java.net/skara/pull/1114 From rwestberg at openjdk.java.net Wed Apr 14 09:35:48 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 09:35:48 GMT Subject: RFR: 843: Mails are not forwarded to a closed PR any more [v3] In-Reply-To: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> References: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> Message-ID: <0g-XUEm6wzn2tkWHgWrZB5VYWuVAXUcJdFNmHhXtf0c=.bf3327f6-3086-4212-9238-22a5f7094f92@github.com> > When bridging emails from mailing lists to pull requests, it is necessary to look at lists that can contain cross-posts as a single source. Otherwise, parts of a thread may be missed as it is only found on a certain list, while other parts are on another list. This is commonly the case for the jdk repositories which has its reviews split over many lists. > > To facilitate this, a MailingList can now be sourced from multiple actual lists, and is setup in that way when bridging repositories that are configured to use multiple lists for reviews. Sending mails are now done through the MailingListServer instead, as the actual target of a mail has always been decided by the email headers, and not the list send() was invoked on. Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains five additional commits since the last revision: - Merge remote-tracking branch 'upstream/master' into mbox_crosspost - Rename MailingList -> MailingListReader - Fix configuration parsing - Add support for treating a set of mboxes as a single source of conversations - Improve mbox parsing ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1103/files - new: https://git.openjdk.java.net/skara/pull/1103/files/2977dd09..e397e79e Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1103&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1103&range=01-02 Stats: 1045 lines in 44 files changed: 808 ins; 100 del; 137 mod Patch: https://git.openjdk.java.net/skara/pull/1103.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1103/head:pull/1103 PR: https://git.openjdk.java.net/skara/pull/1103 From rwestberg at openjdk.java.net Wed Apr 14 09:59:28 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 09:59:28 GMT Subject: RFR: 843: Mails are not forwarded to a closed PR any more [v4] In-Reply-To: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> References: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> Message-ID: <64krsJ4M3Cqq92eG9ANKO4j-aBKlPPmwdUDxlbWm7cA=.96a91a2a-99c7-4cb6-a222-1307096453c5@github.com> > When bridging emails from mailing lists to pull requests, it is necessary to look at lists that can contain cross-posts as a single source. Otherwise, parts of a thread may be missed as it is only found on a certain list, while other parts are on another list. This is commonly the case for the jdk repositories which has its reviews split over many lists. > > To facilitate this, a MailingList can now be sourced from multiple actual lists, and is setup in that way when bridging repositories that are configured to use multiple lists for reviews. Sending mails are now done through the MailingListServer instead, as the actual target of a mail has always been decided by the email headers, and not the list send() was invoked on. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix build error after merge ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1103/files - new: https://git.openjdk.java.net/skara/pull/1103/files/e397e79e..4b16916a Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1103&range=03 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1103&range=02-03 Stats: 4 lines in 3 files changed: 0 ins; 1 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1103.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1103/head:pull/1103 PR: https://git.openjdk.java.net/skara/pull/1103 From rwestberg at openjdk.java.net Wed Apr 14 10:03:36 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 10:03:36 GMT Subject: RFR: 963: Skara mlbridge bot sometimes resends old messages Message-ID: Avoid parsing the sent mail archive into conversations as we're only interested in the IDs that we have already sent. ------------- Depends on: https://git.openjdk.java.net/skara/pull/1103 Commit messages: - Do not try to parse sent mails as a conversation as we just want the ID's Changes: https://git.openjdk.java.net/skara/pull/1117/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1117&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-963 Stats: 30 lines in 2 files changed: 13 ins; 13 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1117.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1117/head:pull/1117 PR: https://git.openjdk.java.net/skara/pull/1117 From ehelin at openjdk.java.net Wed Apr 14 11:02:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 14 Apr 2021 11:02:20 GMT Subject: RFR: 843: Mails are not forwarded to a closed PR any more [v4] In-Reply-To: <64krsJ4M3Cqq92eG9ANKO4j-aBKlPPmwdUDxlbWm7cA=.96a91a2a-99c7-4cb6-a222-1307096453c5@github.com> References: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> <64krsJ4M3Cqq92eG9ANKO4j-aBKlPPmwdUDxlbWm7cA=.96a91a2a-99c7-4cb6-a222-1307096453c5@github.com> Message-ID: <9P46Q4FneAXFGM8T71d105gmrIvVTuhd5KNkTHkCayk=.3d641a70-d7fe-4be6-90d9-b6a7692bd7c9@github.com> On Wed, 14 Apr 2021 09:59:28 GMT, Robin Westberg wrote: >> When bridging emails from mailing lists to pull requests, it is necessary to look at lists that can contain cross-posts as a single source. Otherwise, parts of a thread may be missed as it is only found on a certain list, while other parts are on another list. This is commonly the case for the jdk repositories which has its reviews split over many lists. >> >> To facilitate this, a MailingList can now be sourced from multiple actual lists, and is setup in that way when bridging repositories that are configured to use multiple lists for reviews. Sending mails are now done through the MailingListServer instead, as the actual target of a mail has always been decided by the email headers, and not the list send() was invoked on. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix build error after merge Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1103 From ehelin at openjdk.java.net Wed Apr 14 11:03:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 14 Apr 2021 11:03:42 GMT Subject: RFR: 963: Skara mlbridge bot sometimes resends old messages In-Reply-To: References: Message-ID: On Wed, 14 Apr 2021 10:00:29 GMT, Robin Westberg wrote: > Avoid parsing the sent mail archive into conversations as we're only interested in the IDs that we have already sent. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1117 From rwestberg at openjdk.java.net Wed Apr 14 11:50:38 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 11:50:38 GMT Subject: Integrated: 843: Mails are not forwarded to a closed PR any more In-Reply-To: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> References: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> Message-ID: On Wed, 31 Mar 2021 06:52:06 GMT, Robin Westberg wrote: > When bridging emails from mailing lists to pull requests, it is necessary to look at lists that can contain cross-posts as a single source. Otherwise, parts of a thread may be missed as it is only found on a certain list, while other parts are on another list. This is commonly the case for the jdk repositories which has its reviews split over many lists. > > To facilitate this, a MailingList can now be sourced from multiple actual lists, and is setup in that way when bridging repositories that are configured to use multiple lists for reviews. Sending mails are now done through the MailingListServer instead, as the actual target of a mail has always been decided by the email headers, and not the list send() was invoked on. This pull request has now been integrated. Changeset: f8abe353 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/f8abe353 Stats: 921 lines in 24 files changed: 456 ins; 315 del; 150 mod 843: Mails are not forwarded to a closed PR any more Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1103 From rwestberg at openjdk.java.net Wed Apr 14 11:51:35 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 11:51:35 GMT Subject: RFR: 963: Skara mlbridge bot sometimes resends old messages [v2] In-Reply-To: References: Message-ID: > Avoid parsing the sent mail archive into conversations as we're only interested in the IDs that we have already sent. Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains seven commits: - Do not try to parse sent mails as a conversation as we just want the ID's - Fix build error after merge - Merge remote-tracking branch 'upstream/master' into mbox_crosspost - Rename MailingList -> MailingListReader - Fix configuration parsing - Add support for treating a set of mboxes as a single source of conversations - Improve mbox parsing ------------- Changes: https://git.openjdk.java.net/skara/pull/1117/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1117&range=01 Stats: 949 lines in 24 files changed: 469 ins; 328 del; 152 mod Patch: https://git.openjdk.java.net/skara/pull/1117.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1117/head:pull/1117 PR: https://git.openjdk.java.net/skara/pull/1117 From rwestberg at openjdk.java.net Wed Apr 14 11:55:27 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 11:55:27 GMT Subject: RFR: 963: Skara mlbridge bot sometimes resends old messages [v3] In-Reply-To: References: Message-ID: > Avoid parsing the sent mail archive into conversations as we're only interested in the IDs that we have already sent. Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains eight commits: - Merge remote-tracking branch 'upstream/master' into mlbridge_archive_parse - Do not try to parse sent mails as a conversation as we just want the ID's - Fix build error after merge - Merge remote-tracking branch 'upstream/master' into mbox_crosspost - Rename MailingList -> MailingListReader - Fix configuration parsing - Add support for treating a set of mboxes as a single source of conversations - Improve mbox parsing ------------- Changes: https://git.openjdk.java.net/skara/pull/1117/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1117&range=02 Stats: 30 lines in 2 files changed: 13 ins; 13 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1117.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1117/head:pull/1117 PR: https://git.openjdk.java.net/skara/pull/1117 From rwestberg at openjdk.java.net Wed Apr 14 11:55:28 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 11:55:28 GMT Subject: Integrated: 963: Skara mlbridge bot sometimes resends old messages In-Reply-To: References: Message-ID: On Wed, 14 Apr 2021 10:00:29 GMT, Robin Westberg wrote: > Avoid parsing the sent mail archive into conversations as we're only interested in the IDs that we have already sent. This pull request has now been integrated. Changeset: e3b75ffc Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/e3b75ffc Stats: 30 lines in 2 files changed: 13 ins; 13 del; 4 mod 963: Skara mlbridge bot sometimes resends old messages Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1117 From erikj at openjdk.java.net Wed Apr 14 12:53:12 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 14 Apr 2021 12:53:12 GMT Subject: RFR: Update to JDK 16 [v2] In-Reply-To: References: Message-ID: On Wed, 14 Apr 2021 07:04:48 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that updates the JDK used for building and running Skara to JDK 16. As part of the update I had to remove `--illegal-access=deny` from Skara's module plugin and I also had use `LogRecord.getLongThreadId` instead of the (since JDK 16) deprecated method `LogRecord.getThreadId`. >> >> Testing: >> - [x] `make images` locally >> - [x] `make test` locally >> >> Thanks, >> Erik > > Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1114 From erikj at openjdk.java.net Wed Apr 14 12:58:32 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 14 Apr 2021 12:58:32 GMT Subject: RFR: 963: Skara mlbridge bot sometimes resends old messages [v3] In-Reply-To: References: Message-ID: On Wed, 14 Apr 2021 11:55:27 GMT, Robin Westberg wrote: >> Avoid parsing the sent mail archive into conversations as we're only interested in the IDs that we have already sent. > > Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains eight commits: > > - Merge remote-tracking branch 'upstream/master' into mlbridge_archive_parse > - Do not try to parse sent mails as a conversation as we just want the ID's > - Fix build error after merge > - Merge remote-tracking branch 'upstream/master' into mbox_crosspost > - Rename MailingList -> MailingListReader > - Fix configuration parsing > - Add support for treating a set of mboxes as a single source of conversations > - Improve mbox parsing bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java line 251: > 249: var archiveContents = Files.readString(mboxBasePath.resolve(pr.id() + ".mbox"), StandardCharsets.UTF_8); > 250: sentMails.addAll(Mbox.splitMbox(archiveContents, bot.emailAddress())); > 251: } catch (IOException ignored) { Shouldn't we at least log this? ------------- PR: https://git.openjdk.java.net/skara/pull/1117 From rwestberg at openjdk.java.net Wed Apr 14 13:46:52 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 13:46:52 GMT Subject: RFR: 963: Skara mlbridge bot sometimes resends old messages [v3] In-Reply-To: References: Message-ID: <04qxCYd18tlp4h3n94TBd858Z3jRdWPEuXxGn2y_vOE=.095b7d26-80c9-4985-a123-e4e6928319e2@github.com> On Wed, 14 Apr 2021 12:55:54 GMT, Erik Joelsson wrote: >> Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains eight commits: >> >> - Merge remote-tracking branch 'upstream/master' into mlbridge_archive_parse >> - Do not try to parse sent mails as a conversation as we just want the ID's >> - Fix build error after merge >> - Merge remote-tracking branch 'upstream/master' into mbox_crosspost >> - Rename MailingList -> MailingListReader >> - Fix configuration parsing >> - Add support for treating a set of mboxes as a single source of conversations >> - Improve mbox parsing > > bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java line 251: > >> 249: var archiveContents = Files.readString(mboxBasePath.resolve(pr.id() + ".mbox"), StandardCharsets.UTF_8); >> 250: sentMails.addAll(Mbox.splitMbox(archiveContents, bot.emailAddress())); >> 251: } catch (IOException ignored) { > > Shouldn't we at least log this? This will happen every time a new PR is processed (since there won't be any archive) - I can't think of any actual error that could cause a problem here (problems with the folder contents should have been discovered when cloning it from git) ------------- PR: https://git.openjdk.java.net/skara/pull/1117 From rwestberg at openjdk.java.net Wed Apr 14 15:27:38 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 14 Apr 2021 15:27:38 GMT Subject: RFR: 934: Bots incorrectly assigned "build" label despite no obvious matching rule Message-ID: When determining the set of file names to evaluate for determining label assignment, only include the source name for deletions and renames (and not for copies, for example). ------------- Commit messages: - Only match the source name for deletions and renames Changes: https://git.openjdk.java.net/skara/pull/1118/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1118&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-934 Stats: 57 lines in 2 files changed: 55 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1118.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1118/head:pull/1118 PR: https://git.openjdk.java.net/skara/pull/1118 From erikj at openjdk.java.net Wed Apr 14 17:06:30 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 14 Apr 2021 17:06:30 GMT Subject: RFR: 934: Bots incorrectly assigned "build" label despite no obvious matching rule In-Reply-To: References: Message-ID: On Wed, 14 Apr 2021 15:24:22 GMT, Robin Westberg wrote: > When determining the set of file names to evaluate for determining label assignment, only include the source name for deletions and renames (and not for copies, for example). Marked as reviewed by erikj (Reviewer). So in the PR listed in the bug, it was most likely this new file that Git implicitly assumed was a copy of an existing plist file because the initial content looked similar enough. We have such plist files under build directories so that's why the build label was added. Sneaky. src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/sandbox.plist ------------- PR: https://git.openjdk.java.net/skara/pull/1118 From rwestberg at openjdk.java.net Thu Apr 15 07:19:15 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 07:19:15 GMT Subject: RFR: 934: Bots incorrectly assigned "build" label despite no obvious matching rule In-Reply-To: References: Message-ID: On Wed, 14 Apr 2021 15:24:22 GMT, Robin Westberg wrote: > When determining the set of file names to evaluate for determining label assignment, only include the source name for deletions and renames (and not for copies, for example). Yes, that was indeed the case! Perhaps I should mention that it was actually @edvbld who figured it out.. :) So the diff we looked at was (dropped a few similar entries): > git diff 15bcf6d9 0bce6a53 --find-renames=90% --find-copies=90% --find-copies-harder --name-status M src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java R100 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/java32.png src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/JavaApp.png M src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.javarces_ja.properties M src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties A src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/product-def.plist C091 make/data/macosxsigning/java.plist src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/sandbox.plist M src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java M src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java R100 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/java48.ico src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/JavaApp.ico M test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java So there was indeed a "copy" that seemed to come from the make folder.. ------------- PR: https://git.openjdk.java.net/skara/pull/1118 From rwestberg at openjdk.java.net Thu Apr 15 07:32:56 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 07:32:56 GMT Subject: Integrated: 934: Bots incorrectly assigned "build" label despite no obvious matching rule In-Reply-To: References: Message-ID: On Wed, 14 Apr 2021 15:24:22 GMT, Robin Westberg wrote: > When determining the set of file names to evaluate for determining label assignment, only include the source name for deletions and renames (and not for copies, for example). This pull request has now been integrated. Changeset: 132acee4 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/132acee4 Stats: 57 lines in 2 files changed: 55 ins; 0 del; 2 mod 934: Bots incorrectly assigned "build" label despite no obvious matching rule Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1118 From ehelin at openjdk.java.net Thu Apr 15 12:54:59 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 12:54:59 GMT Subject: [cr] RFR: Add lang attribute to html tag Message-ID: <_vrhuMsaJpIC0Q0-mXjLiYvrt0fnEimdQTB0XLQjc9M=.18bdb134-67c5-456f-95d8-4aca25a6a22c@github.com> Hi all, please review this small patch that adds the `lang` attribute to the `html` tag. Thanks, Erik ------------- Commit messages: - Add lang attribute to html tag Changes: https://git.openjdk.java.net/cr/pull/6/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=6&range=00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/cr/pull/6.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/6/head:pull/6 PR: https://git.openjdk.java.net/cr/pull/6 From rwestberg at openjdk.java.net Thu Apr 15 12:58:58 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 12:58:58 GMT Subject: [cr] RFR: Add lang attribute to html tag In-Reply-To: <_vrhuMsaJpIC0Q0-mXjLiYvrt0fnEimdQTB0XLQjc9M=.18bdb134-67c5-456f-95d8-4aca25a6a22c@github.com> References: <_vrhuMsaJpIC0Q0-mXjLiYvrt0fnEimdQTB0XLQjc9M=.18bdb134-67c5-456f-95d8-4aca25a6a22c@github.com> Message-ID: On Thu, 15 Apr 2021 12:51:52 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the `lang` attribute to the `html` tag. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/6 From ehelin at openjdk.java.net Thu Apr 15 12:58:58 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 12:58:58 GMT Subject: [cr] Integrated: Add lang attribute to html tag In-Reply-To: <_vrhuMsaJpIC0Q0-mXjLiYvrt0fnEimdQTB0XLQjc9M=.18bdb134-67c5-456f-95d8-4aca25a6a22c@github.com> References: <_vrhuMsaJpIC0Q0-mXjLiYvrt0fnEimdQTB0XLQjc9M=.18bdb134-67c5-456f-95d8-4aca25a6a22c@github.com> Message-ID: On Thu, 15 Apr 2021 12:51:52 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the `lang` attribute to the `html` tag. > > Thanks, > Erik This pull request has now been integrated. Changeset: d1d7c0c8 Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/d1d7c0c8 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Add lang attribute to html tag Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/6 From ehelin at openjdk.java.net Thu Apr 15 13:03:30 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 13:03:30 GMT Subject: [cr] Integrated: Add viewport meta tag Message-ID: Hi all, please review this small patch that adds a `` tag for `viewport`. Thanks, Erik ------------- Commit messages: - Add viewport meta tag Changes: https://git.openjdk.java.net/cr/pull/7/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=7&range=00 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/cr/pull/7.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/7/head:pull/7 PR: https://git.openjdk.java.net/cr/pull/7 From rwestberg at openjdk.java.net Thu Apr 15 13:03:30 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 13:03:30 GMT Subject: [cr] Integrated: Add viewport meta tag In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 12:58:21 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a `` tag for `viewport`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/7 From ehelin at openjdk.java.net Thu Apr 15 13:03:30 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 13:03:30 GMT Subject: [cr] Integrated: Add viewport meta tag In-Reply-To: References: Message-ID: <4Jd-Ggfucj0CPDL1-T76UDRqWze_p11qVhtwR17rE1c=.483bff2e-dbf0-493e-a2d9-477a46539b1e@github.com> On Thu, 15 Apr 2021 12:58:21 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a `` tag for `viewport`. > > Thanks, > Erik This pull request has now been integrated. Changeset: e3195af8 Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/e3195af8 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Add viewport meta tag Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/7 From ehelin at openjdk.java.net Thu Apr 15 13:06:33 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 13:06:33 GMT Subject: [cr] RFR: Add description meta tag Message-ID: Hi all, please review this small patch that adds a `meta` tag with `description`. Thanks, Erik ------------- Commit messages: - Add description meta tag Changes: https://git.openjdk.java.net/cr/pull/8/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=8&range=00 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/cr/pull/8.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/8/head:pull/8 PR: https://git.openjdk.java.net/cr/pull/8 From rwestberg at openjdk.java.net Thu Apr 15 13:06:34 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 13:06:34 GMT Subject: [cr] RFR: Add description meta tag In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 13:02:51 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a `meta` tag with `description`. > > Thanks, > Erik Looks good! Marked as reviewed by rwestberg (Reviewer). index.html line 28: > 26: > 27: > 28: Suggestion: ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/8 From ehelin at openjdk.java.net Thu Apr 15 13:25:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 13:25:56 GMT Subject: [cr] Integrated: Add description meta tag In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 13:02:51 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a `meta` tag with `description`. > > Thanks, > Erik This pull request has now been integrated. Changeset: 3b7b5208 Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/3b7b5208 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Add description meta tag Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/8 From ehelin at openjdk.java.net Thu Apr 15 13:30:03 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 13:30:03 GMT Subject: [cr] RFR: index.html: move license comment after head tag Message-ID: Hi all, please review this patch that moves the license comment in `index.html` to _after_ the `` tag to allow browsers to see the `` tags within the first 1024 bytes. Thanks, Erik ------------- Commit messages: - index.html: move license comment after head tag Changes: https://git.openjdk.java.net/cr/pull/9/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=9&range=00 Stats: 20 lines in 1 file changed: 10 ins; 10 del; 0 mod Patch: https://git.openjdk.java.net/cr/pull/9.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/9/head:pull/9 PR: https://git.openjdk.java.net/cr/pull/9 From ehelin at openjdk.java.net Thu Apr 15 13:57:46 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 13:57:46 GMT Subject: [cr] RFR: 667: Webrev contents broken for rebased push Message-ID: <85oaWCluVpRw1U7VzQvVTr31YTCeSUTQOzeamRHKjAM=.314dbf98-8211-4df9-952d-0de7914b9ca4@github.com> Hi all, please review this patch that makes `webrev.js` calculate the "base"/"old" content from the "head"/"new" content and the reversed patch. This make `webrev.js` handle webrevs for force pushes. I also took the opportunity to reduce the number of network requests (by half) and also parallelized the initial three network requests. Testing: - [x] Manual testing on a large number of webrevs Thanks, Erik ------------- Commit messages: - Create base content from head content Changes: https://git.openjdk.java.net/cr/pull/10/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=10&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-667 Stats: 111 lines in 1 file changed: 56 ins; 43 del; 12 mod Patch: https://git.openjdk.java.net/cr/pull/10.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/10/head:pull/10 PR: https://git.openjdk.java.net/cr/pull/10 From rwestberg at openjdk.java.net Thu Apr 15 14:12:47 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 14:12:47 GMT Subject: [cr] RFR: index.html: move license comment after head tag In-Reply-To: References: Message-ID: <7UTJjBLPrjI-42g4OjTsa03TtBrb-0WMr0aqRANorzg=.955382c0-4b7e-4b26-97c4-a7ee7a745f59@github.com> On Thu, 15 Apr 2021 13:26:50 GMT, Erik Helin wrote: > Hi all, > > please review this patch that moves the license comment in `index.html` to _after_ the `` tag to allow browsers to see the `` tags within the first 1024 bytes. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/9 From ehelin at openjdk.java.net Thu Apr 15 14:15:37 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 14:15:37 GMT Subject: [cr] Integrated: index.html: move license comment after head tag In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 13:26:50 GMT, Erik Helin wrote: > Hi all, > > please review this patch that moves the license comment in `index.html` to _after_ the `` tag to allow browsers to see the `` tags within the first 1024 bytes. > > Thanks, > Erik This pull request has now been integrated. Changeset: 7b82818f Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/7b82818f Stats: 20 lines in 1 file changed: 10 ins; 10 del; 0 mod index.html: move license comment after head tag Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/9 From rwestberg at openjdk.java.net Thu Apr 15 14:15:50 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 14:15:50 GMT Subject: [cr] RFR: 667: Webrev contents broken for rebased push In-Reply-To: <85oaWCluVpRw1U7VzQvVTr31YTCeSUTQOzeamRHKjAM=.314dbf98-8211-4df9-952d-0de7914b9ca4@github.com> References: <85oaWCluVpRw1U7VzQvVTr31YTCeSUTQOzeamRHKjAM=.314dbf98-8211-4df9-952d-0de7914b9ca4@github.com> Message-ID: On Thu, 15 Apr 2021 13:54:31 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `webrev.js` calculate the "base"/"old" content from the "head"/"new" content and the reversed patch. This make `webrev.js` handle webrevs for force pushes. I also took the opportunity to reduce the number of network requests (by half) and also parallelized the initial three network requests. > > Testing: > - [x] Manual testing on a large number of webrevs > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/10 From ehelin at openjdk.java.net Thu Apr 15 14:19:24 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 14:19:24 GMT Subject: [cr] RFR: index.html: remove indentation Message-ID: Hi all, please review this small pull request that removes the indentation from `index.html`. This is preparation for inlining `style.css` and `webrev.js` into `index.html` (to reduce the number of network requests). When `style.css` and `webrev.js` is inlined then it is easier to read `index.html` without indentation. Thanks, Erik ------------- Commit messages: - index.html: remove indentation Changes: https://git.openjdk.java.net/cr/pull/11/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=11&range=00 Stats: 11 lines in 1 file changed: 0 ins; 0 del; 11 mod Patch: https://git.openjdk.java.net/cr/pull/11.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/11/head:pull/11 PR: https://git.openjdk.java.net/cr/pull/11 From ehelin at openjdk.java.net Thu Apr 15 14:26:59 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 15 Apr 2021 14:26:59 GMT Subject: RFR: 930: Skara bot adds confusing comment to PR when CSR is needed Message-ID: Hi all, please review this patch that slightly changes the wording in the message from the `/csr` command when the user has to create a CSR. When a CSR is created in JBS then it is automatically linked to the issue, so there is no need to instruct the user to link the CSR to an issue. I therefore just removed this part from the reply. Testing: - [x] `make test` passes locally on Linux x64 Thanks, Erik ------------- Commit messages: - skara-930 Changes: https://git.openjdk.java.net/skara/pull/1119/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1119&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-930 Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1119.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1119/head:pull/1119 PR: https://git.openjdk.java.net/skara/pull/1119 From rwestberg at openjdk.java.net Thu Apr 15 14:29:56 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 14:29:56 GMT Subject: RFR: 930: Skara bot adds confusing comment to PR when CSR is needed In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 14:23:36 GMT, Erik Helin wrote: > Hi all, > > please review this patch that slightly changes the wording in the message from the `/csr` command when the user has to create a CSR. When a CSR is created in JBS then it is automatically linked to the issue, so there is no need to instruct the user to link the CSR to an issue. I therefore just removed this part from the reply. > > Testing: > - [x] `make test` passes locally on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1119 From rwestberg at openjdk.java.net Thu Apr 15 14:33:32 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 15 Apr 2021 14:33:32 GMT Subject: [cr] RFR: index.html: remove indentation In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 14:16:29 GMT, Erik Helin wrote: > Hi all, > > please review this small pull request that removes the indentation from `index.html`. This is preparation for inlining `style.css` and `webrev.js` into `index.html` (to reduce the number of network requests). When `style.css` and `webrev.js` is inlined then it is easier to read `index.html` without indentation. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/11 From kcr at openjdk.java.net Thu Apr 15 14:44:42 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Thu, 15 Apr 2021 14:44:42 GMT Subject: RFR: 930: Skara bot adds confusing comment to PR when CSR is needed In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 14:23:36 GMT, Erik Helin wrote: > Hi all, > > please review this patch that slightly changes the wording in the message from the `/csr` command when the user has to create a CSR. When a CSR is created in JBS then it is automatically linked to the issue, so there is no need to instruct the user to link the CSR to an issue. I therefore just removed this part from the reply. > > Testing: > - [x] `make test` passes locally on Linux x64 > > Thanks, > Erik Looks good. ------------- Marked as reviewed by kcr (no project role). PR: https://git.openjdk.java.net/skara/pull/1119 From erikj at openjdk.java.net Thu Apr 15 23:43:16 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 15 Apr 2021 23:43:16 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash Message-ID: I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. work_item: For work items, store the item toString() ------------- Commit messages: - Corrected comment - Implemented LogContext Changes: https://git.openjdk.java.net/skara/pull/1120/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-971 Stats: 368 lines in 6 files changed: 134 ins; 197 del; 37 mod Patch: https://git.openjdk.java.net/skara/pull/1120.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1120/head:pull/1120 PR: https://git.openjdk.java.net/skara/pull/1120 From rwestberg at openjdk.java.net Fri Apr 16 07:01:28 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 16 Apr 2021 07:01:28 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash In-Reply-To: References: Message-ID: <9gupmR_fu5XY1zUpG95SKgYMGzSk-icb2k8BtKVaTgc=.3ec8c495-72ae-40ff-8746-1bfb971949ec@github.com> On Thu, 15 Apr 2021 23:38:17 GMT, Erik Joelsson wrote: > I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: > > instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. > work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. > work_item: For work items, store the item toString() Looks good, this is probably how it should have been done from the beginning! bots/cli/src/main/java/org/openjdk/skara/bots/cli/BotLogstashHandler.java line 81: > 79: query.put("message", message); > 80: > 81: for (Map.Entry entry : LogContextMap.entrySet()) { Suggestion: for (var entry : LogContextMap.entrySet()) { ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1120 From ehelin at openjdk.java.net Fri Apr 16 07:51:59 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 07:51:59 GMT Subject: [cr] Integrated: index.html: remove indentation In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 14:16:29 GMT, Erik Helin wrote: > Hi all, > > please review this small pull request that removes the indentation from `index.html`. This is preparation for inlining `style.css` and `webrev.js` into `index.html` (to reduce the number of network requests). When `style.css` and `webrev.js` is inlined then it is easier to read `index.html` without indentation. > > Thanks, > Erik This pull request has now been integrated. Changeset: 9ce4cdec Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/9ce4cdec Stats: 11 lines in 1 file changed: 0 ins; 0 del; 11 mod index.html: remove indentation Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/11 From ehelin at openjdk.java.net Fri Apr 16 07:52:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 07:52:45 GMT Subject: [cr] Integrated: 667: Webrev contents broken for rebased push In-Reply-To: <85oaWCluVpRw1U7VzQvVTr31YTCeSUTQOzeamRHKjAM=.314dbf98-8211-4df9-952d-0de7914b9ca4@github.com> References: <85oaWCluVpRw1U7VzQvVTr31YTCeSUTQOzeamRHKjAM=.314dbf98-8211-4df9-952d-0de7914b9ca4@github.com> Message-ID: On Thu, 15 Apr 2021 13:54:31 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `webrev.js` calculate the "base"/"old" content from the "head"/"new" content and the reversed patch. This make `webrev.js` handle webrevs for force pushes. I also took the opportunity to reduce the number of network requests (by half) and also parallelized the initial three network requests. > > Testing: > - [x] Manual testing on a large number of webrevs > > Thanks, > Erik This pull request has now been integrated. Changeset: 47665ae3 Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/47665ae3 Stats: 111 lines in 1 file changed: 56 ins; 43 del; 12 mod 667: Webrev contents broken for rebased push Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/10 From ehelin at openjdk.java.net Fri Apr 16 08:32:48 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 08:32:48 GMT Subject: Integrated: 930: Skara bot adds confusing comment to PR when CSR is needed In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 14:23:36 GMT, Erik Helin wrote: > Hi all, > > please review this patch that slightly changes the wording in the message from the `/csr` command when the user has to create a CSR. When a CSR is created in JBS then it is automatically linked to the issue, so there is no need to instruct the user to link the CSR to an issue. I therefore just removed this part from the reply. > > Testing: > - [x] `make test` passes locally on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 64a8dc16 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/64a8dc16 Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod 930: Skara bot adds confusing comment to PR when CSR is needed Reviewed-by: rwestberg, kcr ------------- PR: https://git.openjdk.java.net/skara/pull/1119 From rwestberg at openjdk.java.net Fri Apr 16 08:43:20 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 16 Apr 2021 08:43:20 GMT Subject: [cr] Integrated: index.html: inline CSS In-Reply-To: References: Message-ID: On Fri, 16 Apr 2021 08:38:15 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that manually inlines the CSS into `index.html` (to avoid an additional network request). > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/12 From ehelin at openjdk.java.net Fri Apr 16 08:43:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 08:43:20 GMT Subject: [cr] Integrated: index.html: inline CSS In-Reply-To: References: Message-ID: <0NphEUgj_Mc1wbhbylru1hIz1LCBa1U_24ysy6GpOkY=.b3749069-407a-4280-9d3a-ce57defe7dff@github.com> On Fri, 16 Apr 2021 08:38:15 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that manually inlines the CSS into `index.html` (to avoid an additional network request). > > Thanks, > Erik This pull request has now been integrated. Changeset: 6e0772e9 Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/6e0772e9 Stats: 343 lines in 2 files changed: 160 ins; 182 del; 1 mod index.html: inline CSS Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/12 From ehelin at openjdk.java.net Fri Apr 16 08:43:19 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 08:43:19 GMT Subject: [cr] Integrated: index.html: inline CSS Message-ID: Hi all, please review this pull request that manually inlines the CSS into `index.html` (to avoid an additional network request). Thanks, Erik ------------- Commit messages: - index.html: inline CSS Changes: https://git.openjdk.java.net/cr/pull/12/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=12&range=00 Stats: 343 lines in 2 files changed: 160 ins; 182 del; 1 mod Patch: https://git.openjdk.java.net/cr/pull/12.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/12/head:pull/12 PR: https://git.openjdk.java.net/cr/pull/12 From ehelin at openjdk.java.net Fri Apr 16 08:54:48 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 08:54:48 GMT Subject: [cr] Integrated: index.html: inline js Message-ID: Hi all, please review this patch that inlines `webrev.js` into `index.html` to avoid an additional network request. It would have been better to keep the JS in a separate file if we could: - minify the JS - configure cache control headers GitHub Pages unfortunately does not allow any of the above (and we don't want a build step for minification), therefore the best option is to inline the JS into `index.html`. Thanks, Erik ------------- Commit messages: - Fix trailing whitespace - index.html: inline js Changes: https://git.openjdk.java.net/cr/pull/13/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=13&range=00 Stats: 3034 lines in 2 files changed: 1506 ins; 1528 del; 0 mod Patch: https://git.openjdk.java.net/cr/pull/13.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/13/head:pull/13 PR: https://git.openjdk.java.net/cr/pull/13 From rwestberg at openjdk.java.net Fri Apr 16 08:54:48 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 16 Apr 2021 08:54:48 GMT Subject: [cr] Integrated: index.html: inline js In-Reply-To: References: Message-ID: On Fri, 16 Apr 2021 08:46:34 GMT, Erik Helin wrote: > Hi all, > > please review this patch that inlines `webrev.js` into `index.html` to avoid an additional network request. It would have been better to keep the JS in a separate file if we could: > > - minify the JS > - configure cache control headers > > GitHub Pages unfortunately does not allow any of the above (and we don't want a build step for minification), therefore the best option is to inline the JS into `index.html`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/13 From ehelin at openjdk.java.net Fri Apr 16 08:54:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 08:54:49 GMT Subject: [cr] Integrated: index.html: inline js In-Reply-To: References: Message-ID: On Fri, 16 Apr 2021 08:46:34 GMT, Erik Helin wrote: > Hi all, > > please review this patch that inlines `webrev.js` into `index.html` to avoid an additional network request. It would have been better to keep the JS in a separate file if we could: > > - minify the JS > - configure cache control headers > > GitHub Pages unfortunately does not allow any of the above (and we don't want a build step for minification), therefore the best option is to inline the JS into `index.html`. > > Thanks, > Erik This pull request has now been integrated. Changeset: 4ab6f42e Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/4ab6f42e Stats: 3034 lines in 2 files changed: 1506 ins; 1528 del; 0 mod index.html: inline js Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/13 From ehelin at openjdk.java.net Fri Apr 16 14:15:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 14:15:27 GMT Subject: RFR: 973: Include namespaces in census unification Message-ID: Hi all, please review this patch that ensures that we include eventual namespaces when unifying a census from directory format to single-file format. Thanks, Erik ------------- Commit messages: - skara-973 Changes: https://git.openjdk.java.net/skara/pull/1121/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1121&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-973 Stats: 36 lines in 4 files changed: 30 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1121.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1121/head:pull/1121 PR: https://git.openjdk.java.net/skara/pull/1121 From ehelin at openjdk.java.net Fri Apr 16 14:27:39 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 14:27:39 GMT Subject: RFR: git-hg-export: use namespaces for unknown domains Message-ID: <-u_2ztrplB-IJfdZgYsTdiOg2yIHODFdmL2mBKGwsAs=.91452f35-c236-440c-b3e4-d4f2ead83b0a@github.com> Hi all, please review this patch that makes `git hg-export` uses namespaces from the census for unknown domains. Thanks, Erik ------------- Commit messages: - git-hg-export: use namespaces for unknown domains Changes: https://git.openjdk.java.net/skara/pull/1122/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1122&range=00 Stats: 22 lines in 1 file changed: 19 ins; 1 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1122.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1122/head:pull/1122 PR: https://git.openjdk.java.net/skara/pull/1122 From rwestberg at openjdk.java.net Fri Apr 16 14:37:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 16 Apr 2021 14:37:00 GMT Subject: RFR: 973: Include namespaces in census unification In-Reply-To: References: Message-ID: On Fri, 16 Apr 2021 14:12:10 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that we include eventual namespaces when unifying a census from directory format to single-file format. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1121 From ehelin at openjdk.java.net Fri Apr 16 14:42:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 16 Apr 2021 14:42:41 GMT Subject: Integrated: 973: Include namespaces in census unification In-Reply-To: References: Message-ID: On Fri, 16 Apr 2021 14:12:10 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that we include eventual namespaces when unifying a census from directory format to single-file format. > > Thanks, > Erik This pull request has now been integrated. Changeset: 24e7dd36 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/24e7dd36 Stats: 36 lines in 4 files changed: 30 ins; 0 del; 6 mod 973: Include namespaces in census unification Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1121 From rwestberg at openjdk.java.net Fri Apr 16 14:50:10 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 16 Apr 2021 14:50:10 GMT Subject: RFR: git-hg-export: use namespaces for unknown domains In-Reply-To: <-u_2ztrplB-IJfdZgYsTdiOg2yIHODFdmL2mBKGwsAs=.91452f35-c236-440c-b3e4-d4f2ead83b0a@github.com> References: <-u_2ztrplB-IJfdZgYsTdiOg2yIHODFdmL2mBKGwsAs=.91452f35-c236-440c-b3e4-d4f2ead83b0a@github.com> Message-ID: On Fri, 16 Apr 2021 14:24:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git hg-export` uses namespaces from the census for unknown domains. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1122 From erikj at openjdk.java.net Fri Apr 16 17:55:22 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 16 Apr 2021 17:55:22 GMT Subject: RFR: git-hg-export: use namespaces for unknown domains In-Reply-To: <-u_2ztrplB-IJfdZgYsTdiOg2yIHODFdmL2mBKGwsAs=.91452f35-c236-440c-b3e4-d4f2ead83b0a@github.com> References: <-u_2ztrplB-IJfdZgYsTdiOg2yIHODFdmL2mBKGwsAs=.91452f35-c236-440c-b3e4-d4f2ead83b0a@github.com> Message-ID: On Fri, 16 Apr 2021 14:24:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git hg-export` uses namespaces from the census for unknown domains. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1122 From erikj at openjdk.java.net Fri Apr 16 19:34:03 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 16 Apr 2021 19:34:03 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash [v2] In-Reply-To: References: Message-ID: > I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: > > instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. > work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. > work_item: For work items, store the item toString() Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Update bots/cli/src/main/java/org/openjdk/skara/bots/cli/BotLogstashHandler.java Co-authored-by: Robin Westberg ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1120/files - new: https://git.openjdk.java.net/skara/pull/1120/files/f1ec8ffd..c257abd2 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1120.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1120/head:pull/1120 PR: https://git.openjdk.java.net/skara/pull/1120 From erikj at openjdk.java.net Fri Apr 16 19:34:04 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 16 Apr 2021 19:34:04 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash [v2] In-Reply-To: References: Message-ID: On Fri, 16 Apr 2021 19:31:13 GMT, Erik Joelsson wrote: >> I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: >> >> instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. >> work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. >> work_item: For work items, store the item toString() > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Update bots/cli/src/main/java/org/openjdk/skara/bots/cli/BotLogstashHandler.java > > Co-authored-by: Robin Westberg bots/cli/src/main/java/org/openjdk/skara/bots/cli/BotLogstashHandler.java line 81: > 79: query.put("message", message); > 80: > 81: for (var entry : LogContextMap.entrySet()) { Right, not used to var yet. I use Intellij's templates to generate loops and the template generates the type for me. I did change it manually in some other location but missed this one. ------------- PR: https://git.openjdk.java.net/skara/pull/1120 From erikj at openjdk.java.net Fri Apr 16 19:54:18 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 16 Apr 2021 19:54:18 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash [v3] In-Reply-To: References: Message-ID: > I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: > > instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. > work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. > work_item: For work items, store the item toString() Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Added simple test of LogContext ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1120/files - new: https://git.openjdk.java.net/skara/pull/1120/files/c257abd2..b82a7bc7 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=01-02 Stats: 19 lines in 1 file changed: 19 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1120.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1120/head:pull/1120 PR: https://git.openjdk.java.net/skara/pull/1120 From erikj at openjdk.java.net Fri Apr 16 20:40:45 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 16 Apr 2021 20:40:45 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash [v4] In-Reply-To: References: Message-ID: > I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: > > instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. > work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. > work_item: For work items, store the item toString() Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Fix start time stamp ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1120/files - new: https://git.openjdk.java.net/skara/pull/1120/files/b82a7bc7..6566eb8a Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=03 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=02-03 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1120.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1120/head:pull/1120 PR: https://git.openjdk.java.net/skara/pull/1120 From ehelin at openjdk.java.net Sat Apr 17 08:06:08 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Sat, 17 Apr 2021 08:06:08 GMT Subject: Integrated: Update to JDK 16 In-Reply-To: References: Message-ID: On Mon, 12 Apr 2021 14:05:22 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates the JDK used for building and running Skara to JDK 16. As part of the update I had to remove `--illegal-access=deny` from Skara's module plugin and I also had use `LogRecord.getLongThreadId` instead of the (since JDK 16) deprecated method `LogRecord.getThreadId`. > > Testing: > - [x] `make images` locally > - [x] `make test` locally > > Thanks, > Erik This pull request has now been integrated. Changeset: 3e1e8058 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/3e1e8058 Stats: 21 lines in 7 files changed: 0 ins; 1 del; 20 mod Update to JDK 16 Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1114 From ehelin at openjdk.java.net Sat Apr 17 08:06:43 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Sat, 17 Apr 2021 08:06:43 GMT Subject: Integrated: git-hg-export: use namespaces for unknown domains In-Reply-To: <-u_2ztrplB-IJfdZgYsTdiOg2yIHODFdmL2mBKGwsAs=.91452f35-c236-440c-b3e4-d4f2ead83b0a@github.com> References: <-u_2ztrplB-IJfdZgYsTdiOg2yIHODFdmL2mBKGwsAs=.91452f35-c236-440c-b3e4-d4f2ead83b0a@github.com> Message-ID: On Fri, 16 Apr 2021 14:24:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git hg-export` uses namespaces from the census for unknown domains. > > Thanks, > Erik This pull request has now been integrated. Changeset: db88caa8 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/db88caa8 Stats: 22 lines in 1 file changed: 19 ins; 1 del; 2 mod git-hg-export: use namespaces for unknown domains Reviewed-by: rwestberg, erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1122 From ehelin at openjdk.java.net Sat Apr 17 09:26:51 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Sat, 17 Apr 2021 09:26:51 GMT Subject: RFR: 975: Add /open pull request command Message-ID: Hi all, please review this patch that adds the `/open` pull request command to allow pull request authors to re-open a closed pull request. Thanks, Erik ------------- Commit messages: - skara-975 Changes: https://git.openjdk.java.net/skara/pull/1123/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1123&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-975 Stats: 239 lines in 3 files changed: 238 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1123.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1123/head:pull/1123 PR: https://git.openjdk.java.net/skara/pull/1123 From thomas.stuefe at gmail.com Sat Apr 17 22:03:13 2021 From: thomas.stuefe at gmail.com (=?UTF-8?Q?Thomas_St=C3=BCfe?=) Date: Sun, 18 Apr 2021 00:03:13 +0200 Subject: Cannot merge PR, and git sync stopped working Message-ID: Hi, I am trying to merge one of my PRs (https://github.com/openjdk/jdk/pull/2687), but am suddenly denied write access on Github for the OpenJDK repository. Possibly related: git sync stopped working for me. One one box it now asks me to manually add the source repo, or to maintain an upstream remote. On another, freshly installed box it now wants the github user name and password. Login to github via ssh works fine. 2FA works fine. Manually updating my personal fork works too. Skara tools are up to date. Happens with the latest git (2.31). What am I doing wrong? Thanks! Thomas From rwestberg at openjdk.java.net Sun Apr 18 08:18:15 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Sun, 18 Apr 2021 08:18:15 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash [v4] In-Reply-To: References: Message-ID: On Fri, 16 Apr 2021 20:40:45 GMT, Erik Joelsson wrote: >> I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: >> >> instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. >> work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. >> work_item: For work items, store the item toString() > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Fix start time stamp bots/cli/src/main/java/org/openjdk/skara/bots/cli/BotLogstashHandler.java line 38: > 36: > 37: public class BotLogstashHandler extends StreamHandler { > 38: private final RestRequest endpoint; One thing that I realized when thinking about this, is that this change will result in a lot more POSTs. However, RestRequest implements various rate limits to adhere to GitHub policies like https://docs.github.com/en/rest/overview/resources-in-the-rest-api#rate-limiting and https://docs.github.com/en/rest/guides/best-practices-for-integrators#dealing-with-abuse-rate-limits . So it would perhaps be better to just use HttpClient directly in this context. ------------- PR: https://git.openjdk.java.net/skara/pull/1120 From rwestberg at openjdk.java.net Sun Apr 18 08:21:07 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Sun, 18 Apr 2021 08:21:07 GMT Subject: RFR: 975: Add /open pull request command In-Reply-To: References: Message-ID: On Sat, 17 Apr 2021 09:23:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `/open` pull request command to allow pull request authors to re-open a closed pull request. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1123 From thomas.stuefe at gmail.com Mon Apr 19 08:33:18 2021 From: thomas.stuefe at gmail.com (=?UTF-8?Q?Thomas_St=C3=BCfe?=) Date: Mon, 19 Apr 2021 10:33:18 +0200 Subject: Cannot merge PR, and git sync stopped working In-Reply-To: References: Message-ID: Please ignore this mail. On Sun, Apr 18, 2021 at 12:03 AM Thomas St?fe wrote: > Hi, > > I am trying to merge one of my PRs ( > https://github.com/openjdk/jdk/pull/2687), but am suddenly denied write > access on Github for the OpenJDK repository. > > Possibly related: git sync stopped working for me. One one box it now asks > me to manually add the source repo, or to maintain an upstream remote. On > another, freshly installed box it now wants the github user name and > password. > > Login to github via ssh works fine. 2FA works fine. Manually updating my > personal fork works too. Skara tools are up to date. Happens with the > latest git (2.31). > > What am I doing wrong? > > Thanks! > > Thomas > From ehelin at openjdk.java.net Mon Apr 19 08:39:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 19 Apr 2021 08:39:45 GMT Subject: Integrated: 975: Add /open pull request command In-Reply-To: References: Message-ID: On Sat, 17 Apr 2021 09:23:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `/open` pull request command to allow pull request authors to re-open a closed pull request. > > Thanks, > Erik This pull request has now been integrated. Changeset: 9b9fe918 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/9b9fe918 Stats: 239 lines in 3 files changed: 238 ins; 0 del; 1 mod 975: Add /open pull request command Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1123 From ehelin at openjdk.java.net Mon Apr 19 08:40:18 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 19 Apr 2021 08:40:18 GMT Subject: RFR: network: only set Content-type for JSON requests Message-ID: Hi all, please review this small patch that makes `RestRequest` only set `Content-type` to `application/json` if the content actually is JSON ?? Thanks, Erik ------------- Commit messages: - network: only set Content-type for JSON requests Changes: https://git.openjdk.java.net/skara/pull/1124/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1124&range=00 Stats: 12 lines in 1 file changed: 7 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/1124.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1124/head:pull/1124 PR: https://git.openjdk.java.net/skara/pull/1124 From rwestberg at openjdk.java.net Mon Apr 19 08:46:23 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 19 Apr 2021 08:46:23 GMT Subject: RFR: network: only set Content-type for JSON requests In-Reply-To: References: Message-ID: On Mon, 19 Apr 2021 08:37:15 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes `RestRequest` only set `Content-type` to `application/json` if the content actually is JSON ?? > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1124 From ehelin at openjdk.java.net Mon Apr 19 08:59:25 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 19 Apr 2021 08:59:25 GMT Subject: Integrated: network: only set Content-type for JSON requests In-Reply-To: References: Message-ID: On Mon, 19 Apr 2021 08:37:15 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes `RestRequest` only set `Content-type` to `application/json` if the content actually is JSON ?? > > Thanks, > Erik This pull request has now been integrated. Changeset: 63a0d593 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/63a0d593 Stats: 12 lines in 1 file changed: 7 ins; 0 del; 5 mod network: only set Content-type for JSON requests Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1124 From ehelin at openjdk.java.net Mon Apr 19 09:01:00 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 19 Apr 2021 09:01:00 GMT Subject: RFR: pr: use per-user branch for backports Message-ID: Hi all, please review this patch that makes the backport branches created by the bot per user. Thanks, Erik ------------- Commit messages: - pr: use per-user branch for backports Changes: https://git.openjdk.java.net/skara/pull/1125/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1125&range=00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1125.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1125/head:pull/1125 PR: https://git.openjdk.java.net/skara/pull/1125 From rwestberg at openjdk.java.net Mon Apr 19 09:01:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 19 Apr 2021 09:01:00 GMT Subject: RFR: pr: use per-user branch for backports In-Reply-To: References: Message-ID: On Mon, 19 Apr 2021 08:57:37 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the backport branches created by the bot per user. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1125 From ehelin at openjdk.java.net Mon Apr 19 09:12:43 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 19 Apr 2021 09:12:43 GMT Subject: Integrated: pr: use per-user branch for backports In-Reply-To: References: Message-ID: On Mon, 19 Apr 2021 08:57:37 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the backport branches created by the bot per user. > > Thanks, > Erik This pull request has now been integrated. Changeset: 4e418f05 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/4e418f05 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod pr: use per-user branch for backports Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1125 From ehelin at openjdk.java.net Mon Apr 19 11:27:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 19 Apr 2021 11:27:45 GMT Subject: RFR: pr: markdown fixes for /backport Message-ID: Hi all, please review this patch that contains minor markdown fixes for the `/backport` command. Thanks, Erik ------------- Commit messages: - pr: markdown fixes for /backport Changes: https://git.openjdk.java.net/skara/pull/1126/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1126&range=00 Stats: 8 lines in 1 file changed: 1 ins; 4 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1126.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1126/head:pull/1126 PR: https://git.openjdk.java.net/skara/pull/1126 From rwestberg at openjdk.java.net Mon Apr 19 11:27:45 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 19 Apr 2021 11:27:45 GMT Subject: RFR: pr: markdown fixes for /backport In-Reply-To: References: Message-ID: On Mon, 19 Apr 2021 11:23:44 GMT, Erik Helin wrote: > Hi all, > > please review this patch that contains minor markdown fixes for the `/backport` command. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1126 From ehelin at openjdk.java.net Mon Apr 19 11:31:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 19 Apr 2021 11:31:20 GMT Subject: Integrated: pr: markdown fixes for /backport In-Reply-To: References: Message-ID: On Mon, 19 Apr 2021 11:23:44 GMT, Erik Helin wrote: > Hi all, > > please review this patch that contains minor markdown fixes for the `/backport` command. > > Thanks, > Erik This pull request has now been integrated. Changeset: 53bfe81a Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/53bfe81a Stats: 8 lines in 1 file changed: 1 ins; 4 del; 3 mod pr: markdown fixes for /backport Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1126 From rwestberg at openjdk.java.net Mon Apr 19 13:46:02 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 19 Apr 2021 13:46:02 GMT Subject: RFR: Add census support for the issue notifier Message-ID: <9UbnTMBU0RiYtnaGGKxiLAOwzdjOZ5xvRVcRPFljab4=.54a64102-ddcc-4a9c-aeb9-9c4914010806@github.com> Add census support for the issue notifier, to avoid having to hardcode openjdk.org. ------------- Commit messages: - Initial implementation Changes: https://git.openjdk.java.net/skara/pull/1127/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1127&range=00 Stats: 358 lines in 19 files changed: 229 ins; 46 del; 83 mod Patch: https://git.openjdk.java.net/skara/pull/1127.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1127/head:pull/1127 PR: https://git.openjdk.java.net/skara/pull/1127 From joe.darcy at oracle.com Mon Apr 19 20:27:28 2021 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 19 Apr 2021 13:27:28 -0700 Subject: Resigning as lead of Project Skara Message-ID: Hello, I, Joe Darcy, being of sound mind and body, with Project Skara being in production use for JDK feature releases, I hereby resign as lead of the project effective immediate. I look forward to being a user of future Skara enhancements developed under the leadership of others. -Joe From erikj at openjdk.java.net Mon Apr 19 20:47:41 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 19 Apr 2021 20:47:41 GMT Subject: RFR: Add census support for the issue notifier In-Reply-To: <9UbnTMBU0RiYtnaGGKxiLAOwzdjOZ5xvRVcRPFljab4=.54a64102-ddcc-4a9c-aeb9-9c4914010806@github.com> References: <9UbnTMBU0RiYtnaGGKxiLAOwzdjOZ5xvRVcRPFljab4=.54a64102-ddcc-4a9c-aeb9-9c4914010806@github.com> Message-ID: On Mon, 19 Apr 2021 13:42:45 GMT, Robin Westberg wrote: > Add census support for the issue notifier, to avoid having to hardcode openjdk.org. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1127 From erikj at openjdk.java.net Mon Apr 19 23:16:47 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 19 Apr 2021 23:16:47 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash [v5] In-Reply-To: References: Message-ID: <_NHM6YBknXkHJ3Q0aIhRWlkFZXWkD7NxyCOatFnrMfs=.e3ee5b1b-3017-4d82-98fc-adfd6d422af5@github.com> > I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: > > instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. > work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. > work_item: For work items, store the item toString() Erik Joelsson has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains seven additional commits since the last revision: - Use HttpClient.sendAsync directly to send to logstash - Merge branch 'master' into SKARA-971-logstash - Fix start time stamp - Added simple test of LogContext - Update bots/cli/src/main/java/org/openjdk/skara/bots/cli/BotLogstashHandler.java Co-authored-by: Robin Westberg - Corrected comment - Implemented LogContext ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1120/files - new: https://git.openjdk.java.net/skara/pull/1120/files/6566eb8a..2c315bc2 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=04 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=03-04 Stats: 433 lines in 22 files changed: 354 ins; 9 del; 70 mod Patch: https://git.openjdk.java.net/skara/pull/1120.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1120/head:pull/1120 PR: https://git.openjdk.java.net/skara/pull/1120 From tim.bell at oracle.com Tue Apr 20 01:28:39 2021 From: tim.bell at oracle.com (tim.bell at oracle.com) Date: Mon, 19 Apr 2021 18:28:39 -0700 Subject: New lead for Project Skara Message-ID: <6dae88c8-f1d2-b08b-5bb7-0e0c5067a5a2@oracle.com> Joe Darcy has resigned as lead of Project Skara [1]. Under the bylaws for Project Roles [2], a new Project Lead may be nominated by the Group Leads of the Project's sponsoring groups. The Build Infrastructure Group is sponsor of the project.? In my role as Build Group Leader, I would like to nominate Erik Joelsson [3] to be the new Project Lead. The Build Infrastructure Group is the only sponsoring group for this project.? As I am the only voter in this situation, the nomination is approved. Thanks to Joe for bringing Project Skara to this point, and thanks to Erik for coming forward to take over the role. Tim Bell [1] https://mail.openjdk.java.net/pipermail/skara-dev/2021-April/004726.html [2] http://openjdk.java.net/bylaws#project-lead [3] https://openjdk.java.net/census#erikj From rwestberg at openjdk.java.net Tue Apr 20 08:11:22 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 20 Apr 2021 08:11:22 GMT Subject: RFR: 976: Do not send empty emails Message-ID: Check for multiline commands when ignoring command-only comments. ------------- Commit messages: - Check for multiline commands when ignoring command-only comments Changes: https://git.openjdk.java.net/skara/pull/1128/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1128&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-976 Stats: 19 lines in 2 files changed: 13 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1128.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1128/head:pull/1128 PR: https://git.openjdk.java.net/skara/pull/1128 From ehelin at openjdk.java.net Tue Apr 20 08:18:08 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 20 Apr 2021 08:18:08 GMT Subject: RFR: 976: Do not send empty emails In-Reply-To: References: Message-ID: On Tue, 20 Apr 2021 08:07:49 GMT, Robin Westberg wrote: > Check for multiline commands when ignoring command-only comments. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1128 From rwestberg at openjdk.java.net Tue Apr 20 09:09:29 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 20 Apr 2021 09:09:29 GMT Subject: RFR: 956: Skara bot is continually trying to process the same PR command Message-ID: Invalidate related GET cache entries when performing a non-GET request, to ensure that we for example always retrieve an updated list of comments after posting a new one. ------------- Commit messages: - Invalidated related GET cache entries when performing a non-GET request Changes: https://git.openjdk.java.net/skara/pull/1129/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1129&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-956 Stats: 40 lines in 2 files changed: 40 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1129.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1129/head:pull/1129 PR: https://git.openjdk.java.net/skara/pull/1129 From ehelin at openjdk.java.net Tue Apr 20 09:58:08 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 20 Apr 2021 09:58:08 GMT Subject: RFR: 956: Skara bot is continually trying to process the same PR command In-Reply-To: References: Message-ID: On Tue, 20 Apr 2021 09:06:02 GMT, Robin Westberg wrote: > Invalidate related GET cache entries when performing a non-GET request, to ensure that we for example always retrieve an updated list of comments after posting a new one. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1129 From rwestberg at openjdk.java.net Tue Apr 20 10:42:48 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 20 Apr 2021 10:42:48 GMT Subject: RFR: 974: Add retry logic to mlbridge when pushing Message-ID: If pushing a webrev to the archive should fail, it is commonly caused by a concurrent push for another webrev. Try to rebase a few times to avoid throwing an error. ------------- Commit messages: - When pushing a webrev, try rebasing if it fails Changes: https://git.openjdk.java.net/skara/pull/1130/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1130&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-974 Stats: 112 lines in 2 files changed: 109 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1130.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1130/head:pull/1130 PR: https://git.openjdk.java.net/skara/pull/1130 From rwestberg at openjdk.java.net Tue Apr 20 12:28:32 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 20 Apr 2021 12:28:32 GMT Subject: Integrated: Add census support for the issue notifier In-Reply-To: <9UbnTMBU0RiYtnaGGKxiLAOwzdjOZ5xvRVcRPFljab4=.54a64102-ddcc-4a9c-aeb9-9c4914010806@github.com> References: <9UbnTMBU0RiYtnaGGKxiLAOwzdjOZ5xvRVcRPFljab4=.54a64102-ddcc-4a9c-aeb9-9c4914010806@github.com> Message-ID: On Mon, 19 Apr 2021 13:42:45 GMT, Robin Westberg wrote: > Add census support for the issue notifier, to avoid having to hardcode openjdk.org. This pull request has now been integrated. Changeset: b8f10167 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/b8f10167 Stats: 358 lines in 19 files changed: 229 ins; 46 del; 83 mod Add census support for the issue notifier Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1127 From rwestberg at openjdk.java.net Tue Apr 20 12:28:58 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 20 Apr 2021 12:28:58 GMT Subject: Integrated: 976: Do not send empty emails In-Reply-To: References: Message-ID: On Tue, 20 Apr 2021 08:07:49 GMT, Robin Westberg wrote: > Check for multiline commands when ignoring command-only comments. This pull request has now been integrated. Changeset: 82f08432 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/82f08432 Stats: 19 lines in 2 files changed: 13 ins; 0 del; 6 mod 976: Do not send empty emails Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1128 From rwestberg at openjdk.java.net Tue Apr 20 12:29:09 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 20 Apr 2021 12:29:09 GMT Subject: Integrated: 956: Skara bot is continually trying to process the same PR command In-Reply-To: References: Message-ID: On Tue, 20 Apr 2021 09:06:02 GMT, Robin Westberg wrote: > Invalidate related GET cache entries when performing a non-GET request, to ensure that we for example always retrieve an updated list of comments after posting a new one. This pull request has now been integrated. Changeset: 5d545376 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/5d545376 Stats: 40 lines in 2 files changed: 40 ins; 0 del; 0 mod 956: Skara bot is continually trying to process the same PR command Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1129 From erikj at openjdk.java.net Tue Apr 20 13:32:20 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 20 Apr 2021 13:32:20 GMT Subject: RFR: SKARA-971: Stop clumping up logs in logstash [v6] In-Reply-To: References: Message-ID: > I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: > > instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. > work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. > work_item: For work items, store the item toString() Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Add comment ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1120/files - new: https://git.openjdk.java.net/skara/pull/1120/files/2c315bc2..6bd3be2b Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=05 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1120&range=04-05 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1120.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1120/head:pull/1120 PR: https://git.openjdk.java.net/skara/pull/1120 From rwestberg at openjdk.java.net Tue Apr 20 16:45:10 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 20 Apr 2021 16:45:10 GMT Subject: RFR: 831: Longer time for autoclose on passive PRs Message-ID: Wait longer before automatically trying to close draft pull requests. Also mention how to reopen a closed one. ------------- Commit messages: - Wait longer for draft prs, mention /open Changes: https://git.openjdk.java.net/skara/pull/1131/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1131&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-831 Stats: 7 lines in 2 files changed: 5 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1131.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1131/head:pull/1131 PR: https://git.openjdk.java.net/skara/pull/1131 From erikj at openjdk.java.net Tue Apr 20 17:34:52 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 20 Apr 2021 17:34:52 GMT Subject: RFR: 974: Add retry logic to mlbridge when pushing In-Reply-To: References: Message-ID: On Tue, 20 Apr 2021 10:39:27 GMT, Robin Westberg wrote: > If pushing a webrev to the archive should fail, it is commonly caused by a concurrent push for another webrev. Try to rebase a few times to avoid throwing an error. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1130 From erikj at openjdk.java.net Tue Apr 20 17:37:54 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 20 Apr 2021 17:37:54 GMT Subject: RFR: 831: Longer time for autoclose on passive PRs In-Reply-To: References: Message-ID: <2G7BEVLYNyjno3QT3XU9D57LnG0MpbVQ7TDON6EvJt8=.378a2ca8-efbc-4c08-8da9-e2b1fee75360@github.com> On Tue, 20 Apr 2021 16:41:42 GMT, Robin Westberg wrote: > Wait longer before automatically trying to close draft pull requests. Also mention how to reopen a closed one. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1131 From erikj at openjdk.java.net Tue Apr 20 17:59:26 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 20 Apr 2021 17:59:26 GMT Subject: Integrated: SKARA-971: Stop clumping up logs in logstash In-Reply-To: References: Message-ID: On Thu, 15 Apr 2021 23:38:17 GMT, Erik Joelsson wrote: > I would like to change how we send logs to logstash so each log message is stored as an individual document. To make this more practical, we need to add some more meta data to each message so we can properly filter them. I suggest adding the following: > > instance_start_time: An ISO_INSTANT time stamp string indicating when this JVM instance was started. > work_id: A running counter generated ID for each work item, rest request or periodic check, which was previously clumped up in one log message. > work_item: For work items, store the item toString() This pull request has now been integrated. Changeset: 7a7d15bf Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/7a7d15bf Stats: 475 lines in 8 files changed: 214 ins; 201 del; 60 mod 971: Stop clumping up logs in logstash Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1120 From erikj at openjdk.java.net Tue Apr 20 22:02:39 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 20 Apr 2021 22:02:39 GMT Subject: RFR: 980: Update log level of thrown exceptions Message-ID: This patch updates (almost) all uses of log.throwing() to log.log() so that we can include any exception in a log message of the appropriate level. This became necessary as we started logging each log message individually to logstash, so the FINER level logs from log.throwing() were no longer included. In addition to this, I'm also adding stack_trace and logger_name as fields in the logstash logging entries. ------------- Commit messages: - Log stacktraces at the appropriate level. Include stacktraces and logger name in logstash logs. Changes: https://git.openjdk.java.net/skara/pull/1132/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1132&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-980 Stats: 107 lines in 13 files changed: 46 ins; 42 del; 19 mod Patch: https://git.openjdk.java.net/skara/pull/1132.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1132/head:pull/1132 PR: https://git.openjdk.java.net/skara/pull/1132 From rwestberg at openjdk.java.net Wed Apr 21 06:44:37 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 21 Apr 2021 06:44:37 GMT Subject: RFR: 980: Update log level of thrown exceptions In-Reply-To: References: Message-ID: On Tue, 20 Apr 2021 21:59:06 GMT, Erik Joelsson wrote: > This patch updates (almost) all uses of log.throwing() to log.log() so that we can include any exception in a log message of the appropriate level. This became necessary as we started logging each log message individually to logstash, so the FINER level logs from log.throwing() were no longer included. > > In addition to this, I'm also adding stack_trace and logger_name as fields in the logstash logging entries. Looks good! bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 170: > 168: head.get(); > 169: } catch (InterruptedException | ExecutionException e) { > 170: log.log(Level.WARNING,"Exception during queue drain", e); Suggestion: log.log(Level.WARNING, "Exception during queue drain", e); ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1132 From rwestberg at openjdk.java.net Wed Apr 21 06:50:35 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 21 Apr 2021 06:50:35 GMT Subject: Integrated: 974: Add retry logic to mlbridge when pushing In-Reply-To: References: Message-ID: <2IQPSePmI0OjZYKSkezCXr2aNCz_KjwU9pPIYrZt9Og=.45d23e04-b097-48a9-9f39-97aaed7d3ec8@github.com> On Tue, 20 Apr 2021 10:39:27 GMT, Robin Westberg wrote: > If pushing a webrev to the archive should fail, it is commonly caused by a concurrent push for another webrev. Try to rebase a few times to avoid throwing an error. This pull request has now been integrated. Changeset: aa132b89 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/aa132b89 Stats: 112 lines in 2 files changed: 109 ins; 0 del; 3 mod 974: Add retry logic to mlbridge when pushing Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1130 From rwestberg at openjdk.java.net Wed Apr 21 06:51:06 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 21 Apr 2021 06:51:06 GMT Subject: Integrated: 831: Longer time for autoclose on passive PRs In-Reply-To: References: Message-ID: On Tue, 20 Apr 2021 16:41:42 GMT, Robin Westberg wrote: > Wait longer before automatically trying to close draft pull requests. Also mention how to reopen a closed one. This pull request has now been integrated. Changeset: 8441a351 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/8441a351 Stats: 7 lines in 2 files changed: 5 ins; 0 del; 2 mod 831: Longer time for autoclose on passive PRs Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1131 From erikj at openjdk.java.net Wed Apr 21 12:27:46 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 21 Apr 2021 12:27:46 GMT Subject: RFR: 980: Update log level of thrown exceptions [v2] In-Reply-To: References: Message-ID: > This patch updates (almost) all uses of log.throwing() to log.log() so that we can include any exception in a log message of the appropriate level. This became necessary as we started logging each log message individually to logstash, so the FINER level logs from log.throwing() were no longer included. > > In addition to this, I'm also adding stack_trace and logger_name as fields in the logstash logging entries. Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Update bot/src/main/java/org/openjdk/skara/bot/BotRunner.java Co-authored-by: Robin Westberg ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1132/files - new: https://git.openjdk.java.net/skara/pull/1132/files/00c22590..6fe77527 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1132&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1132&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1132.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1132/head:pull/1132 PR: https://git.openjdk.java.net/skara/pull/1132 From erikj at openjdk.java.net Wed Apr 21 12:27:46 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 21 Apr 2021 12:27:46 GMT Subject: Integrated: 980: Update log level of thrown exceptions In-Reply-To: References: Message-ID: <-RZPfud3zXJW7WGkLCL8P95C2Rmi-j3-09WiM_pAXlI=.20ab3d34-7d88-4d65-9165-aa950d15d5bf@github.com> On Tue, 20 Apr 2021 21:59:06 GMT, Erik Joelsson wrote: > This patch updates (almost) all uses of log.throwing() to log.log() so that we can include any exception in a log message of the appropriate level. This became necessary as we started logging each log message individually to logstash, so the FINER level logs from log.throwing() were no longer included. > > In addition to this, I'm also adding stack_trace and logger_name as fields in the logstash logging entries. This pull request has now been integrated. Changeset: 7cdcc9dd Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/7cdcc9dd Stats: 107 lines in 13 files changed: 46 ins; 42 del; 19 mod 980: Update log level of thrown exceptions Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1132 From rwestberg at openjdk.java.net Thu Apr 22 09:24:35 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 22 Apr 2021 09:24:35 GMT Subject: RFR: 981: Jira issue parser bails on space after URL Message-ID: If a comment looks like a remote link but contains an invalid URI, just ignore it. The comments posted by Skara cannot contain such links. ------------- Commit messages: - Handle invalid URIs gracefully Changes: https://git.openjdk.java.net/skara/pull/1133/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1133&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-981 Stats: 21 lines in 1 file changed: 8 ins; 1 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1133.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1133/head:pull/1133 PR: https://git.openjdk.java.net/skara/pull/1133 From erikj at openjdk.java.net Thu Apr 22 12:28:31 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 22 Apr 2021 12:28:31 GMT Subject: RFR: 981: Jira issue parser bails on space after URL In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 09:21:18 GMT, Robin Westberg wrote: > If a comment looks like a remote link but contains an invalid URI, just ignore it. The comments posted by Skara cannot contain such links. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1133 From rwestberg at openjdk.java.net Thu Apr 22 13:15:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 22 Apr 2021 13:15:00 GMT Subject: Integrated: 981: Jira issue parser bails on space after URL In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 09:21:18 GMT, Robin Westberg wrote: > If a comment looks like a remote link but contains an invalid URI, just ignore it. The comments posted by Skara cannot contain such links. This pull request has now been integrated. Changeset: cbc8f3c1 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/cbc8f3c1 Stats: 21 lines in 1 file changed: 8 ins; 1 del; 12 mod 981: Jira issue parser bails on space after URL Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1133 From rwestberg at openjdk.java.net Thu Apr 22 13:38:50 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 22 Apr 2021 13:38:50 GMT Subject: RFR: 941: Warn about required merge after dependent PR integration In-Reply-To: References: Message-ID: <-i0AqgW1mAQCQeT0DKXz636Kf0oUUjjHdSo-fjJ4GRY=.0ea97199-ee8a-47b4-bd24-e7a1ea570231@github.com> On Thu, 22 Apr 2021 13:33:55 GMT, Robin Westberg wrote: > When a dependent PR has been integrated, post an instructional message on how to merge these changes. The message looks like: The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout source git fetch file:///private/var/folders/d6/1lm60n2x37z35d9y72zl88k80000gn/T/RepositoryTests11763809428403690025/hosted.git master git merge FETCH_HEAD # if there are conflicts, follow the instructions given by git merge git commit -m "Merge master" git push ------------- PR: https://git.openjdk.java.net/skara/pull/1134 From rwestberg at openjdk.java.net Thu Apr 22 13:38:50 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 22 Apr 2021 13:38:50 GMT Subject: RFR: 941: Warn about required merge after dependent PR integration Message-ID: When a dependent PR has been integrated, post an instructional message on how to merge these changes. ------------- Commit messages: - Fix whitespace problem - Post a message when a dependent PR is retargeted Changes: https://git.openjdk.java.net/skara/pull/1134/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1134&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-941 Stats: 30 lines in 3 files changed: 27 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1134.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1134/head:pull/1134 PR: https://git.openjdk.java.net/skara/pull/1134 From erikj at openjdk.java.net Thu Apr 22 16:20:20 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 22 Apr 2021 16:20:20 GMT Subject: RFR: 941: Warn about required merge after dependent PR integration In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 13:33:55 GMT, Robin Westberg wrote: > When a dependent PR has been integrated, post an instructional message on how to merge these changes. Marked as reviewed by erikj (Reviewer). bots/notify/src/main/java/org/openjdk/skara/bots/notify/prbranch/PullRequestBranchNotifier.java line 86: > 84: has been updated. This means that changes from the dependent pull request can start to show up \ > 85: as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, \ > 86: simply merge the latest changes from the target branch into this pull request by running commands \ Suggestion: simply merge the latest changes from the new target branch into this pull request by running commands \ ------------- PR: https://git.openjdk.java.net/skara/pull/1134 From rwestberg at openjdk.java.net Thu Apr 22 17:10:18 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 22 Apr 2021 17:10:18 GMT Subject: RFR: 941: Warn about required merge after dependent PR integration [v2] In-Reply-To: References: Message-ID: > When a dependent PR has been integrated, post an instructional message on how to merge these changes. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Update bots/notify/src/main/java/org/openjdk/skara/bots/notify/prbranch/PullRequestBranchNotifier.java Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1134/files - new: https://git.openjdk.java.net/skara/pull/1134/files/a8eec304..8718ebc4 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1134&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1134&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1134.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1134/head:pull/1134 PR: https://git.openjdk.java.net/skara/pull/1134 From rwestberg at openjdk.java.net Thu Apr 22 17:10:19 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 22 Apr 2021 17:10:19 GMT Subject: RFR: 941: Warn about required merge after dependent PR integration In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 13:33:55 GMT, Robin Westberg wrote: > When a dependent PR has been integrated, post an instructional message on how to merge these changes. @stefank As the original issue reporter, does this look reasonable to you? ------------- PR: https://git.openjdk.java.net/skara/pull/1134 From rwestberg at openjdk.java.net Thu Apr 22 17:10:19 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 22 Apr 2021 17:10:19 GMT Subject: RFR: 941: Warn about required merge after dependent PR integration [v2] In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 16:17:59 GMT, Erik Joelsson wrote: >> Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: >> >> Update bots/notify/src/main/java/org/openjdk/skara/bots/notify/prbranch/PullRequestBranchNotifier.java >> >> Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> > > Marked as reviewed by erikj (Reviewer). @erikj79 Thanks for reviewing! ------------- PR: https://git.openjdk.java.net/skara/pull/1134 From erikj at openjdk.java.net Thu Apr 22 19:39:22 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 22 Apr 2021 19:39:22 GMT Subject: RFR: SKARA-991 Message-ID: Add 8u270 as a special case release for hgupdate-sync labeling, just like 8u260. ------------- Commit messages: - Add 8u270 as special case release Changes: https://git.openjdk.java.net/skara/pull/1135/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1135&range=00 Stats: 15 lines in 2 files changed: 14 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1135.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1135/head:pull/1135 PR: https://git.openjdk.java.net/skara/pull/1135 From kcr at openjdk.java.net Thu Apr 22 19:50:39 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Thu, 22 Apr 2021 19:50:39 GMT Subject: RFR: SKARA-991 In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 19:33:35 GMT, Erik Joelsson wrote: > Add 8u270 as a special case release for hgupdate-sync labeling, just like 8u260. Looks good (I noted one minor typo). jbs/src/main/java/org/openjdk/skara/jbs/Backports.java line 340: > 338: var version = fixVersion.get(); > 339: > 340: // 8u260 and 8u270 are a contingency releases minor: typo `are a` --> `are` ------------- Marked as reviewed by kcr (no project role). PR: https://git.openjdk.java.net/skara/pull/1135 From erik.joelsson at oracle.com Thu Apr 22 19:53:08 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Thu, 22 Apr 2021 12:53:08 -0700 Subject: CFV: New Skara Reviewer: Magnus Ihse Bursie Message-ID: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> I hereby nominate Magnus Ihse Bursie to Skara Reviewer. Magnus is a long time member of the OpenJDK community and is mostly known for his extensive work in the Build group and the Build Infra project. More recently he joined the Skara project to help take over development and maintenance of all the Skara tools as Erik Duveblad and Robin Westberg are winding down their participation in Skara. Votes are due by 2021-05-06 13:00 PT. Only current Skara Reviewers [1] are eligible to vote on this nomination.? Votes must be cast in the open by replying to this mailing list. For Three-Vote Consensus voting instructions, see [2]. Erik Joelsson [1] https://openjdk.java.net/census [2] https://openjdk.java.net/projects/#reviewer-vote From erikj at openjdk.java.net Thu Apr 22 19:57:53 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 22 Apr 2021 19:57:53 GMT Subject: RFR: SKARA-991 [v2] In-Reply-To: References: Message-ID: > Add 8u270 as a special case release for hgupdate-sync labeling, just like 8u260. Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Update jbs/src/main/java/org/openjdk/skara/jbs/Backports.java ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1135/files - new: https://git.openjdk.java.net/skara/pull/1135/files/92deb100..75963693 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1135&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1135&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1135.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1135/head:pull/1135 PR: https://git.openjdk.java.net/skara/pull/1135 From erikj at openjdk.java.net Thu Apr 22 19:57:55 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 22 Apr 2021 19:57:55 GMT Subject: RFR: SKARA-991 [v2] In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 19:47:58 GMT, Kevin Rushforth wrote: >> Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: >> >> Update jbs/src/main/java/org/openjdk/skara/jbs/Backports.java > > jbs/src/main/java/org/openjdk/skara/jbs/Backports.java line 340: > >> 338: var version = fixVersion.get(); >> 339: >> 340: // 8u260 and 8u270 are a contingency releases > > minor: typo `are a` --> `are` Right. Too quick! Suggestion: // 8u260 and 8u270 are contingency releases ------------- PR: https://git.openjdk.java.net/skara/pull/1135 From kcr at openjdk.java.net Thu Apr 22 20:16:21 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Thu, 22 Apr 2021 20:16:21 GMT Subject: RFR: SKARA-991 [v2] In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 19:57:53 GMT, Erik Joelsson wrote: >> Add 8u270 as a special case release for hgupdate-sync labeling, just like 8u260. > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Update jbs/src/main/java/org/openjdk/skara/jbs/Backports.java Marked as reviewed by kcr (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1135 From joe.darcy at oracle.com Thu Apr 22 20:32:57 2021 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 22 Apr 2021 13:32:57 -0700 Subject: CFV: New Skara Reviewer: Magnus Ihse Bursie In-Reply-To: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> References: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> Message-ID: <4a9af1a4-cedf-2449-9cf9-13151a4462dc@oracle.com> Vote: yes -Joe On 4/22/2021 12:53 PM, erik.joelsson at oracle.com wrote: > I hereby nominate Magnus Ihse Bursie to Skara Reviewer. > > Magnus is a long time member of the OpenJDK community and is mostly > known for his extensive work in the Build group and the Build Infra > project. More recently he joined the Skara project to help take over > development and maintenance of all the Skara tools as Erik Duveblad > and Robin Westberg are winding down their participation in Skara. > > Votes are due by 2021-05-06 13:00 PT. > > Only current Skara Reviewers [1] are eligible to vote on this > nomination.? Votes must be cast in the open by replying to this > mailing list. > > For Three-Vote Consensus voting instructions, see [2]. > > Erik Joelsson > > [1] https://openjdk.java.net/census > [2] https://openjdk.java.net/projects/#reviewer-vote > From erikj at openjdk.java.net Thu Apr 22 21:38:36 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 22 Apr 2021 21:38:36 GMT Subject: [cr] RFR: 988: Skara webrev is empty if patch has deleted files Message-ID: If a file in the patch has been deleted this causes a dereference of an undefined value. To fix this I removed the quick return in fetchFileContent so that this function always returns a value. While verifying this, I also noted that the deleted file gets a Raw link which results in a 404. I think it should just not print the Raw link so I removed that too. If a file has only been renamed, with no other changes, the patch will be an empty string. This upsets the hunk look, so I added a case for handling this. The resulting webrevs from the two reported patches look correct to me with these changes, but I would appreciate some more eyes on this. ------------- Commit messages: - Handle deleted and renamed files without error Changes: https://git.openjdk.java.net/cr/pull/14/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=14&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-988 Stats: 10 lines in 1 file changed: 2 ins; 6 del; 2 mod Patch: https://git.openjdk.java.net/cr/pull/14.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/14/head:pull/14 PR: https://git.openjdk.java.net/cr/pull/14 From erik.joelsson at oracle.com Thu Apr 22 22:17:51 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Thu, 22 Apr 2021 15:17:51 -0700 Subject: CFV: New Skara Committer: Kevin Rushforth Message-ID: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> I hereby nominate Kevin Rushforth to Skara Committer. Kevin is a long time member of the OpenJDK community with extensive experience in the ins and outs of the OpenJDK development process and source code repository management. He has graciously accepted to spend some of his time with the Skara project. Votes are due by 2021-05-06 15:00 PT. Only current Skara Committers [1] are eligible to vote on this nomination.? Votes must be cast in the open by replying to this mailing list. For Lazy Consensus voting instructions, see [2]. Erik Joelsson [1] https://openjdk.java.net/census [2] https://openjdk.java.net/projects/#committer-vote From erik.joelsson at oracle.com Thu Apr 22 22:18:13 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Thu, 22 Apr 2021 15:18:13 -0700 Subject: CFV: New Skara Reviewer: Magnus Ihse Bursie In-Reply-To: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> References: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> Message-ID: <792ea787-cecc-4c0f-3d93-8c3099f33cc1@oracle.com> Vote: yes On 2021-04-22 12:53, erik.joelsson at oracle.com wrote: > I hereby nominate Magnus Ihse Bursie to Skara Reviewer. > > Magnus is a long time member of the OpenJDK community and is mostly > known for his extensive work in the Build group and the Build Infra > project. More recently he joined the Skara project to help take over > development and maintenance of all the Skara tools as Erik Duveblad > and Robin Westberg are winding down their participation in Skara. > > Votes are due by 2021-05-06 13:00 PT. > > Only current Skara Reviewers [1] are eligible to vote on this > nomination.? Votes must be cast in the open by replying to this > mailing list. > > For Three-Vote Consensus voting instructions, see [2]. > > Erik Joelsson > > [1] https://openjdk.java.net/census > [2] https://openjdk.java.net/projects/#reviewer-vote > From erik.joelsson at oracle.com Thu Apr 22 22:18:36 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Thu, 22 Apr 2021 15:18:36 -0700 Subject: CFV: New Skara Committer: Kevin Rushforth In-Reply-To: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> References: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> Message-ID: Vote: yes On 2021-04-22 15:17, erik.joelsson at oracle.com wrote: > I hereby nominate Kevin Rushforth to Skara Committer. > > Kevin is a long time member of the OpenJDK community with extensive > experience in the ins and outs of the OpenJDK development process and > source code repository management. He has graciously accepted to spend > some of his time with the Skara project. > > Votes are due by 2021-05-06 15:00 PT. > > Only current Skara Committers [1] are eligible to vote on this > nomination.? Votes must be cast in the open by replying to this > mailing list. > > For Lazy Consensus voting instructions, see [2]. > > Erik Joelsson > > [1] https://openjdk.java.net/census > [2] https://openjdk.java.net/projects/#committer-vote > From joe.darcy at oracle.com Thu Apr 22 22:23:21 2021 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 22 Apr 2021 15:23:21 -0700 Subject: CFV: New Skara Committer: Kevin Rushforth In-Reply-To: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> References: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> Message-ID: Vote: yes -Joe On 4/22/2021 3:17 PM, erik.joelsson at oracle.com wrote: > I hereby nominate Kevin Rushforth to Skara Committer. > > Kevin is a long time member of the OpenJDK community with extensive > experience in the ins and outs of the OpenJDK development process and > source code repository management. He has graciously accepted to spend > some of his time with the Skara project. > > Votes are due by 2021-05-06 15:00 PT. > > Only current Skara Committers [1] are eligible to vote on this > nomination.? Votes must be cast in the open by replying to this > mailing list. > > For Lazy Consensus voting instructions, see [2]. > > Erik Joelsson > > [1] https://openjdk.java.net/census > [2] https://openjdk.java.net/projects/#committer-vote > From erikj at openjdk.java.net Thu Apr 22 22:41:29 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 22 Apr 2021 22:41:29 GMT Subject: RFR: 983: Github commit links 404 Message-ID: Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. ------------- Commit messages: - Stop abbreviating commit hash in web links Changes: https://git.openjdk.java.net/skara/pull/1136/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1136&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-983 Stats: 6 lines in 3 files changed: 2 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1136.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1136/head:pull/1136 PR: https://git.openjdk.java.net/skara/pull/1136 From tbell at openjdk.java.net Thu Apr 22 23:01:51 2021 From: tbell at openjdk.java.net (Tim Bell) Date: Thu, 22 Apr 2021 23:01:51 GMT Subject: RFR: 983: Github commit links 404 In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 22:38:29 GMT, Erik Joelsson wrote: > Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. Marked as reviewed by tbell (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1136 From kcr at openjdk.java.net Thu Apr 22 23:07:13 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Thu, 22 Apr 2021 23:07:13 GMT Subject: RFR: 983: Github commit links 404 In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 22:38:29 GMT, Erik Joelsson wrote: > Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. Conceptually, this looks like the right fix to me. A couple questions: 1. Do all places that generate a commit URL use the `webUrl` method? 2. Are there any places that extract the printed name from the URL (if so, those would now print the full 40 char hash)? 3. Are there place other than `IssueNotifer::onNewCommits` where you might need to check for old versus new hashes? I think this would only be a problem if there were other similar places that checked whether the URL had already been seen. 4. Are there any tests that need to be updated (or written)? ------------- PR: https://git.openjdk.java.net/skara/pull/1136 From rwestberg at openjdk.java.net Fri Apr 23 06:39:44 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 23 Apr 2021 06:39:44 GMT Subject: RFR: 991: Add 8u270 to the hgupdater exclusion list [v2] In-Reply-To: References: Message-ID: <8CyFM_0icYFkp1KGunCJo9uvJPMHTOMpRVkNZ3Lzw6k=.cb486167-ddd8-4d37-b986-fd609ca94efc@github.com> On Thu, 22 Apr 2021 19:57:53 GMT, Erik Joelsson wrote: >> Add 8u270 as a special case release for hgupdate-sync labeling, just like 8u260. > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Update jbs/src/main/java/org/openjdk/skara/jbs/Backports.java Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1135 From robin.westberg at oracle.com Fri Apr 23 06:53:01 2021 From: robin.westberg at oracle.com (Robin Westberg) Date: Fri, 23 Apr 2021 06:53:01 +0000 Subject: CFV: New Skara Reviewer: Magnus Ihse Bursie In-Reply-To: <792ea787-cecc-4c0f-3d93-8c3099f33cc1@oracle.com> References: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> <792ea787-cecc-4c0f-3d93-8c3099f33cc1@oracle.com> Message-ID: <16F2C4E6-12FA-456D-BFFD-AF29CF2525E4@oracle.com> Vote: yes Best regards, Robin > On 23 Apr 2021, at 00:18, erik.joelsson at oracle.com wrote: > > Vote: yes > > On 2021-04-22 12:53, erik.joelsson at oracle.com wrote: >> I hereby nominate Magnus Ihse Bursie to Skara Reviewer. >> >> Magnus is a long time member of the OpenJDK community and is mostly known for his extensive work in the Build group and the Build Infra project. More recently he joined the Skara project to help take over development and maintenance of all the Skara tools as Erik Duveblad and Robin Westberg are winding down their participation in Skara. >> >> Votes are due by 2021-05-06 13:00 PT. >> >> Only current Skara Reviewers [1] are eligible to vote on this nomination. Votes must be cast in the open by replying to this mailing list. >> >> For Three-Vote Consensus voting instructions, see [2]. >> >> Erik Joelsson >> >> [1] https://openjdk.java.net/census >> [2] https://openjdk.java.net/projects/#reviewer-vote >> From robin.westberg at oracle.com Fri Apr 23 06:53:55 2021 From: robin.westberg at oracle.com (Robin Westberg) Date: Fri, 23 Apr 2021 06:53:55 +0000 Subject: CFV: New Skara Committer: Kevin Rushforth In-Reply-To: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> References: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> Message-ID: Vote: yes Best regards, Robin > On 23 Apr 2021, at 00:17, erik.joelsson at oracle.com wrote: > > I hereby nominate Kevin Rushforth to Skara Committer. > > Kevin is a long time member of the OpenJDK community with extensive experience in the ins and outs of the OpenJDK development process and source code repository management. He has graciously accepted to spend some of his time with the Skara project. > > Votes are due by 2021-05-06 15:00 PT. > > Only current Skara Committers [1] are eligible to vote on this nomination. Votes must be cast in the open by replying to this mailing list. > > For Lazy Consensus voting instructions, see [2]. > > Erik Joelsson > > [1] https://openjdk.java.net/census > [2] https://openjdk.java.net/projects/#committer-vote > From rwestberg at openjdk.java.net Fri Apr 23 07:17:12 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 23 Apr 2021 07:17:12 GMT Subject: [cr] RFR: 988: Skara webrev is empty if patch has deleted files In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 21:35:43 GMT, Erik Joelsson wrote: > If a file in the patch has been deleted this causes a dereference of an undefined value. To fix this I removed the quick return in fetchFileContent so that this function always returns a value. > > While verifying this, I also noted that the deleted file gets a Raw link which results in a 404. I think it should just not print the Raw link so I removed that too. > > If a file has only been renamed, with no other changes, the patch will be an empty string. This upsets the hunk loop, so I added a case for handling this. > > The resulting webrevs from the two reported patches look correct to me with these changes, but I would appreciate some more eyes on this. Looks fine to me, although I guess @edvbld is the authority on this code. :) ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/14 From rwestberg at openjdk.java.net Fri Apr 23 07:19:36 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 23 Apr 2021 07:19:36 GMT Subject: RFR: 983: Github commit links 404 In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 22:38:29 GMT, Erik Joelsson wrote: > Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. Looks good! Perhaps you have run the tests locally, but couldn't hurt to enable the GitHub Actions to make sure there isn't some odd dependency on the short format left somewhere. :) ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1136 From ehelin at openjdk.java.net Fri Apr 23 09:41:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 23 Apr 2021 09:41:40 GMT Subject: [cr] RFR: 988: Skara webrev is empty if patch has deleted files In-Reply-To: References: Message-ID: <3k1Q9OW_RrdMy754xUlG4DVErYHLON3tDXF18Pf0gfk=.de2f219e-9569-429b-9dab-1be50109516a@github.com> On Thu, 22 Apr 2021 21:35:43 GMT, Erik Joelsson wrote: > If a file in the patch has been deleted this causes a dereference of an undefined value. To fix this I removed the quick return in fetchFileContent so that this function always returns a value. > > While verifying this, I also noted that the deleted file gets a Raw link which results in a 404. I think it should just not print the Raw link so I removed that too. > > If a file has only been renamed, with no other changes, the patch will be an empty string. This upsets the hunk loop, so I added a case for handling this. > > The resulting webrevs from the two reported patches look correct to me with these changes, but I would appreciate some more eyes on this. @erikj79 I don't follow how removing the fast return is correct? The `fetch` will then result in an `404` which I don't think the rest of the code will handle? I _think_ returning `Promise.resolve([])` (i.e. an empty array wrapped in promise) would be better. `apply` should be able to handle that `lines` is empty, so things "should" just work. ------------- PR: https://git.openjdk.java.net/cr/pull/14 From ehelin at openjdk.java.net Fri Apr 23 09:44:50 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 23 Apr 2021 09:44:50 GMT Subject: [cr] RFR: 988: Skara webrev is empty if patch has deleted files In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 21:35:43 GMT, Erik Joelsson wrote: > If a file in the patch has been deleted this causes a dereference of an undefined value. To fix this I removed the quick return in fetchFileContent so that this function always returns a value. > > While verifying this, I also noted that the deleted file gets a Raw link which results in a 404. I think it should just not print the Raw link so I removed that too. > > If a file has only been renamed, with no other changes, the patch will be an empty string. This upsets the hunk loop, so I added a case for handling this. > > The resulting webrevs from the two reported patches look correct to me with these changes, but I would appreciate some more eyes on this. index.html line 504: > 502: code.append(patchFile, " "); > 503: > 504: code.append("--- "); Nice catch! index.html line 1521: > 1519: } else if (line.startsWith("\\ No newline at end of file")) { > 1520: continue; > 1521: } else if (line == "") { Perhaps use `===`? ------------- PR: https://git.openjdk.java.net/cr/pull/14 From ehelin at openjdk.java.net Fri Apr 23 10:57:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 23 Apr 2021 10:57:40 GMT Subject: RFR: forge: GitHubRepository.canPush might return 404 Message-ID: Hi all, please review this patch that makes `GitLabRepository.canPush` handle when the request returns a `404`. GitHub returns `404` when a user is not a collaborator in a repository. Thanks, Erik ------------- Commit messages: - forge: GitHubRepository.canPush might return 404 Changes: https://git.openjdk.java.net/skara/pull/1137/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1137&range=00 Stats: 3 lines in 1 file changed: 3 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1137.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1137/head:pull/1137 PR: https://git.openjdk.java.net/skara/pull/1137 From rwestberg at openjdk.java.net Fri Apr 23 10:57:40 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 23 Apr 2021 10:57:40 GMT Subject: RFR: forge: GitHubRepository.canPush might return 404 In-Reply-To: References: Message-ID: On Fri, 23 Apr 2021 10:53:39 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `GitLabRepository.canPush` handle when the request returns a `404`. GitHub returns `404` when a user is not a collaborator in a repository. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1137 From ehelin at openjdk.java.net Fri Apr 23 11:33:50 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 23 Apr 2021 11:33:50 GMT Subject: Integrated: forge: GitHubRepository.canPush might return 404 In-Reply-To: References: Message-ID: On Fri, 23 Apr 2021 10:53:39 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `GitLabRepository.canPush` handle when the request returns a `404`. GitHub returns `404` when a user is not a collaborator in a repository. > > Thanks, > Erik This pull request has now been integrated. Changeset: 0d49a4d2 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/0d49a4d2 Stats: 3 lines in 1 file changed: 3 ins; 0 del; 0 mod forge: GitHubRepository.canPush might return 404 Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1137 From erikj at openjdk.java.net Fri Apr 23 13:25:08 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 23 Apr 2021 13:25:08 GMT Subject: Integrated: 991: Add 8u270 to the hgupdater exclusion list In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 19:33:35 GMT, Erik Joelsson wrote: > Add 8u270 as a special case release for hgupdate-sync labeling, just like 8u260. This pull request has now been integrated. Changeset: 1b3f3f0d Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/1b3f3f0d Stats: 15 lines in 2 files changed: 14 ins; 0 del; 1 mod 991: Add 8u270 to the hgupdater exclusion list Reviewed-by: kcr, rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1135 From tim.bell at oracle.com Fri Apr 23 13:46:34 2021 From: tim.bell at oracle.com (tim.bell at oracle.com) Date: Fri, 23 Apr 2021 06:46:34 -0700 Subject: CFV: New Skara Reviewer: Magnus Ihse Bursie In-Reply-To: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> References: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> Message-ID: Vote: yes Tim On 4/22/21 12:53, erik.joelsson at oracle.com wrote: > I hereby nominate Magnus Ihse Bursie to Skara Reviewer. From tim.bell at oracle.com Fri Apr 23 13:46:51 2021 From: tim.bell at oracle.com (tim.bell at oracle.com) Date: Fri, 23 Apr 2021 06:46:51 -0700 Subject: CFV: New Skara Committer: Kevin Rushforth In-Reply-To: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> References: <81f21433-6f1b-777d-6b4a-86e00c5b66e0@oracle.com> Message-ID: <3ef6efd7-eb68-bafe-624a-6b6182cc508d@oracle.com> Vote: yes Tim On 4/22/21 15:17, erik.joelsson at oracle.com wrote: > I hereby nominate Kevin Rushforth to Skara Committer. From rwestberg at openjdk.java.net Fri Apr 23 13:53:25 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 23 Apr 2021 13:53:25 GMT Subject: Integrated: 941: Warn about required merge after dependent PR integration In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 13:33:55 GMT, Robin Westberg wrote: > When a dependent PR has been integrated, post an instructional message on how to merge these changes. This pull request has now been integrated. Changeset: f084dc29 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/f084dc29 Stats: 30 lines in 3 files changed: 27 ins; 0 del; 3 mod 941: Warn about required merge after dependent PR integration Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1134 From ehelin at openjdk.java.net Fri Apr 23 14:30:52 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 23 Apr 2021 14:30:52 GMT Subject: RFR: 993: Stuck merge PR (Panama) Message-ID: Hi all, please review this patch that makes the merge bot use the `/integrate auto` feature. The merge bot have previously had issues when it should have re-issued an `/integrate` command due to the pull request source branch being updated by a human. These concerns go away if the merge bot instead rely on the `/integrate auto` feature. I also opted to make the `/sponsor` command a bit more lenient when a user has issued `/integrate auto`. If a user has run `/integrate auto` then a sponsor can sponsor the PR as soon as it is ready, they don't have to wait for the bots to add the `/integrate` comment. Thanks, Erik ------------- Commit messages: - skara-993 Changes: https://git.openjdk.java.net/skara/pull/1138/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1138&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-993 Stats: 136 lines in 3 files changed: 2 ins; 132 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1138.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1138/head:pull/1138 PR: https://git.openjdk.java.net/skara/pull/1138 From rwestberg at openjdk.java.net Fri Apr 23 14:40:25 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 23 Apr 2021 14:40:25 GMT Subject: RFR: 993: Stuck merge PR (Panama) In-Reply-To: References: Message-ID: On Fri, 23 Apr 2021 14:27:35 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the merge bot use the `/integrate auto` feature. The merge bot have previously had issues when it should have re-issued an `/integrate` command due to the pull request source branch being updated by a human. These concerns go away if the merge bot instead rely on the `/integrate auto` feature. > > I also opted to make the `/sponsor` command a bit more lenient when a user has issued `/integrate auto`. If a user has run `/integrate auto` then a sponsor can sponsor the PR as soon as it is ready, they don't have to wait for the bots to add the `/integrate` comment. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1138 From erikj at openjdk.java.net Fri Apr 23 19:59:34 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 23 Apr 2021 19:59:34 GMT Subject: RFR: 983: Github commit links 404 In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 23:04:51 GMT, Kevin Rushforth wrote: > 1. Do all places that generate a commit URL use the `webUrl` method? >From what I can tell, yes. > 2. Are there any places that extract the printed name from the URL (if so, those would now print the full 40 char hash)? In bug comments, we typically print the full URL and let Jira interpret it as a link (with the full URL as link text). In other places, like in Jira links, we already generate our own link text, and Github/Gitlab seems to recognize these links and generate their own link text for them. > 3. Are there place other than `IssueNotifer::onNewCommits` where you might need to check for old versus new hashes? I think this would only be a problem if there were other similar places that checked whether the URL had already been seen. I searched for all uses of the webUrl method to look at what it was used for. This was the only usage that wasn't just adding the link to some kind of message. > 4. Are there any tests that need to be updated (or written)? All tests ran successfully so nothing need changing. Perhaps I should add a test case for the parsing of existing URLs in comments. Erik D asked me to run this on staging for a bit (which will affect reviews in the Skara project) so we can see how it works. ------------- PR: https://git.openjdk.java.net/skara/pull/1136 From erikj at openjdk.java.net Fri Apr 23 20:17:30 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 23 Apr 2021 20:17:30 GMT Subject: [cr] RFR: 988: Skara webrev is empty if patch has deleted files [v2] In-Reply-To: References: Message-ID: > If a file in the patch has been deleted this causes a dereference of an undefined value. To fix this I removed the quick return in fetchFileContent so that this function always returns a value. > > While verifying this, I also noted that the deleted file gets a Raw link which results in a 404. I think it should just not print the Raw link so I removed that too. > > If a file has only been renamed, with no other changes, the patch will be an empty string. This upsets the hunk loop, so I added a case for handling this. > > The resulting webrevs from the two reported patches look correct to me with these changes, but I would appreciate some more eyes on this. Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Adjusted for review comments ------------- Changes: - all: https://git.openjdk.java.net/cr/pull/14/files - new: https://git.openjdk.java.net/cr/pull/14/files/239d79c2..8eaa628d Webrevs: - full: https://webrevs.openjdk.java.net/?repo=cr&pr=14&range=01 - incr: https://webrevs.openjdk.java.net/?repo=cr&pr=14&range=00-01 Stats: 4 lines in 1 file changed: 3 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/cr/pull/14.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/14/head:pull/14 PR: https://git.openjdk.java.net/cr/pull/14 From erikj at openjdk.java.net Fri Apr 23 20:17:30 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 23 Apr 2021 20:17:30 GMT Subject: [cr] RFR: 988: Skara webrev is empty if patch has deleted files [v2] In-Reply-To: References: Message-ID: <7-J9jZ2s3sbMjbYFLlg-aErDMlnxi8kDKDujZtVsEbs=.10166192-0b08-41d0-b1e3-567240881a5e@github.com> On Fri, 23 Apr 2021 20:14:47 GMT, Erik Joelsson wrote: >> If a file in the patch has been deleted this causes a dereference of an undefined value. To fix this I removed the quick return in fetchFileContent so that this function always returns a value. >> >> While verifying this, I also noted that the deleted file gets a Raw link which results in a 404. I think it should just not print the Raw link so I removed that too. >> >> If a file has only been renamed, with no other changes, the patch will be an empty string. This upsets the hunk loop, so I added a case for handling this. >> >> The resulting webrevs from the two reported patches look correct to me with these changes, but I would appreciate some more eyes on this. > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Adjusted for review comments > @erikj79 I don't follow how removing the fast return is correct? The `fetch` will then result in an `404` which I don't think the rest of the code will handle? I _think_ returning `Promise.resolve([])` (i.e. an empty array wrapped in promise) would be better. `apply` should be able to handle that `lines` is empty, so things "should" just work. Now that I know what a Promise is, then yes, this makes a lot more sense, thanks! ------------- PR: https://git.openjdk.java.net/cr/pull/14 From erikj at openjdk.java.net Fri Apr 23 20:17:33 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 23 Apr 2021 20:17:33 GMT Subject: [cr] RFR: 988: Skara webrev is empty if patch has deleted files [v2] In-Reply-To: References: Message-ID: On Fri, 23 Apr 2021 09:39:58 GMT, Erik Helin wrote: >> Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: >> >> Adjusted for review comments > > index.html line 1521: > >> 1519: } else if (line.startsWith("\\ No newline at end of file")) { >> 1520: continue; >> 1521: } else if (line == "") { > > Perhaps use `===`? That seems to be the standard in this project, so ok, changing it. I think verifying type seems unnecessary here though. The relevance of the test is to see if line resolves to an empty string. ------------- PR: https://git.openjdk.java.net/cr/pull/14 From erikj at openjdk.java.net Fri Apr 23 22:04:54 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 23 Apr 2021 22:04:54 GMT Subject: RFR: 983: Github commit links 404 [v2] In-Reply-To: References: Message-ID: <3grAJWpqfm3MUf_H7b57nZjKdAfd0mfOF74vZtTEuOQ=.5f87b1d1-5d0e-4dbc-90ef-ad2eb9ed757f@github.com> > Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Add test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1136/files - new: https://git.openjdk.java.net/skara/pull/1136/files/43049974..52e7b972 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1136&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1136&range=00-01 Stats: 72 lines in 1 file changed: 60 ins; 0 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1136.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1136/head:pull/1136 PR: https://git.openjdk.java.net/skara/pull/1136 From erikj at openjdk.java.net Fri Apr 23 22:13:55 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 23 Apr 2021 22:13:55 GMT Subject: RFR: 983: Github commit links 404 [v3] In-Reply-To: References: Message-ID: > Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Dummy change to trigger actions ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1136/files - new: https://git.openjdk.java.net/skara/pull/1136/files/52e7b972..acc9f283 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1136&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1136&range=01-02 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1136.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1136/head:pull/1136 PR: https://git.openjdk.java.net/skara/pull/1136 From ehelin at openjdk.java.net Tue Apr 27 13:11:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 27 Apr 2021 13:11:15 GMT Subject: [cr] RFR: 988: Skara webrev is empty if patch has deleted files [v2] In-Reply-To: References: Message-ID: On Fri, 23 Apr 2021 20:17:30 GMT, Erik Joelsson wrote: >> If a file in the patch has been deleted this causes a dereference of an undefined value. To fix this I removed the quick return in fetchFileContent so that this function always returns a value. >> >> While verifying this, I also noted that the deleted file gets a Raw link which results in a 404. I think it should just not print the Raw link so I removed that too. >> >> If a file has only been renamed, with no other changes, the patch will be an empty string. This upsets the hunk loop, so I added a case for handling this. >> >> The resulting webrevs from the two reported patches look correct to me with these changes, but I would appreciate some more eyes on this. > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Adjusted for review comments Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/cr/pull/14 From ehelin at openjdk.java.net Tue Apr 27 13:11:51 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 27 Apr 2021 13:11:51 GMT Subject: Integrated: 993: Stuck merge PR (Panama) In-Reply-To: References: Message-ID: On Fri, 23 Apr 2021 14:27:35 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the merge bot use the `/integrate auto` feature. The merge bot have previously had issues when it should have re-issued an `/integrate` command due to the pull request source branch being updated by a human. These concerns go away if the merge bot instead rely on the `/integrate auto` feature. > > I also opted to make the `/sponsor` command a bit more lenient when a user has issued `/integrate auto`. If a user has run `/integrate auto` then a sponsor can sponsor the PR as soon as it is ready, they don't have to wait for the bots to add the `/integrate` comment. > > Thanks, > Erik This pull request has now been integrated. Changeset: 4d271a08 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/4d271a08a3896d6fa6e6791227c5165c58c2e0c2 Stats: 136 lines in 3 files changed: 2 ins; 132 del; 2 mod 993: Stuck merge PR (Panama) Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1138 From ehelin at openjdk.java.net Tue Apr 27 13:15:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 27 Apr 2021 13:15:45 GMT Subject: RFR: 983: Github commit links 404 [v3] In-Reply-To: References: Message-ID: On Fri, 23 Apr 2021 22:13:55 GMT, Erik Joelsson wrote: >> Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Dummy change to trigger actions Looks good ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1136 From erikj at openjdk.java.net Tue Apr 27 13:44:43 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 27 Apr 2021 13:44:43 GMT Subject: [cr] Integrated: 988: Skara webrev is empty if patch has deleted files In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 21:35:43 GMT, Erik Joelsson wrote: > If a file in the patch has been deleted this causes a dereference of an undefined value. To fix this I removed the quick return in fetchFileContent so that this function always returns a value. > > While verifying this, I also noted that the deleted file gets a Raw link which results in a 404. I think it should just not print the Raw link so I removed that too. > > If a file has only been renamed, with no other changes, the patch will be an empty string. This upsets the hunk loop, so I added a case for handling this. > > The resulting webrevs from the two reported patches look correct to me with these changes, but I would appreciate some more eyes on this. This pull request has now been integrated. Changeset: 629c501f Author: Erik Joelsson URL: https://git.openjdk.java.net/cr/commit/629c501fd20e7e546ec8fe08e35616fa6dfa6a0a Stats: 8 lines in 1 file changed: 2 ins; 3 del; 3 mod 988: Skara webrev is empty if patch has deleted files Reviewed-by: rwestberg, ehelin ------------- PR: https://git.openjdk.java.net/cr/pull/14 From kcr at openjdk.java.net Tue Apr 27 14:01:18 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Tue, 27 Apr 2021 14:01:18 GMT Subject: RFR: 983: Github commit links 404 [v3] In-Reply-To: References: Message-ID: On Fri, 23 Apr 2021 22:13:55 GMT, Erik Joelsson wrote: >> Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Dummy change to trigger actions Marked as reviewed by kcr (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1136 From erikj at openjdk.java.net Tue Apr 27 17:45:35 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 27 Apr 2021 17:45:35 GMT Subject: Integrated: 983: Github commit links 404 In-Reply-To: References: Message-ID: On Thu, 22 Apr 2021 22:38:29 GMT, Erik Joelsson wrote: > Sometimes our abbreviated commit web links on Github are not working. My guess is that this is caused by collisions. I think the correct fix here is to stop abbreviating commit hashes in links. Github internal links seem to always be full hashes, while pretty printing the link text with an abbreviation. We should adopt the same basic principle. This pull request has now been integrated. Changeset: 75a8a621 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/75a8a62156a425ceb689c4914578d3f7a54099f1 Stats: 79 lines in 4 files changed: 63 ins; 0 del; 16 mod 983: Github commit links 404 Reviewed-by: tbell, rwestberg, ehelin, kcr ------------- PR: https://git.openjdk.java.net/skara/pull/1136 From erikj at openjdk.java.net Tue Apr 27 22:46:16 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 27 Apr 2021 22:46:16 GMT Subject: RFR: 1001: CommentPosterWorkItem@openjdk/jdk#3425 Message-ID: The mlbridge is currently spamming a PR with duplicated mail comments. This is caused by a regexp that fails to identify a comment as a bridged comment. The identification in this case is a Base64 encoded string that we generated. The regexp is missing + and / as valid characters in such a string. This change adds them and also adds a test, which includes the particular string that is currently causing the failure in production. I need to get this deployed ASAP. ------------- Commit messages: - Fix imports - Fix regexp for matching Base64 strings Changes: https://git.openjdk.java.net/skara/pull/1139/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1139&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1001 Stats: 22 lines in 2 files changed: 21 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1139.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1139/head:pull/1139 PR: https://git.openjdk.java.net/skara/pull/1139 From tbell at openjdk.java.net Tue Apr 27 22:50:28 2021 From: tbell at openjdk.java.net (Tim Bell) Date: Tue, 27 Apr 2021 22:50:28 GMT Subject: RFR: 1001: CommentPosterWorkItem@openjdk/jdk#3425 In-Reply-To: References: Message-ID: On Tue, 27 Apr 2021 22:42:47 GMT, Erik Joelsson wrote: > The mlbridge is currently spamming a PR with duplicated mail comments. This is caused by a regexp that fails to identify a comment as a bridged comment. The identification in this case is a Base64 encoded string that we generated. The regexp is missing + and / as valid characters in such a string. This change adds them and also adds a test, which includes the particular string that is currently causing the failure in production. > > I need to get this deployed ASAP. Looks good ------------- Marked as reviewed by tbell (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1139 From erikj at openjdk.java.net Tue Apr 27 22:56:23 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 27 Apr 2021 22:56:23 GMT Subject: Integrated: 1001: CommentPosterWorkItem@openjdk/jdk#3425 In-Reply-To: References: Message-ID: <75-zUOsBEKqn9Wr0rW7BwuaAiI7QLBItvqVMldGLkeY=.7a60411b-a65d-473f-af5e-39ab76896beb@github.com> On Tue, 27 Apr 2021 22:42:47 GMT, Erik Joelsson wrote: > The mlbridge is currently spamming a PR with duplicated mail comments. This is caused by a regexp that fails to identify a comment as a bridged comment. The identification in this case is a Base64 encoded string that we generated. The regexp is missing + and / as valid characters in such a string. This change adds them and also adds a test, which includes the particular string that is currently causing the failure in production. > > I need to get this deployed ASAP. This pull request has now been integrated. Changeset: cdc1b020 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/cdc1b020f16c40834e6a930d0901abe32ec39e43 Stats: 22 lines in 2 files changed: 21 ins; 0 del; 1 mod 1001: CommentPosterWorkItem at openjdk/jdk#3425 Reviewed-by: tbell ------------- PR: https://git.openjdk.java.net/skara/pull/1139 From ehelin at openjdk.java.net Wed Apr 28 13:30:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 28 Apr 2021 13:30:49 GMT Subject: RFR: 998: Backport fails for jdk15u-dev Message-ID: Hi all, please review this patch that fixes the REST endpoint used by `GitHubRepository.canPush`. Thanks, Erik ------------- Commit messages: - skara-998 Changes: https://git.openjdk.java.net/skara/pull/1140/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1140&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-998 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1140.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1140/head:pull/1140 PR: https://git.openjdk.java.net/skara/pull/1140 From ehelin at openjdk.java.net Wed Apr 28 13:54:01 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 28 Apr 2021 13:54:01 GMT Subject: Integrated: 998: Backport fails for jdk15u-dev In-Reply-To: References: Message-ID: On Wed, 28 Apr 2021 13:27:20 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes the REST endpoint used by `GitHubRepository.canPush`. > > Thanks, > Erik This pull request has now been integrated. Changeset: 7b3d5575 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/7b3d5575e794c21fdf3c81cbc65de69303ffb913 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod 998: Backport fails for jdk15u-dev Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1140 From rwestberg at openjdk.java.net Wed Apr 28 13:54:01 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 28 Apr 2021 13:54:01 GMT Subject: RFR: 998: Backport fails for jdk15u-dev In-Reply-To: References: Message-ID: On Wed, 28 Apr 2021 13:27:20 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes the REST endpoint used by `GitHubRepository.canPush`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1140 From ehelin at openjdk.java.net Thu Apr 29 09:00:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 29 Apr 2021 09:00:49 GMT Subject: RFR: 1003: GitHubRepository.restrictAccess sends incomplete query Message-ID: Hi all, please review this patch which sends the correct JSON data to GitHub's branch protection endpoint. I also changed the API of `restrictPushAccess` to make it more clear that only the supplied `HostUser` can push to the given branch afterwards. Thanks, Erik ------------- Commit messages: - skara-1003 Changes: https://git.openjdk.java.net/skara/pull/1141/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1141&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1003 Stats: 18 lines in 6 files changed: 6 ins; 0 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1141.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1141/head:pull/1141 PR: https://git.openjdk.java.net/skara/pull/1141 From erikj at openjdk.java.net Thu Apr 29 13:42:40 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 29 Apr 2021 13:42:40 GMT Subject: RFR: 1004: Skara bots fail to parse openjfx11.0.12 version Message-ID: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> This patch adds the ability to parse prefixes for JEP322 versions in JBS. One typical such prefix is openjfx, but I chose to not enumerate valid ones here but instead accept any prefix matching [a-z]+. ------------- Commit messages: - Handle openjfxX.Y.Z versions Changes: https://git.openjdk.java.net/skara/pull/1142/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1142&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1004 Stats: 19 lines in 2 files changed: 19 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1142.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1142/head:pull/1142 PR: https://git.openjdk.java.net/skara/pull/1142 From rwestberg at openjdk.java.net Thu Apr 29 13:46:29 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 29 Apr 2021 13:46:29 GMT Subject: RFR: 1003: GitHubRepository.restrictAccess sends incomplete query In-Reply-To: References: Message-ID: On Thu, 29 Apr 2021 08:57:15 GMT, Erik Helin wrote: > Hi all, > > please review this patch which sends the correct JSON data to GitHub's branch protection endpoint. I also changed the API of `restrictPushAccess` to make it more clear that only the supplied `HostUser` can push to the given branch afterwards. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1141 From rwestberg at openjdk.java.net Thu Apr 29 13:46:29 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 29 Apr 2021 13:46:29 GMT Subject: RFR: 1004: Skara bots fail to parse openjfx11.0.12 version In-Reply-To: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> References: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> Message-ID: On Thu, 29 Apr 2021 13:39:21 GMT, Erik Joelsson wrote: > This patch adds the ability to parse prefixes for JEP322 versions in JBS. One typical such prefix is openjfx, but I chose to not enumerate valid ones here but instead accept any prefix matching [a-z]+. Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1142 From kcr at openjdk.java.net Thu Apr 29 13:46:30 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Thu, 29 Apr 2021 13:46:30 GMT Subject: RFR: 1004: Skara bots fail to parse openjfx11.0.12 version In-Reply-To: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> References: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> Message-ID: On Thu, 29 Apr 2021 13:39:21 GMT, Erik Joelsson wrote: > This patch adds the ability to parse prefixes for JEP322 versions in JBS. One typical such prefix is openjfx, but I chose to not enumerate valid ones here but instead accept any prefix matching [a-z]+. This should work. With this fix, is `fxVersionPattern` needed any longer? That could be explored in a follow-on fix if it is obsolete after this fix. ------------- PR: https://git.openjdk.java.net/skara/pull/1142 From rwestberg at openjdk.java.net Thu Apr 29 13:54:47 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 29 Apr 2021 13:54:47 GMT Subject: RFR: 1004: Skara bots fail to parse openjfx11.0.12 version In-Reply-To: References: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> Message-ID: On Thu, 29 Apr 2021 13:44:05 GMT, Kevin Rushforth wrote: > This should work. With this fix, is `fxVersionPattern` needed any longer? That could be explored in a follow-on fix if it is obsolete after this fix. It will still be needed for versions that contain an 'u' I guess, so depends on whether you use jdk8-style versions (8u297 etc) or not. ------------- PR: https://git.openjdk.java.net/skara/pull/1142 From tbell at openjdk.java.net Thu Apr 29 14:07:59 2021 From: tbell at openjdk.java.net (Tim Bell) Date: Thu, 29 Apr 2021 14:07:59 GMT Subject: RFR: 1004: Skara bots fail to parse openjfx11.0.12 version In-Reply-To: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> References: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> Message-ID: On Thu, 29 Apr 2021 13:39:21 GMT, Erik Joelsson wrote: > This patch adds the ability to parse prefixes for JEP322 versions in JBS. One typical such prefix is openjfx, but I chose to not enumerate valid ones here but instead accept any prefix matching [a-z]+. Marked as reviewed by tbell (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1142 From erikj at openjdk.java.net Thu Apr 29 16:24:22 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 29 Apr 2021 16:24:22 GMT Subject: Integrated: 1004: Skara bots fail to parse openjfx11.0.12 version In-Reply-To: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> References: <62341YKgFpxh8ade8NaoC5CsR7L2nB5WcyP4UNTo5BE=.dad2e616-6ba2-4481-a63f-37b3b03e4bb2@github.com> Message-ID: On Thu, 29 Apr 2021 13:39:21 GMT, Erik Joelsson wrote: > This patch adds the ability to parse prefixes for JEP322 versions in JBS. One typical such prefix is openjfx, but I chose to not enumerate valid ones here but instead accept any prefix matching [a-z]+. This pull request has now been integrated. Changeset: d27723d1 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/d27723d1484cc6e1c658dd3b8d7c226e3de12033 Stats: 19 lines in 2 files changed: 19 ins; 0 del; 0 mod 1004: Skara bots fail to parse openjfx11.0.12 version Reviewed-by: rwestberg, tbell ------------- PR: https://git.openjdk.java.net/skara/pull/1142 From erikj at openjdk.java.net Thu Apr 29 16:25:23 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 29 Apr 2021 16:25:23 GMT Subject: RFR: 1003: GitHubRepository.restrictAccess sends incomplete query In-Reply-To: References: Message-ID: On Thu, 29 Apr 2021 08:57:15 GMT, Erik Helin wrote: > Hi all, > > please review this patch which sends the correct JSON data to GitHub's branch protection endpoint. I also changed the API of `restrictPushAccess` to make it more clear that only the supplied `HostUser` can push to the given branch afterwards. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1141 From ehelin at openjdk.java.net Thu Apr 29 17:44:06 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 29 Apr 2021 17:44:06 GMT Subject: Integrated: 1003: GitHubRepository.restrictAccess sends incomplete query In-Reply-To: References: Message-ID: On Thu, 29 Apr 2021 08:57:15 GMT, Erik Helin wrote: > Hi all, > > please review this patch which sends the correct JSON data to GitHub's branch protection endpoint. I also changed the API of `restrictPushAccess` to make it more clear that only the supplied `HostUser` can push to the given branch afterwards. > > Thanks, > Erik This pull request has now been integrated. Changeset: 62e23e04 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/62e23e04ccd40d102c5471b04ef2a315b1ba98d8 Stats: 18 lines in 6 files changed: 6 ins; 0 del; 12 mod 1003: GitHubRepository.restrictAccess sends incomplete query Reviewed-by: rwestberg, erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1141