Commit Graph

205 Commits

Author SHA1 Message Date
Simone Bordet f045b5a3ba
Issue #6473 - Improve alias checking in PathResource. (#6477)
* Issue #6473 - Improve alias checking in PathResource.

* Reverted %-escape handling for URI query parts.
* Performing canonicalization in ServletContext.getResource(),
  and improving alias checking in ContextHandler.getResource().
* Performing canonicalization checks in Resource.addPath() to avoid
  navigation above of the root.
* Test added and fixed.
* Various cleanups.
* Improved javadoc and comments

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2021-06-29 15:40:45 +02:00
Greg Wilkins 122a78aafc
Issue #6473 - canonicalPath refactor & fix alias check in PathResource (#6474)
Reduce multiple canonicalPath calls with single alias check in PathResource
Revert to decoding and the normalizing URLs so that subsequent canonicalPath calls are noops. 
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-28 17:10:11 +10:00
olivier lamy 0423ad36c1 use jackson-databind 2.9.10.7
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-19 09:33:59 +10:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 12:48:24 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06: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 227dd47157
Issue #5480 - Fail in jetty-maven-plugin if unable to create temp directory.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:29:22 -05:00
Joakim Erdfelt ef0618489a
Fixing EOL on groovy (again) 2020-10-08 14:50:02 -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
Lachlan Roberts de1b6745c5 the DO NOT EDIT comment in .mod files should start with '#'
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 16:47:22 +10:00
Lachlan Roberts ce7ef4396f Issue #4913 - jetty-maven-plugin recursively delete target jetty-base
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-27 14:05:36 +10:00
Olivier Lamy ea06ba1865
Issue #4699 fix jar files from multimodules not scanned (#4742)
* Issue #4699 fix jar files from multimodules not scanned

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

* fix license headers

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-02 08:06:10 +10:00
Simone Bordet 9bb92f81bd Issue #4443 - Track backport of ALPN APIs to Java 8.
Modified jetty-alpn-openjdk8-* classes to support both
pre 8u252 (via alpn-boot) and post 8u252 (via standard API).

Replaced usages of -Xbootclasspath with -javaagent, and
using Jetty ALPN Agent jar rather than Jetty ALPN boot jar.

Removed all alpn-1.8.0*.mod files since now it is
possible to use a fixed version of the ALPN Agent
to cover all the versions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:40:29 +01:00
Jesse McConnell 769cd9de69
Merge pull request #3364 from eclipse/jetty-9.4.x_maven_plugin_site
Issue #3247 Generate jetty-maven-plugin website
2020-01-31 07:14:24 -06:00
Joakim Erdfelt 8c65309963
Addressing Checkstyle violations in src/test/java
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
olivier lamy e1371a1c13 happy new year
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
Jan Bartel 0e6a1ce76b
Issue #4402 Fix NPE in JettyRunWarExplodedMojo (#4406)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-10 12:29:40 +11:00
Mat Booth c9a65c4676 Allow building against newest version of maven-artifact-transfer (#4381)
In later versions of maven-artifact-transfer the package names have
been refactored, this change accomodates for that.

Signed-off-by: Mat Booth <mat.booth@redhat.com>
2019-12-03 07:08:01 +10:00
Jan Bartel c440a3f972
Issue #4363 Restore contextXml config for jetty maven plugin (#4367)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 14:56:59 +11:00
Lachlan c336616c96
Issue #2709 - reduce default headerCacheSize to 1024 (#4292)
make headerCacheSize on HttpReceiverOverHTTP configurable

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-08 21:57:49 +11:00
Jan Bartel aefbdfca58
Issue #2266 Rework Scanner and use it for Jetty Maven Plugin (#4239)
* Issue #2266 Rework Scanner and use it for Jetty Maven Plugin

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 15:55:20 +11:00
Olivier Lamy fe3d3f7158
fix checkstyle in test sources (#4013)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 19:56:41 +10:00
Greg Wilkins dc939d753a
Issue #3804 - Update Decorator integration for various CDI implementations (#3838)
* Jetty Issue #3804 WELD-2587

Support CDI integration:
 + cdi2 module exposes jetty APIs
 + cdi module uses DecorationListener

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

* Jetty Issue #3804 WELD-2587

Remove DecoratingListener tests from test-jetty-webapp

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

* improve CDI test

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

* Jetty Issue #3804 WELD-2587

Reverted test to use released CDI and cdi2 module for now.
To test new mechanism, you need to build the weld snapshot locally,
rebuild and switch to cdi module

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

* remove cdi2 webapp references

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

* document attribute

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

* improved documentation

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

* logging

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

* improved javadoc

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

* Fixed version

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

* Reverted to also provide the DecoratingListener in the decorate module.
Renamed cdi-demo to weld-cdi-demo

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

* revert from Weld SNAPSHOT

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

* test all 3 weld integrations

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

* updated destory implementation to release creationalcontext

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

* reverted to released Weld version

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

* Issue #3804 CDI integration

dispose and release context in destroy

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

* Improved CDI module documentation

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

* WIP on OWB

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

* Updates from review
Parameterised CDITests

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

* share webapp resources for cdi webapp test

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

* Initialize OWB with a SCI so that listeners can be decorated

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

* Added OwbDecorator so that cdi2 module can be tested with OWB

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

* Lookup attribute name

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

* Cleanups

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

* Cleanup from Review

Don't do lazy bindings

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

* Cleanup from Review

Treat partial CDI same as no CDI

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

* fix maven it test no more need of weld-servlet

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

* cleanup it parent pom removing non needed weld servlet

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

* upgraded to Weld 3.1.2.Final

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

* Cleanup from Review

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

* Cleanup from Review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-08 04:04:07 +02:00
olivier lamy 9950f6b528 yes this one was a really bad idea...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-06 09:25:10 +10:00
Joakim Erdfelt 4d2c981718 Can't mirror 'central' to local repo for it tests, it wont download new dependencies then 2019-08-05 12:17:37 -05:00
Olivier Lamy 1b6bf389d6
Jetty 9.4.x pax exam upgrade for central repo https, pre download all artifacts for maven its (#3902)
* ensure we use local repository first to avoid download, upgrade pax versions
pre download artifacts to avoid download by maven invoker its

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

* force using local repository first see https://issues.apache.org/jira/browse/MINVOKER-249

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

* use local setttings to use mirrors

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

* use https

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

* install build resources first to avoid checkstyle build issue

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

* downgrade pax-swissbox-framework as the pax exam seems to use this one and want to download it...

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

* fix enforcer rule RequireUpperBoundDeps...

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

* not used anymore

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

* force pax url to use provided settings via Jenkins withMvn

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

* renove debugging System.out

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

* version is defined in the project

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

* cleanup after Jan review comments

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-30 11:13:54 +10:00
Greg Wilkins 9706d70484
Jetty 9.4.x reformat (#3811)
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
  internal default values.
  We want to keep those values as a hedge against future default
  value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
Joakim Erdfelt 877815e195 Issue #3708 - Adding new methods and converting codebase to use them
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 09:56:41 -05:00
Simone Bordet a510ed31cb Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Fixed references to deprecated methods WebAppContext.prependServerClass(),
WebAppContext.addServerClass() and WebAppContext.addSystemClass().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-07 09:22:31 +02:00
Miron Balcerzak 4c11f245c9 Fixes #3332 jetty-maven-plugin - transitive deps in single war project (#3349)
* Issue #3332 jetty-maven-plugin - transitive deps in single war project

Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>

* Issue #3332 jetty-maven-plugin - code review fixes

Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>

* Issue #3332 jetty-maven-plugin - code review fixes

Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>
2019-05-30 20:12:47 +10:00
Olivier Lamy 45468988ea
Issue #3583 maven plugin do not use testOutputDirectory directory for test dependencies within reactor (#3606)
* Issue #3583 maven plugin do not use testOutputDirectory directory for test dependencies within reactor

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

* use same spaces formatting

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-09 07:00:20 +10:00
Joakim Erdfelt 1f046f44fe Fixing CRLF issues.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 15:24:29 -05:00
Joakim Erdfelt edaefdbb3b Fixing CRLF files 2019-04-03 11:56:07 -05:00
olivier lamy 8973f01dc4 ensure we use a random for this integration test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-18 17:28:51 +10:00
olivier lamy 412d493f2c Issue #3247 Generate jetty-maven-plugin website use eclipse-release profile to trigger site generatation and add jetty-jspc plugin site as well
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-16 09:08:49 +10:00
olivier lamy 9e634feed2 Issue #3247 Generate jetty-maven-plugin website
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-15 07:06:37 +10:00
Olivier Lamy 34b2678e6d
issue #3254 add jsp test need to remove cdi-api and exclude it fron upperBound rule (#3268)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-24 14:34:41 +10:00
Olivier Lamy 69dc0059d1
use jackson-databind 2.9.8 (#3252)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-10 22:12:12 +13:00
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
Olivier Lamy 72ebcc51af
interpolate version from main pom for maven plugin it test (#3223)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:55:31 +10:00
Olivier Lamy f26b9f7c15
issue #3186 add it to override javax.annotation provided by maven core (#3194)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-15 12:35:16 +10:00
Greg Wilkins 161f1698cf
Jetty 9.4.x 3018 request logging bad messages (#3020)
Issue #3018 improve logging and handling of slow data rates.

* Slow data rates now result in aborted channels, but exception is still thrown.  Test for 408 in requestLog
* Updated many RequestLog usages to use Server.setRequestLog rather than a RequestLogHandler
* Fixed javadoc
* removed BadRequestLogHandlerTest (tested in RequestLogTest)
* added JMH to show the future of request logging for #113
* copyright header.
* Updates from review
* Revert to throwing BadMessageException
* BME ensures a 408 is logged rather than a 500

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-01 17:06:04 +01:00
Olivier Lamy 8500e806ec
align used algorithm to detect java bin to use (#3025)
add javaPath for JettyRunDistro mojo to force a java executable to use

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-24 19:02:31 +10:00
Olivier Lamy 211f3d928b
upgrade jackson-databind in maven it to 2.9.7 (#2993)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-17 11:45:42 +10:00
Olivier Lamy 08d0092cbd
add a sys property with the it so we know which one fail otherwise it is always same name in jenkins (#2928)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-25 20:52:49 +10:00
Olivier Lamy cfe7fa1cb2
Issue #2906 excluded reactor projects with provided scope (#2914)
* Issue #2906 excluded reactor projects with provided scope

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

* avoid test project within reactors to be in the classpath

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-18 21:17:25 +10:00
Olivier Lamy 1b330f2efc
inherit plugin versions from main pom (#2897)
* inherit plugin versions from main pom

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-11 21:05:37 +10:00