Commit Graph

1529 Commits

Author SHA1 Message Date
Joakim Erdfelt 10136235b2
Happy New Year 2021 (Jetty 11 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:22:28 -06:00
olivier lamy aa150d395c Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-14 09:24:50 +10:00
olivier lamy 0c1f9636b3 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-14 09:24:17 +10:00
Olivier Lamy 9343844f15
Jetty 9.4.x spotbug issue map iteration using entrySet(), diamond list creation (#5804)
* fix some spotbug performance map iterations

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

* cannot use computeIfAbsent because it is a PathMap

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-14 08:46:35 +10:00
Joakim Erdfelt d5b08ea9f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-11 11:40:10 -06:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text
Issue #5784 - fix dual license text
2020-12-11 11:37:58 -06:00
olivier lamy efe4f5e5ea Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-11 12:11:53 +10:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735)
* enable spotbugs in CI

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

record issues

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

use warning new generation

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

activate errorprone

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

fix Jenkinsfile

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

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

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

junit should allow empty results

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

maven console can be use only once...

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

one liner

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

recordissues only once

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

force id

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

aggregate results

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

configure a name for aggregated reports

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

mo more -T3 no need anymore of remote session test profile

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

I want to see what failing tests look like with new report.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

skip spotbugs for jetty-jmh

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

get rid of findbugs as we now have spotbugs

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

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

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

make pmd quiet for CI

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

remove -fae flag and do not display transfer progress

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

try junitParser() to see what it does

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

junit parser is a bad idea...

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

increase timeout

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

no -T2 for javadoc

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

fix skip spotbugs and pmd verbose

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

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 11:47:26 +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 d0572ada58
Merge remote-tracking branch 'origin/release-11.0.0' into jetty-11.0.x 2020-12-09 15:28:50 -06:00
Jan Bartel c4f8afc178
Fix Servlet 5 Schema redirects (#5765)
* Issue #5752 Fix servlet 5 redirects; update default servlet version

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-08 16:24:29 +01:00
Joakim Erdfelt 30bd8b9fba Updating to version 11.0.1-SNAPSHOT 2020-12-02 15:59:13 -06:00
Joakim Erdfelt 432f896d7a Updating to version 11.0.0 2020-12-02 15:35:56 -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
Simone Bordet fa232a4684 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 16:38:18 +01:00
Ludovic Orban aa8bd5d820 replace Trie interface and impls usage with new *Index interfaces and Builders
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-26 14:14:16 +01:00
Joakim Erdfelt fe0a4f624e
Merge remote-tracking branch 'origin/release-9.4.35' into jetty-9.4.x 2020-11-25 15:56:09 -06:00
Joakim Erdfelt 3fbd5eb4a4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-24 13:36:42 -06:00
Joakim Erdfelt 3f5fe03a32
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-24 13:30:03 -06:00
Joakim Erdfelt 1c7c924228
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2020-11-24 13:29:46 -06:00
Joakim Erdfelt 4582088d89
Reducing test disk space usage on CI
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-24 13:29:34 -06:00
gregw 0a70cba8ae Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-11-24 18:36:24 +01:00
Greg Wilkins 9f82ca0a80
Use File.list and File.walk within a try with resource (#5718)
* Use File.list and File.walk within a try with resource

The API contract of File.list and File.walk requires them to be closed after use.

* Fix from review

Left out filter

* Fix from review

Factored out deleteFile with better debug

* Fix from review

Can delete files whilst walking

* Fix from review

Restored sweepFile
fixed minor code suggestions
2020-11-24 18:12:42 +01:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
olivier lamy 0d40a210fc Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-11-18 21:29:20 +10:00
Olivier Lamy 33f413b37a
Jetty 10.0.x surefire upgrade and no skip errors (#5438)
* fix apacheds version

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

* get some logs

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

* more debug

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

* testing surefire M5

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

* already part of the classpath

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

* add slf4j-simple to get logs

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

* execute full build

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

* no need to add jmx module

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

* use h2spec-reports

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

* h2 spec tests are too flaky

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

* debug

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

* touch trigger build

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

* not trim stacktrace per default and a bit more memory for test

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

* disable embedded jmx test

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

* nit

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

* no junit files for javadoc

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

* fix dependency version

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

* fix missing dependency with surefire M5...

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

* remove debug

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

* fix some upperbound dependency

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

* fail quickly

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-18 21:26:38 +10:00
Joakim Erdfelt fd974c474c
Fixing bad Container Include Jar pattern.
+ It was matching on jetty-util-ajax-#.jar as well.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:23 -06:00
Joakim Erdfelt c511275580
Provide more detail in test failure on CI
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:22 -06:00
Joakim Erdfelt a2825950fc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-10 12:17:33 -06: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 30e9cef71d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-04 10:30:02 -06: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
Greg Wilkins 1904d326fc
Fixes #5521 ResourceCollection NPE (#5527)
* Fixes #5521 ResourceCollection NPE

Fix constructor and addPath so that all resources in a RC must exist when created.

* Fixes #5521 ResourceCollection NPE

Cleanup the vestiges of non existent directories detected by resource ending in /

* Fixes #5521 ResourceCollection NPE

Revert adding paths ending in / as jar:file resource needs them

* feedback from review

improved javadoc.
2020-11-04 08:56:17 +01:00
Joakim Erdfelt 27c5b24521
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-03 13:51:24 -06:00
Joakim Erdfelt 0bb5e8c4b1
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-03 13:51:03 -06:00
Greg Wilkins f88f09a148
SessionCookieConfig name may be null (#5557)
* SessionCookieConfig name may be null

Protect against NPE by make a null name in SessionCookieConfig deactive session cookies.

* SessionCookieConfig name may be null

Protect against NPE by make a null name in SessionCookieConfig deactive session cookies.

* SessionCookieConfig name may be null

Protect against NPE by make a null name in SessionCookieConfig deactive session cookies.

* feedback from review

added static method to convert null name to default.
2020-11-03 16:22:26 +01:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06: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
Joakim Erdfelt 611c00d431
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-20 17:36:26 -05:00
Joakim Erdfelt 05f08fec4c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-20 17:35:56 -05:00
Joakim Erdfelt fa6c8f7dec
Issue #5480 - Only delete non-persist temp dir if not-empty
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 17:19:54 -05:00
Joakim Erdfelt c7ae5b50ab
Issue #5480 - Safer temp directory management
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:53:09 -05:00
Joakim Erdfelt 6be6fae291
Issue #5480 - NPE Check in WebInfConfiguration.deconfigure()
+ Removing Temp dir deletion in configureTempDirectory()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:30:39 -05:00
Joakim Erdfelt 8c5c589b31
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 17:51:50 -05:00
Joakim Erdfelt 1e9c736692
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 17:51:32 -05:00