Commit Graph

20418 Commits

Author SHA1 Message Date
Joakim Erdfelt 8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
       org.eclipse.jetty.util.log.Logger but as
  simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
  to org.eclipse.jetty.logging.StacklessLogging found in
  the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
  + and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
  + Also adding note to jetty-util classes that are used by
    jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 11:21:54 -05:00
Simone Bordet 5148bee8f2 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-16 11:23:32 +01:00
Simone Bordet bc60ff1c74 Fixes #4676 - ALPN support for Java 15.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-16 11:12:39 +01:00
Simone Bordet 665d1c8122 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-03-16 11:07:32 +01:00
Simone Bordet 4d6386d914 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-03-16 11:06:11 +01:00
Greg Wilkins ae0ec5db96 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-16 10:26:39 +01:00
Greg Wilkins ca74fbeb32 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-16 10:23:58 +01:00
Denny Abraham Cheriyan ce8d2ef168 Refactor CrossOriginFilter with small perf improvements (#4672)
* Refactor CrossOriginFilter

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>

* Fix checkstyle violation

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>
2020-03-16 10:23:04 +01:00
Denny Abraham Cheriyan fb00422fca
Refactor CrossOriginFilter with small perf improvements (#4672)
* Refactor CrossOriginFilter

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>

* Fix checkstyle violation

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>
2020-03-16 10:21:00 +01:00
Lachlan b497827df0
Merge pull request #4648 from eclipse/jetty-9.4.x-4645-forwardedPortException
Issue #4645 - better error message for empty X-Forwarded-Port value
2020-03-16 10:35:08 +11:00
Lachlan Roberts fcbe704b24 Issue #4645 - do not wrap exceptions from onError with RuntimeException
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-13 13:59:43 +11:00
Lachlan Roberts 633298b5c7 Issue #4645 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-11 22:41:31 +11:00
Lachlan Roberts d5ee7b058b Issue #4645 - handle exceptions from all headers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-11 18:41:41 +11:00
Lachlan Roberts dbd89ce1c7 Issue #4645 - validate port range & return 400 on bad forwarded headers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-11 18:31:25 +11:00
Lachlan b1d30fcd6d
Merge pull request #4588 from eclipse/jetty-10.0.x-4538-MessageReaderWriter
Issue #4538 - rework of websocket message reader and writers
2020-03-11 15:47:12 +11:00
Lachlan Roberts fef25e7825 Merge branch jetty-10.0.x into jetty-10.0.x-4538-MessageReaderWriter 2020-03-11 14:23:47 +11:00
Lachlan b0ddba49da
Merge pull request #4593 from eclipse/jetty-10.0.x-4571-MessageSink
Issue #4571 - websocket aggregating text and binary MessageSinks
2020-03-11 14:14:15 +11:00
Greg Wilkins 360b878d02 Fixed merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-03-10 15:43:10 +01:00
Greg Wilkins 28d6009ac5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-10 15:14:56 +01:00
Joakim Erdfelt 965483e4d9
Issue #4631 - Warning about skipping of <Arg> nodes is in wrong place for <Configure> (#4632)
* Issue #4631 - Fixing XML comment that was accidentally reformatted

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

* Issue #4631 - Warning about skipping of <Arg> nodes is in wrong place for <Configure>

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

* Issue #4631 - Improving testcase

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

* Issue #4631 - Removing test classes

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

* Issue #4631 - Cleaning up configure with index per PR review

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

* Issue #4631 - More named arg test cases

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

* Issue #4631 - Add testConfiguredWithNamedArgNotFirst

+ new testcase where <Arg> is needed, but is not the first node

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

* Cleanup configuration index usage

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

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2020-03-10 15:11:22 +01:00
Simone Bordet 678385bfda
Merge pull request #4554 from eclipse/jetty-10.0.x-2788-graceful_http2_close
Fixes #2788 - Graceful close of HTTP/2 Connection.
2020-03-10 14:58:41 +01:00
Jan Bartel dfa0e0adf7
Jetty 10.0.x 4507 forwardincludemappings (#4590)
* Issue #4507 Implement forward/include/async params for HttpServletMapping

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-10 11:05:52 +01:00
Lachlan d938fca513
Merge pull request #4627 from eclipse/jetty-10.0.x-4577-InetAccessHandler_getPathInfo
Issue #4577 - request getPathInfo() could be null in InetAccessHandler
2020-03-10 16:02:08 +11:00
Mattias Andersson 82247f257d Issue #4647 Hazelcast remote.xml configuration file do not configure hazelcast remote addresses (#4649)
* Fix for #4647

Signed-off-by: Mattias Andersson <andermaj@gmail.com>

Co-authored-by: Mattias Andersson <andermaj@gmail.com>
2020-03-10 10:35:48 +10:00
Mattias Andersson 9c3cfb92f9
Issue #4647 Hazelcast remote.xml configuration file do not configure hazelcast remote addresses (#4649)
* Fix for #4647

Signed-off-by: Mattias Andersson <andermaj@gmail.com>

Co-authored-by: Mattias Andersson <andermaj@gmail.com>
2020-03-10 10:33:13 +10:00
Simone Bordet 3a6c9b8049 Issue #2788 - Graceful close of HTTP/2 Connection.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-10 01:29:13 +01:00
Simone Bordet 916b3e56ec Merged 'jetty-10.0.x' into 'jetty-10.0.x-2788-graceful_http2_close'. 2020-03-09 20:01:25 +01:00
Jan Bartel dfd3875dbc
Jetty 10.0.x 4506 metadata complete (#4587)
* Issue #4506 Do not introspect annotations on metadata-complete fragments

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-09 15:34:04 +01:00
olivier lamy 7554a3a903 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-09 16:15:06 +10:00
olivier lamy 1c4a21c9be Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-03-09 14:28:53 +10:00
Lachlan Roberts 797d25505b Issue #4645 - better error message for empty X-Forwarded-Port value
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-09 13:01:52 +11:00
olivier lamy 67eb9b3531 use same version as in pom
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-08 21:10:39 +10:00
Simone Bordet 1a165aadec Using JDK 7 for javadocs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 22:05:43 +01:00
Simone Bordet 273b729803 Updated build to JDK 8 otherwise TLS communication with
Maven Central fails due to outdated TLS version/ciphers.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 21:15:13 +01:00
Simone Bordet 9182e30443 Fixed OSGi tests by overriding the Maven Central
location used by pax-exam.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 19:49:44 +01:00
Simone Bordet ac724a108d Ignored ExternalSiteTest for reliability.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 19:48:53 +01:00
Simone Bordet 36c7fe8d42 Updated URLs for Maven Central and GitHub.
From http://central.maven.org
to https://repo1.maven.org

From http://raw.githubusercontent.com/.../master/...
to https://github.com/.../raw/jetty-9.2.x/...

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 18:57:45 +01:00
Simone Bordet c1dc03a440 Issue #4443 - Track backport of ALPN APIs to Java 8
For Jetty 9.2.x, supporting the backport of the JDK ALPN APIs
of JDK 8u252 would have required a number of backports from
Jetty 9.4.x.
Rather than doing all that work for an EOL Jetty branch, we
instead excluded the modules/tests that required ALPN, so
that the Jetty 9.2.x branch can still be built with 8u252
or later, but it will lack some of the artifacts.
Users needing those artifacts are encouraged to move to
Jetty 9.4.x or later.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 18:53:49 +01:00
Olivier Lamy 3a77542303
upgrade shade plugin and align version (#4639)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-05 09:10:12 +10:00
Joakim Erdfelt f150062fde
Merge pull request #4629 from eclipse/jetty-9.4.x-4628-optional-depends
Issue #4628 - Non-Required Module Dependency Support
2020-03-03 11:44:49 -06:00
Joakim Erdfelt c08ca2a16e
Merge pull request #4630 from eclipse/jetty-9.4.x-4620-console-capture
Issue #4620 - Better support for alt PrintStream in StdErrLog
2020-03-03 11:43:55 -06:00
olivier lamy 6f19040094 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 21:05:49 +10:00
olivier lamy 77a54c21a1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-03-03 20:53:26 +10:00
Olivier Lamy 3a8b45d20c
Issue #4619 align derby version (#4626)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 10:20:27 +10:00
Lachlan 9ef7790e45
Merge pull request #4624 from eclipse/jetty-9.4.x-4123-OpenId_Docs
Issue #4123 - add documentation for OpenID to 9.4.x
2020-03-03 10:40:49 +11:00
Joakim Erdfelt f2a4c6b615
Issue #4620 - Better support for alt PrintStream in StdErrLog
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-02 12:03:37 -06:00
Joakim Erdfelt 1ee8c8ad3a
Issue #4628 - Non-Required Module Dependency Support
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-02 10:13:29 -06:00
Lachlan Roberts 2897377370 Issue #4577 - request getPathInfo() could be null in InetAccessHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-02 14:32:52 +11:00
Chris Walker cfacaca26d Docs for OpenID (#4610)
Co-authored-by: Lachlan <lachlan@webtide.com>
2020-03-02 10:56:19 +11:00
Lachlan Roberts af18fb35ad Merged branch 'jetty-9.4.x' into 'jetty-10.0.x' 2020-03-02 10:27:41 +11:00