Commit Graph

20636 Commits

Author SHA1 Message Date
Simone Bordet 10f4fda0de Issue #4691 - Use MethodHandles.lookup() consistently in WebSocket code.
* Using MethodHandles.publicLookup().in(...) instead of privateLookupIn(...).
* Moved test WebSocket EndPoint classes into the proper package, otherwise
  they would not be accessible because the test package is not exported.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-22 16:42:13 +01:00
Joakim Erdfelt fc722bff22
Issue #4620 - support alt PrintStream in StdErrAppender properly
+ The console-capture jetty module will reset System.err to
  RollingFileOutputStream.  But that's too late, as StdErrAppender
  has already grabbed and is holding onto the System.err from
  earlier, which means it is not writing to the new System.err.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-21 13:51:42 -05:00
olivier lamy 6c5c98b266 cleanup duplicate dependencies
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-21 15:13:28 +10:00
Chris Walker da3bd1da8b Merge branch 'jetty-9.4.x' into jetty-10.0.x
# Conflicts:
#	jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc
#	jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartFormInputStreamTest.java
2020-03-20 14:30:22 -05:00
Chris Walker 34488b71b6
Updating Weld documentation. Resolves #3935 2020-03-20 14:26:13 -05:00
Joakim Erdfelt e385dea838
Do not deploy websocket test projects
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 14:04:04 -05:00
Joakim Erdfelt 7e0fff9a89
Merge pull request #4686 from eclipse/jetty-10.0.x-4685-slf4j-impl-not-included
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
2020-03-20 12:04:32 -05:00
Joakim Erdfelt 8456fcd039
Issue #4685 - Adding jetty-slf4j-impl to test wars WEB-INF/lib/
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:24:15 -05:00
Joakim Erdfelt 891aaa4ca7
Issue #4685 - Removing exclusion on jetty-slf4j-impl
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:23:53 -05:00
Joakim Erdfelt 43419802b7
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:12:08 -05:00
Joakim Erdfelt 99f1f8b897
Issue #4685 - Cleanup from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:07:25 -05:00
Joakim Erdfelt 9492a5379c
Issue #4685 - eliminate <version> in jetty-slf4j-impl
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 10:42:36 -05:00
Joakim Erdfelt 44d2171986
Issue #4685 - jetty-http-spi logging for both jetty and jul
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 10:05:32 -05:00
Joakim Erdfelt 2c600f2b68
Issue #4685 - Mark jetty-slf4j-impl as test scope by default
+ Update logging in test-hazelcast-sessions
+ Update logging in test-infinispan-sessions

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 09:55:15 -05:00
Simone Bordet 09d8688586
Merge pull request #4670 from eclipse/jetty-10.0.x-4382-h1_to_h2_upgrade
Issue #4382 - Support HTTP/1 upgrade to HTTP/2 in HttpClient.
2020-03-20 11:21:20 +01:00
Lachlan Roberts 04cecaaaef Issue #4340 - Change usages to more closely follow previous behaviours
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-20 17:02:49 +11:00
Olivier Lamy e05712c26b
upgrade openwebbeans-web to 2.0.15 (#4666)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-20 10:16:12 +10:00
Joakim Erdfelt 874ae80ba4
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
+ Mark as a test dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 18:49:51 -05:00
Joakim Erdfelt a16abe1693
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
+ Mark as a test dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 17:46:41 -05:00
Simone Bordet 1326700772 Issue #4382 - Support HTTP/1 upgrade to HTTP/2 in HttpClient.
Added comments and fixed logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-19 23:10:03 +01:00
Simone Bordet 9cbd9ab44e Merged 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'. 2020-03-19 18:17:57 +01:00
Simone Bordet fda99cfd1e Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4628-start-module-non-required'. 2020-03-19 11:06:09 +01:00
Simone Bordet 3fcc2edeea Issue #4628 - Add support for conditional module dependencies in jetty-start.
Updated after review.
Renamed isRequiredModule() -> isConditionalModule() and inverted
expressions that were using the method.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-19 10:08:32 +01:00
Lachlan 6dc5792301
Merge pull request #4680 from eclipse/jetty-9.4.x-4673-MultiPart
Issue #4673 - fix MultiPart parsing for content split in boundary
2020-03-19 08:49:07 +11:00
Olivier Lamy 0541c5efb4
fix javadoc aggregate generation by using last maven javadoc plugin 3.2.0 (#4675)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-19 07:06:13 +10:00
Simone Bordet b22c0b196f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-18 17:00:01 +01:00
Simone Bordet 42c4d9b38a Issue #4443 - Track backport of ALPN APIs to Java 8.
Updated documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-18 16:41:02 +01:00
Simone Bordet 91c1b52e66
Merge pull request #4678 from eclipse/jetty-9.4.x-4443-alpn-backport-8u252
Issue #4443 - Track backport of ALPN APIs to Java 8.
2020-03-18 15:35:31 +01:00
Simone Bordet 1be2f47424 Issue #4443 - Track backport of ALPN APIs to Java 8.
Improved logging after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-18 15:32:28 +01:00
Simone Bordet 2940eb8ab5 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'. 2020-03-18 11:44:06 +01:00
Simone Bordet f8d9f82eff Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'. 2020-03-18 11:40:11 +01:00
Simone Bordet 6df47dd183 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4443-alpn-backport-8u252'. 2020-03-18 10:57:23 +01:00
Lachlan Roberts c658ae7056 Issue #4673 - fix MultiPart parsing for content split in boundary
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-18 11:22:40 +11:00
Simone Bordet 8a5fc6375b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-17 23:42:29 +01:00
Simone Bordet 785b640327 Fixes #2896 - Wrong Certificate Selected When Using Multiple Virtual Host Names in Conscrypt
Updating to a Conscrypt version that supports this feature.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 23:40:38 +01:00
Lachlan a9ef2d0d74
Merge pull request #4664 from eclipse/jetty-9.4.x-4650-RemoteEndpointFactory
Issue #4650 - do not use ServiceLoader every time a WSSession is started
2020-03-18 09:39:06 +11:00
Simone Bordet 2bc8f361a6 Issue #4382 - Support HTTP/1 upgrade to HTTP/2 in HttpClient.
Updated after first review.
Added more tests, fixed the upgrade over TLS case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 18:49:57 +01:00
Jan Bartel 1358e5d881 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-17 12:20:29 +01:00
Jan Bartel a8a9dbbc08
Issue #4644 Allow jetty-env EnvEntry to override empty env-entry (#4660)
* Issue #4644 Allow jetty-env EnvEntry to override empty env-entry

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-17 11:47:15 +01:00
Simone Bordet c224b88e58 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-03-17 11:45:06 +01: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
Simone Bordet adb0b06c8f Issue #4443 - Track backport of ALPN APIs to Java 8.
Continuous integration builds for Jetty 9.3.x are now done with Java 9.
Jetty 9.3.x needs Java 9+ to be built in order to build also the ALPN
modules that depend on Java 9 APIs.
Jetty 9.3.x would not be buildable with OpenJDK 8u252 or later,
but it is an EOL branch and required Java 9 to be built anyway.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:36:00 +01:00
Greg Wilkins e35b3b29d6
Issue #4656 generalise XmlConfiguration elements (#4661)
* Issue #4656 generalise XmlConfiguration elements

Extended the use of Id, Class elements

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

* Issue #4657 Validation in XmlConfiguration

Default to validate if xerces is in the name
Fixed test harness to prepend DTD.

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

* Issue #4657 Validation in XmlConfiguration

WIP on adding validation to XMLs

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

* Issue #4656 - Fix bad xml id attribute usage in jetty-maven-plugin

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

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-17 09:38:21 +01:00
Lachlan Roberts 9363a3c39a Issue #4340 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-17 15:14:52 +11:00
Lachlan Roberts 30d36ed68c Merge branch jetty-10.0.x into jetty-10.0.x-4340-ServiceLoader
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-17 15:00:30 +11:00
Lachlan def7993ebb
Merge pull request #4669 from eclipse/jetty-10.0.x-WebSocket-JPMS
websocket JPMS fixes to not export websocket-core
2020-03-17 14:26:34 +11:00
Lachlan Roberts e050160101 Merge branch jetty-10.0.x into jetty-10.0.x-WebSocket-JPMS
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-17 11:07:29 +11:00
Lachlan 32c9981529
Merge pull request #4674 from eclipse/jetty-9.4.x-4671-CustomRequestLog-CookieNPE
Issue #4671 - fix NPE from CustomRequestLog logRequestCookie
2020-03-17 11:01:50 +11:00
Joakim Erdfelt 57604d0955
Issue #4572 - Mechanical Change to use org.slf4j
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 15:48:25 -05:00
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