Commit Graph

1232 Commits

Author SHA1 Message Date
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:07:46 +02:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Simone Bordet 9fe5700260
Fixes #5880 - Move test-simple-webapp to demos. (#5881)
* Fixes #5880 - Move test-simple-webapp to demos.

Moved test-simple-webapp to demos under demo-simple-webapp.
Moved the JSP demos into their own module: out of demo-jetty-webapp into demo-jsp-webapp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 15:27:03 +01:00
Olivier Lamy 06df421b56
Remove javax.* dependencies (#5776)
remove non needed enforcer rule in websocket poms
force search transitive

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-22 08:17:16 +10:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Joakim Erdfelt d3f275ad4b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-16 09:58:46 -06:00
dependabot[bot] 991e23d80b
Bump openwebbeans.version from 2.0.19 to 2.0.20
Bumps `openwebbeans.version` from 2.0.19 to 2.0.20.

Updates `openwebbeans-web` from 2.0.19 to 2.0.20
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits/openwebbeans-2.0.20)

Updates `openwebbeans-jetty9` from 2.0.19 to 2.0.20
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits/openwebbeans-2.0.20)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-16 14:05:10 +00:00
Lachlan Roberts 8ff545f696 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2 2020-11-12 09:42:48 +11:00
Lachlan 23f75a395b
Merge pull request #5599 from eclipse/jetty-9.4.x-XML-Review
Fixes to XML formatting and comments.
2020-11-11 13:55:26 +11:00
Joakim Erdfelt 9e22260377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-10 12:12:39 -06:00
Joakim Erdfelt 21c27f6370
Fixing checkstyle violations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-10 06:33:04 -06:00
dependabot[bot] 949a89c15b
Bump geronimo-interceptor_1.2_spec from 1.1 to 1.2 (#5632)
Bumps geronimo-interceptor_1.2_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 16:34:46 +10:00
dependabot[bot] deef0b4e30
Bump geronimo-jcdi_2.0_spec from 1.1 to 1.3 (#5607)
Bumps geronimo-jcdi_2.0_spec from 1.1 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 14:26:52 +10:00
Lachlan Roberts bd553d98e5 fixing badly formatted XML comments
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:51:35 +11:00
Lachlan Roberts 4c172b5bbb Fix xml <Ref/> tags using id instead of refid.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:30:36 +11:00
Joakim Erdfelt 71ad5447a4
Merge remote-tracking branch 'origin/release-9.4.34' into jetty-9.4.x 2020-11-04 10:24:21 -06:00
Joakim Erdfelt 40bde46b13
Bump maven-antrun-plugin from 1.8 to 3.0.0
+ and update configuration/task to configuration/target

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-03 08:46:27 -06:00
Lachlan Roberts 8d21bb7b63 Issue #5320 - fix the XmlHttpClientProvider for jetty 10, re-enable tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-03 17:17:27 +11:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Lachlan Roberts 1b5747cbbe Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-03 01:17:31 +11:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Lachlan 12f3c450dc
Merge pull request #5374 from eclipse/jetty-9.4.x-5320-WebSocketHttpClient
Issue #5320 - using jetty-websocket-httpclient.xml within webapp
2020-11-03 00:30:09 +11:00
Lachlan Roberts 60c56d8856 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-02 23:43:42 +11:00
Simone Bordet 40fd98d6a9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-02 10:47:03 +01:00
dependabot[bot] 40acf60936
Bump geronimo-annotation_1.3_spec from 1.1 to 1.3 (#5552)
Bumps geronimo-annotation_1.3_spec from 1.1 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-02 19:31:04 +10:00
dependabot[bot] e70e995f0c
Bump openwebbeans.version from 2.0.18 to 2.0.19 (#5551)
Bumps `openwebbeans.version` from 2.0.18 to 2.0.19.

Updates `openwebbeans-web` from 2.0.18 to 2.0.19
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Updates `openwebbeans-jetty9` from 2.0.18 to 2.0.19
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-02 19:30:29 +10:00
Lachlan Roberts 59883af8bf update version to 9.4.34-SNAPSHOT
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-30 15:00:38 +11:00
Lachlan Roberts 3c3fcc311e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-30 12:43:31 +11:00
dependabot[bot] 0342bf517e
Bump geronimo-jcdi_2.0_spec from 1.2 to 1.3
Bumps geronimo-jcdi_2.0_spec from 1.2 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-26 06:23:26 +00:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
dependabot[bot] 5eeae2ad5c
Bump jsp-api from 2.1 to 2.2 (#5462)
Bumps jsp-api from 2.1 to 2.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 20:42:15 +10:00
Joakim Erdfelt 9ad6beb805
Merge pull request from GHSA-g3wg-6mcf-8jj6 2020-10-16 01:06:08 +02:00
Lachlan Roberts 4cb475c97d Issue #5320 - also test WebSocketClient on server from WEB-INF/lib
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:57 +11:00
Lachlan Roberts 6cd70ce136 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 2020-10-15 14:12:21 +11:00
Lachlan Roberts 26f4062d93 Parameterize testWebsocketClientInWebapp over both http and https
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 16:35:58 +11:00
dependabot[bot] 2919d565db
Bump geronimo-jcdi_2.0_spec from 1.1 to 1.2
Bumps geronimo-jcdi_2.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-12 06:22:46 +00:00
Joakim Erdfelt 345484929c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-08 08:53:15 -05:00
Joakim Erdfelt c2655295ac
Eliminating no-longer relevant comment
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 08:50:37 -05:00
Joakim Erdfelt fe03a3e6c2
Bump OpenWebBeans from 2.0.11 to 2.0.18
+ Brings in ServletContainerInitializer fix from 2.0.12

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 07:31:20 -05:00
Joakim Erdfelt 76eac0eeee
Merge pull request #5389 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.geronimo.specs-geronimo-atinject_1.0_spec-1.2
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2
2020-10-05 05:36:53 -05:00
dependabot[bot] 47c2f060eb
Bump javax.servlet-api from 3.1.0 to 4.0.1
Bumps [javax.servlet-api](https://github.com/javaee/servlet-spec) from 3.1.0 to 4.0.1.
- [Release notes](https://github.com/javaee/servlet-spec/releases)
- [Commits](https://github.com/javaee/servlet-spec/compare/3.1.0...4.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-05 06:25:42 +00:00
dependabot[bot] d987a0d94d
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-05 06:25:38 +00:00
Lachlan Roberts 5b96f6f984 Issue #5320 - Run jetty-websocket-httpclient.xml with server class access.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 12:38:17 +10:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Joakim Erdfelt 1233ae108e
Fixing bad html links 2020-09-30 09:23:35 -05:00
Lachlan Roberts 00f05cb94e Issue #5320 - reproduce failure to load httpClient for WebSocketClient in webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-30 15:11:05 +10:00
Joakim Erdfelt b22ce9c044
Reorg of /demos/ with focus on demo-spec downstream dependencies. (#5367)
* Reorg of /demos/ with focus on spec modules
* Reworking demo-mock-resources into /demos/ proper
* Removing old /tests/ modules that no longer have a reason for existing.
* Making demo-mock-resources a formal module
* demo-jndi and demo-spec now depend on it
* Restoring jetty-maven-plugin config lost in demo-jetty-webapp
* Fixing jetty-maven-plugin realm usage to be local

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:37:22 -05:00
Joakim Erdfelt ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-29 11:24:28 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358)
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:02:32 -05:00
Joakim Erdfelt 9e54e9a081
Post merge cleanup.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 18:04:20 -05:00
Joakim Erdfelt 3c7cd43148
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-28 17:55:41 -05:00
Joakim Erdfelt 8b1fcf0b58
Issue #5362 - Adding SslContextFactory.Client to Proxy's HttpClient (#5363)
- ProxyServletTest additions for server backend TLS
 - Updating test-proxy-webapp testing
 - Better class name for test
 - More documentation on purpose of test.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 17:39:59 -05:00
Joakim Erdfelt 2942b9ea74
Minor updates for demo-base
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 09:06:27 -05:00
Joakim Erdfelt faf6d80390
Issue #5264 - Moving demo webapps to /demos/ tree
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 13:35:19 -05:00
Greg Wilkins 5654437cc9 demo-jaas does not depend on demo-jndi
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-23 19:31:24 +02:00
Greg Wilkins 5332f3f685 demo-jaas depends on jaas
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-23 19:10:42 +02:00
Greg Wilkins eedcac314b Merge branch 'jetty-10.0.x' into jetty-10.0.x-5264-demo-modules 2020-09-23 15:27:56 +02:00
Joakim Erdfelt be07e84cd7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-22 09:15:59 -05:00
Joakim Erdfelt a99a832206
Issue #5137 - Cleanup of WebAppContextTest
+ Cleanup of test-servlet-spec webapp
+ Removing unused methods
+ Commented System.err.println moved to java.util.logging
+ General checkstyle cleanup (empty lines, spacing, etc)
+ Eliminate bogus WebApp LIB ordering tests.
+ No ClassLoader has a order guarantee.
+ Moving HttpSessionListenerTest contents to existing SessionListenerTest
+ Cleanup of SessionListenerTest with eye to resource cleanup
+ Removing ServletContextListenerTest as it duplicates tests
+ Restoring WebAppClassLoaderTest test method
+ `ordering()` is now `testClashingResource()` and properly
  tests assumptions when dealing with a ClassLoader.
  The old test assumed guaranteed order from a ClassLoader,
  which is not a feature of any Java ClassLoader.
  Especially so for URLClassLoader.
+ Restoring clashing resource test

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-22 08:46:11 -05:00
Greg Wilkins d1f6cbb9da added jndi and jaas dependencies
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-22 13:28:10 +02:00
Greg Wilkins 3768b09d6f added jstl
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-22 13:07:14 +02:00
Joakim Erdfelt 770f251cbb
Issue #5264 - Fixing demo-jndi deps for javax.mail
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 16:48:50 -05:00
Joakim Erdfelt c002305cb2
Issue #5264 - Fixing demo-jndi config
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 15:53:45 -05:00
Joakim Erdfelt 533d64cda1
Issue #5264 - Fixing deploy status on demo webapps
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 14:47:31 -05:00
Joakim Erdfelt 8a64309cdf
Issue #5264 - Reworking demo/tests into modules based on config classifiers
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 13:57:23 -05:00
gregw afe5044d8c Fixes #5281
Added work module to create work directory
reviewed by janbartel
2020-09-16 16:20:16 +02:00
Greg Wilkins 780e1207c7
Issue #5254 List/Show modules (#5257)
* Issue #5254 List/Show modules

 * simplified --list-modules output
 * added --show-module

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improve module descriptions

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-14 18:07:16 +02:00
gregw d7b3d62982 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-09-07 15:59:27 +02:00
Greg Wilkins 7ecf42e3f8
Issue #5162 CDI embedded integration improvements (#5177)
* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + made listener public
 + added utility class for SCIs

* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + moved EmbeddedWeldTest to jetty-embedded

* fix javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #5162 CDI embedded integration improvements

ventilated text

* fix test pom

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fixed javadoc

* Fixed javadoc

* Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded

* trailing new line

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Feedback from review
2020-09-07 14:00:20 +02:00
Joakim Erdfelt a54ed928ab
Issue #5174 - Reorganized jetty-distribution
+ Updating license / notice files for EPLv2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-03 07:13:58 -05:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Simone Bordet c49035570e Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'. 2020-08-04 16:32:55 +02:00
Greg Wilkins 7adbf247ec
Issue #5093 Static UrlEncoded (#5098)
* Issue #5093 Static UrlEncoded

Updated UrlEncoded to static only class with no synchronization

* Fixed additional tests

* fixed formatting

Signed-off-by: gregw <gregw@webtide.com>
2020-07-30 17:57:38 +02:00
Simone Bordet 8d69fc41a7 Fixes #5083 - Convert synchronized usages to AutoLock.
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
olivier lamy eefe3d202b revert fail release
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
Lachlan Roberts b033d6078f Issue #5012 - Remove unneeded dependency for test-jaas-webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-03 09:54:18 +02:00
Lachlan Roberts 6407322d9c Issue #5012 - Remove unneeded dependency for test-jaas-webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-02 11:15:34 +10:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00