[tomcat] branch main updated: Add missing Javadoc

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new d43edc0 Add missing Javadoc d43edc0 is described

[tomcat] branch main updated: Add first part of generics for EL 5.0 API

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new a2a9e48 Add first part of generics for EL 5.0 API

[tomcat] branch main updated: Add the remaining generics for EL 5.0

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 2a61a91 Add the remaining generics for EL 5.0

[tomcat] branch 8.5.x updated: Code clean-up. Add braces for clarity.

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new ded4135 Code clean-up. Add braces for clarity.

buildbot failure in on tomcat-trunk

2021-05-25 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5853 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

2021-05-25 Thread Michael Osipov
Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

2021-05-25 Thread Mark Thomas
On 25/05/2021 08:27, Michael Osipov wrote: Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository

[tomcat] branch 9.0.x updated: Code clean-up. Add braces for clarity.

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 6ddcb00 Code clean-up. Add braces for clarity.

[tomcat] branch main updated: Code clean-up. Add braces for clarity.

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 513a158 Code clean-up. Add braces for clarity.

[tomcat] branch 10.0.x updated: Code clean-up. Add braces for clarity.

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 5719527 Code clean-up. Add braces for clarity.

svn commit: r1890187 - in /tomcat/site/trunk: docs/ci.html docs/whichversion.html xdocs/ci.xml xdocs/whichversion.xml

2021-05-25 Thread markt
Author: markt Date: Tue May 25 08:29:28 2021 New Revision: 1890187 URL: http://svn.apache.org/viewvc?rev=1890187=rev Log: Update CI and version pages for 10.1.x and fix previous copy/paste errors/omissions Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/whichversion.html

Buildbot renaming

2021-05-25 Thread Mark Thomas
All, Looking ahead to when we will have a 9.10.x branch, the naming of the builds and output directories in buildbot isn't ideal. I'd like to move everything over to the n.n.x naming convention. That would mean the following changes: tomcat-trunk-> tomcat-10.1.x outputs to tomcat10

buildbot failure in on tomcat-85-trunk

2021-05-25 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2742 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

2021-05-25 Thread Mark Thomas
On 25/05/2021 09:03, Michael Osipov wrote: Am 2021-05-25 um 09:44 schrieb Mark Thomas: On 25/05/2021 08:27, Michael Osipov wrote: Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

2021-05-25 Thread Michael Osipov
Am 2021-05-25 um 10:06 schrieb Mark Thomas: On 25/05/2021 09:03, Michael Osipov wrote: Am 2021-05-25 um 09:44 schrieb Mark Thomas: On 25/05/2021 08:27, Michael Osipov wrote: Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34

Re: Buildbot renaming

2021-05-25 Thread Rémy Maucherat
On Tue, May 25, 2021 at 11:33 AM Mark Thomas wrote: > All, > > Looking ahead to when we will have a 9.10.x branch, the naming of the > builds and output directories in buildbot isn't ideal. I'd like to move > everything over to the n.n.x naming convention. That would mean the > following

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

2021-05-25 Thread Michael Osipov
Am 2021-05-25 um 09:44 schrieb Mark Thomas: On 25/05/2021 08:27, Michael Osipov wrote: Am 2021-05-24 um 20:55 schrieb Mark Thomas: On 24/05/2021 18:43, Rémy Maucherat wrote: On Mon, May 24, 2021 at 6:34 PM wrote: This is an automated email from the ASF dual-hosted git repository. markt

[tomcat] branch main updated: Update EL version for 10.1.x to EL 5.0 - there will be API changes

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 098c280 Update EL version for 10.1.x to EL 5.0 -

[tomcat] branch main updated: Fix typo

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9b385fe Fix typo 9b385fe is described below commit

buildbot success in on tomcat-trunk

2021-05-25 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5854 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The

[tomcat] branch 10.0.x updated: Update schema used in web-fragments

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 4ea6233 Update schema used in web-fragments

[tomcat] branch 10.0.x updated: Export no longer needed. Only used in main branch.

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new e444caf Export no longer needed. Only used in

[Bug 65329] Incorrect handling for WINVER in NMAKEmakefile

2021-05-25 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65329 Michael Osipov changed: What|Removed |Added CC||micha...@apache.org

[tomcat] branch main updated: A missed EL version update

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 41bfe9f A missed EL version update 41bfe9f is

[tomcat] branch main updated: Some more Java EE 8 to Jakarta EE 9 updates

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7cf3561 Some more Java EE 8 to Jakarta EE 9 updates

[tomcat] branch 10.0.x updated: Some more Java EE 8 to Jakarta EE 9 updates

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new cfc5c38 Some more Java EE 8 to Jakarta EE 9

[tomcat] branch 10.0.x updated: Update JspC to use Servlet 5.0 schemas

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 4be0c01 Update JspC to use Servlet 5.0 schemas

[tomcat] 03/03: Update JspC to use Servlet 5.0 schemas

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 1235b8b98ca0443ead49048aa88a4d69392b Author: Mark Thomas AuthorDate: Tue May 25 17:19:48 2021 +0100 Update JspC

APR connector on Windows 8+ fails to listen on all addresses

2021-05-25 Thread Michael Osipov
Folks, we needed to deploy Tomcat 9.0.x on a Windows server (no jokes, please), but the contractor wasn't able to configure the APR connector to accept on external interfaces even after a day. After my analysis it turned out be a subtile bug in libapr which affects Windows users only. I am

[Bug 65329] New: Incorrect handling for WINVER on NMAKEmakefile

2021-05-25 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65329 Bug ID: 65329 Summary: Incorrect handling for WINVER on NMAKEmakefile Product: Tomcat Native Version: 1.2.28 Hardware: PC Status: NEW Severity: major

Renamings with APR removal in 10.1.x

2021-05-25 Thread Michael Osipov
Mark, since you are going to remove all bits soon, will you rename Java items with still carry the APR substring? E.g., AprLifecycleListener will be a misleading name for obvious reasons. Michael - To unsubscribe, e-mail:

[tomcat] branch main updated: Update schema used in web-fragments

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 5ba1cda Update schema used in web-fragments 5ba1cda

[tomcat] branch main updated (7cf3561 -> 1235b8b)

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 7cf3561 Some more Java EE 8 to Jakarta EE 9 updates new 7708a78 Improvements to French translations. (remm)

[tomcat] 01/03: Improvements to French translations. (remm)

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 7708a78c80f921e9cdc3e38a5758c96e4fea7aac Author: Mark Thomas AuthorDate: Tue May 25 17:09:25 2021 +0100 Improvements

[tomcat] 02/03: Improvements to Korean translations. (woonsan)

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit fe38920463f40dd483a65ab14ad789234e7977b0 Author: Mark Thomas AuthorDate: Tue May 25 17:11:44 2021 +0100 Improvements

POEditor translations currently corrupted

2021-05-25 Thread Mark Thomas
All, The translations we manage via POEditor are currently corrupted. This is entirely my fault. In trying to fix a small bug, I introduced a bigger one. No translations have been lost. Reverting my fix and re-exporting the translations from a clean git checkout will restore everything.

[Bug 65330] NullPointerException on LDAP auth since tomcat 9.0.46 (works on 9.0.45)

2021-05-25 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65330 Mark Thomas changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW

[Bug 65308] NPE in JNDIRealm when no userRoleAttribute is given

2021-05-25 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65308 Mark Thomas changed: What|Removed |Added CC||sl...@aceslash.net --- Comment #4 from

[tomcat] branch 10.0.x updated: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

2021-05-25 Thread michaelo
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new f5e5091 AprLifecycleListener does not show

[Bug 65330] New: NullPointerException on LDAP auth since tomcat 9.0.46 (works on 9.0.45)

2021-05-25 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65330 Bug ID: 65330 Summary: NullPointerException on LDAP auth since tomcat 9.0.46 (works on 9.0.45) Product: Tomcat 9 Version: 9.0.46 Hardware: PC OS: Linux

[tomcat] branch apache-main created (now 7929f10)

2021-05-25 Thread michaelo
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch apache-main in repository https://gitbox.apache.org/repos/asf/tomcat.git. at 7929f10 AprLifecycleListener does not show dev version suffix for libtcnative and libapr This branch

[tomcat] 01/01: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

2021-05-25 Thread michaelo
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch apache-main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 7929f10f12e7d9e958f16086e28928e9adc9af62 Author: Michael Osipov AuthorDate: Tue May 25 20:14:19 2021 +0200

[Bug 65332] New: AccessControlException when using Ant instead of ECJ to compile JSPs at runtime

2021-05-25 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65332 Bug ID: 65332 Summary: AccessControlException when using Ant instead of ECJ to compile JSPs at runtime Product: Tomcat 9 Version: 9.0.x Hardware: PC OS:

[tomcat] branch 7.0.x updated: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

2021-05-25 Thread michaelo
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new d283a04 AprLifecycleListener does not show dev

[Bug 65330] NullPointerException on LDAP auth since tomcat 9.0.46 (works on 9.0.45)

2021-05-25 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65330 sl...@aceslash.net changed: What|Removed |Added Resolution|DUPLICATE |FIXED --- Comment #2 from

[tomcat] branch main updated: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

2021-05-25 Thread michaelo
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7929f10 AprLifecycleListener does not show dev

[tomcat] branch 8.5.x updated: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

2021-05-25 Thread michaelo
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 018083f AprLifecycleListener does not show dev

[tomcat] branch 9.0.x updated: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

2021-05-25 Thread michaelo
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 9745d4b AprLifecycleListener does not show dev

[tomcat] 01/03: Align with other languages

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit de456f50c85e7952275802863b2f9f61b949f9b0 Author: Mark Thomas AuthorDate: Tue May 25 20:44:40 2021 +0100 Align with

[tomcat] 02/03: Update import/export to handle POEditor behaviours

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 3199da4a8ba72112d882a9f23d65953d1954606b Author: Mark Thomas AuthorDate: Tue May 25 22:02:42 2021 +0100 Update

[tomcat] branch main updated (7929f10 -> 1bd131c)

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 7929f10 AprLifecycleListener does not show dev version suffix for libtcnative and libapr new de456f5 Align with

Re: POEditor translations currently corrupted

2021-05-25 Thread Mark Thomas
On 25/05/2021 18:16, Mark Thomas wrote: All, The translations we manage via POEditor are currently corrupted. This is entirely my fault. In trying to fix a small bug, I introduced a bigger one. No translations have been lost. Reverting my fix and re-exporting the translations from a clean

[tomcat] branch 8.5.x updated (018083f -> 8404dea)

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 018083f AprLifecycleListener does not show dev version suffix for libtcnative and libapr new 5ca6279 Update

[tomcat] 02/02: Back-port translation updates

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 8404deaf470081c29c981109f87995862245bcad Author: Mark Thomas AuthorDate: Tue May 25 22:28:27 2021 +0100 Back-port

[tomcat] 01/02: Update import/export to handle POEditor behaviours

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 5ca6279c7c23e2528ec0fc95894305fdf938760e Author: Mark Thomas AuthorDate: Tue May 25 22:02:42 2021 +0100 Update

[Bug 65329] Incorrect handling for WINVER in NMAKEmakefile

2021-05-25 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65329 --- Comment #1 from Michael Osipov --- Yet another resource: https://docs.microsoft.com/en-us/windows/win32/winprog/using-the-windows-headers -- You are receiving this mail because: You are the assignee for the bug.

buildbot success in on tomcat-85-trunk

2021-05-25 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2743 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The

[tomcat] 03/03: Add a couple of French translations

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 1bd131c126bb60b29cb677d3d107e3bb68c0a64a Author: Mark Thomas AuthorDate: Tue May 25 22:02:53 2021 +0100 Add a couple

[tomcat] 02/02: Back-port translation updates

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 626e0903f784d50b733ef7cec40ec48f94466de2 Author: Mark Thomas AuthorDate: Tue May 25 22:13:24 2021 +0100 Back-port

[tomcat] branch 10.0.x updated (f5e5091 -> 626e090)

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from f5e5091 AprLifecycleListener does not show dev version suffix for libtcnative and libapr new 43e919f Update

[tomcat] 01/02: Update import/export to handle POEditor behaviours

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 43e919f90952356513443c4ce804fe80c711c72f Author: Mark Thomas AuthorDate: Tue May 25 22:02:42 2021 +0100 Update

[tomcat] 02/02: Back-port updates to translations

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 83fd28ec2c3de0f91ee4e791b48d476fa5c9badc Author: Mark Thomas AuthorDate: Tue May 25 22:22:33 2021 +0100 Back-port

[tomcat] branch 9.0.x updated (9745d4b -> 83fd28e)

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 9745d4b AprLifecycleListener does not show dev version suffix for libtcnative and libapr new 5e4525c Update

[tomcat] 01/02: Update import/export to handle POEditor behaviours

2021-05-25 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 5e4525c4cf96954add9f116bdfb3782388f9d8e4 Author: Mark Thomas AuthorDate: Tue May 25 22:02:42 2021 +0100 Update