Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,366 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

1666 Commits

Author SHA1 Message Date
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180) 
* Updating to version 10.0.11-SNAPSHOT
 2022-06-21 14:41:41 +02:00
Greg Wilkins 8d06ffad1b fixed bad merge 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-06-01 17:46:16 +10:00
Joakim Erdfelt 7c3a7c6444
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-05 15:35:40 -05:00
dependabot[bot] ebd82035fd
Bump org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5 (#7877) 
* Bump org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5

Bumps org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5.

---
updated-dependencies:
- dependency-name: org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

* Bump org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5 (#7878)

* Bump org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5
* Fixing dependency upper bounds
* Remove wrapping of conscrypt jar as it now has appropriate manifest.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
 2022-05-05 15:21:25 -05:00
Joakim Erdfelt 16420f0181
Set version to `10.0.10-SNAPSHOT` (#7823) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-04-03 20:33:44 +10:00
Joakim Erdfelt f079949a35
Merge Release 10.0.9 (#7821) 
* Updating to version 10.0.9

* Updating to version 10.0.10
 2022-04-02 08:43:44 -05:00
Joakim Erdfelt 9548ab0cc9 Updating to version 11.0.10-SNAPSHOT 2022-03-30 13:06:46 -05:00
Joakim Erdfelt 243a48a658 Updating to version 11.0.9 2022-03-30 12:43:51 -05:00
Joakim Erdfelt cc0eb6e468
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-30 09:13:38 -05:00
dependabot[bot] 6b25c271b1
Bump jolokia-war from 1.3.3 to 1.7.1 (#6907) 
* Bump jolokia-war from 1.3.3 to 1.7.1

Bumps jolokia-war from 1.3.3 to 1.7.1.

---
updated-dependencies:
- dependency-name: org.jolokia:jolokia-war
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

* Adding HashLoginService to jolokia.xml
* Fixing typo in FQCN for Jetty Password utility
* Using logger to print warning, not ServletContext.log() as it causes an NPE.

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-03-29 21:04:35 -05:00
dependabot[bot] 6c866b90c3
Bump org.eclipse.osgi from 3.17.100 to 3.17.200 (#7759) 
Bumps org.eclipse.osgi from 3.17.100 to 3.17.200.

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-21 07:55:50 -05:00
dependabot[bot] 48fa202d91
Bump org.eclipse.osgi from 3.17.100 to 3.17.200 
Bumps org.eclipse.osgi from 3.17.100 to 3.17.200.

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-16 09:33:40 +00:00
Olivier Lamy 5b3c50bc66 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-03-09 15:40:09 +10:00
Olivier Lamy 3d4b68d0bc
remove some site configuration, non used checkstyle profile and turn skip xml into one line property (#7687) 
* remove some site configuration, non used checkstyle profile and turn skip xml into one line property

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-03-05 19:47:32 +10:00
Jan Bartel eaf34b55f1 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-02-22 10:50:56 +01:00
Jan Bartel 808b74ff34
Issue #7632 Make osgi build work with snapshot jsp jars (#7633) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2022-02-22 10:47:12 +01:00
Simone Bordet 4e02be57fd
Updating to version 11.0.9-SNAPSHOT 2022-02-07 12:42:04 +01:00
Simone Bordet 79cc9cf90e
Updating to version 11.0.8 2022-02-07 12:10:09 +01:00
Simone Bordet a4fda96f49
Updating to version 10.0.9-SNAPSHOT 2022-02-07 12:02:02 +01:00
Simone Bordet 716c7afd8e
Updating to version 10.0.8 2022-02-07 11:34:12 +01:00
Joakim Erdfelt be58156c77
Happy New Year 2022 (#7460) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-01-27 10:42:43 -06:00
Joakim Erdfelt cb127793e5
Happy New Year 2022 (#7459) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-01-27 10:42:30 -06:00
Simone Bordet 61c615d10b
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-09 09:29:56 +01:00
dependabot[bot] 05d9febeaf
Bump org.eclipse.osgi from 3.17.0 to 3.17.100 (#7239) 
Bumps org.eclipse.osgi from 3.17.0 to 3.17.100.

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-08 09:47:58 -06:00
Jan Bartel 672de5ab4d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-12-08 09:41:46 +11:00
Jan Bartel 9bd1e436c5
Issue #7132 Update demos (#7133) 
* Issue #7132 Update demos
 2021-12-08 09:18:50 +11:00
Lachlan Roberts 031022649f Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-12-01 10:52:49 +11:00
Lachlan Roberts 63069ad28a Issue #7124 - deprecate AbstractLifeCycleListener 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-11-25 10:01:52 +11:00
Jan Bartel 67883dea76 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-02 16:05:45 +11:00
Jan Bartel e0d465e39a
Issue #7012 Replace geronimo spec jars with jakarta equivalents (#7013) 
* Issue #7012 Replace geronimo spec jars with jakarta equivalents

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-11-02 10:37:27 +11:00
Joakim Erdfelt b67ffd3d2d Updating to version 11.0.8-SNAPSHOT 2021-10-06 15:16:07 -05:00
Joakim Erdfelt 389a358772 Updating to version 11.0.7 2021-10-06 14:58:52 -05:00
Joakim Erdfelt cfc67f86d2 Updating to version 10.0.8-SNAPSHOT 2021-10-06 14:51:32 -05:00
Joakim Erdfelt da8a4553af Updating to version 10.0.7 2021-10-06 14:32:37 -05:00
Olivier Lamy 4011f1e71e
merge jetty-10.0.x (#6945) 2021-09-30 20:41:49 +10:00
Olivier Lamy 51d44a3401
use dependencyManagement for internal dependencies (#6940) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-09-30 16:57:19 +10:00
Joakim Erdfelt 85c7250d1a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-22 17:10:49 -05:00
Joakim Erdfelt a63005a907
Changes from review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-09-22 14:39:38 -05:00
Joakim Erdfelt 9c17fbe0b5
Revert accidental indentation change 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-09-22 10:47:41 -05:00
Joakim Erdfelt 5b6c3f145c
More artifact cleanup javax.* to jakarta.* 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-09-22 10:41:30 -05:00
Joakim Erdfelt 8dd62838f7
Initial cleanup / reorg of dependencies 
+ All plugins and dependencies are alphabetized now
+ All plugins and dependency versions have properties now

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-09-22 09:54:52 -05:00
Greg Wilkins aa793eeafe
Jetty 10.0.x 6497 alias checkers alt (#6681) 
* Issue #6497 - Replace the Alias checkers with new implementation.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
 2021-09-21 18:35:51 +10:00
Joakim Erdfelt 4cef5b0a7e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-15 12:37:14 -05:00
dependabot[bot] 809b0cf36a
Merge pull request #6845 from eclipse/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi.util-3.6.100 2021-09-15 13:03:02 +00:00
dependabot[bot] c71fc63a2f
Bump org.eclipse.osgi.util from 3.6.0 to 3.6.100 
Bumps org.eclipse.osgi.util from 3.6.0 to 3.6.100.

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.util
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-15 10:15:59 +00:00
dependabot[bot] 11624a1671
Bump org.eclipse.osgi from 3.16.300 to 3.17.0 
Bumps org.eclipse.osgi from 3.16.300 to 3.17.0.

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-15 10:15:55 +00:00
dependabot[bot] f2c553dad9
Bump org.eclipse.osgi.services from 3.10.100 to 3.10.200 
Bumps org.eclipse.osgi.services from 3.10.100 to 3.10.200.

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.services
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-15 08:46:00 +00:00
Olivier Lamy d90c7152d5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-09-14 06:21:42 +10:00
dependabot[bot] b44dde6098
Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 (#6755) 
* Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0

Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M3...enforcer-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* fix some upper bound issues and exclude more javax

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix upperbound dependencies issue with enforcer plugin upgrade

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* exclude this wrong which makes enforcer plugin fail and btw it's not used

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix last enforcer upperbound issues

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-09-14 06:10:48 +10:00
Jan Bartel 0a27d7aee3 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-13 10:16:39 +10:00
Jan Bartel be27be49d2
Issue #6772 Update to asm 9.2, spifly 1.3.4 (#6773) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-09-13 10:15:40 +10:00
Jan Bartel 7235418937 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-13 10:15:22 +10:00
Jan Bartel c8654c81da
Issue #6770 Update to various osgi test dependencies (#6771) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-09-13 10:14:06 +10:00
dependabot[bot] d459b94542
Bump biz.aQute.bndlib from 5.2.0 to 5.3.0 (#6722) 
Bumps [biz.aQute.bndlib](https://github.com/bndtools/bnd) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd:biz.aQute.bndlib
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-08 12:39:38 -05:00
Joakim Erdfelt afa8a43009
Merge branch 'jetty-11.0.x' of github.com:eclipse/jetty.project into jetty-11.0.x 2021-07-28 05:51:19 -05:00
Joakim Erdfelt 26b4a1143e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-28 05:50:15 -05:00
Ludovic Orban 489f93a096 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-07-28 10:55:20 +02:00
Joakim Erdfelt fdc210f382
Remove unused imports 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-27 08:03:00 -05:00
Joakim Erdfelt 7d47ca9d9f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-23 12:55:42 -05:00
Joakim Erdfelt 43954e7325
Fix javadoc issues 
+ <td valign=""> attribute not supported
+ bad </p> in @param tag

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-22 07:46:00 -05:00
Joakim Erdfelt 102caac3fe Updating to version 11.0.7-SNAPSHOT 2021-06-29 11:40:18 -05:00
Joakim Erdfelt 6946943289 Updating to version 11.0.6 2021-06-29 11:15:33 -05:00
Joakim Erdfelt c245a70893 Updating to version 10.0.7-SNAPSHOT 2021-06-29 10:51:22 -05:00
Joakim Erdfelt 37e7731b4b Updating to version 10.0.6 2021-06-29 10:27:56 -05:00
Jan Bartel 73195f3bb2 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-22 16:33:56 +10:00
Jan Bartel c9d919a299
Issue #6426 Upgrade to spifly 1.3.3 (#6449) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-06-22 16:28:59 +10:00
Jan Bartel b122077471
Issue #6394 Review osgi manifests (#6408) (#6428) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-06-21 15:37:29 +10:00
Jan Bartel f1e3a9ecce
Issue #6394 Review osgi manifests (#6408) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-06-18 09:30:18 +10:00
Joakim Erdfelt 89d2ea0192 Updating to version 11.0.6-SNAPSHOT 2021-06-11 10:12:15 -05:00
Joakim Erdfelt 50df216262 Updating to version 11.0.5 2021-06-11 09:52:40 -05:00
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Simone Bordet d8d7b95844 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-06-11 14:44:04 +02:00
Simone Bordet 8774ccaa0f Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-06-10 18:30:18 +02:00
Joakim Erdfelt 1223bb50ec Issue #6354 - fix bad slf4j reference in jetty-osgi-boot-jsp 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-06-10 18:13:15 +02:00
Joakim Erdfelt d997a1171b
Issue #6354 - OSGI manifest for slf4j-api packages lower limit should be 1.7 (#6381) 
Issue #6354 - OSGI manifest for slf4j-api packages lower limit should be 1.7

* Fixed OSGi manifest in all jars.
* Make osgi tests work with slf4j < 2.0.0. 
This required to remove the dependency on SLF4J from the demos.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
 2021-06-10 16:04:50 +02:00
Joakim Erdfelt 063e8c80d5 Updating to version 11.0.5-SNAPSHOT 2021-06-04 13:53:06 -05:00
Joakim Erdfelt 5bcdeb52ae Updating to version 11.0.4 2021-06-04 13:35:11 -05:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet a83bff553c Updated POM versions to 11.0.4-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-21 17:16:21 +02: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 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-03-26 16:15:49 +10: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 e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05: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 47a90beab5
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-03 14:47:48 -06:00
Joakim Erdfelt 1cb0a4978f
Merge pull request #6022 from eclipse/jetty-10.0.x-better-xml-path-resolution 
Issue #6021 - PoC for resolvePath within XmlConfiguration
 2021-03-03 12:24:25 -08:00
Jan Bartel 75a486ea6a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-03 11:23:23 +01:00
Jan Bartel 599b4762b9
Issue #6011 Fix configurations in jetty.xml baked into org.eclipse.jetty.osgi.boot (#6012) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-03-03 11:16:22 +01:00
Joakim Erdfelt 613e0ecd54
Issue #6021 - PoC for resolvePath within XmlConfiguration 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-03-02 14:40:36 -06:00