Commit Graph

721 Commits

Author SHA1 Message Date
Simone Bordet 9286cdcf09 Issue #3162 - Use Jetty specific Servlet API jar.
Updated references to Servlet jar to "jetty-servlet-api".

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 13:08:26 +01:00
Joakim Erdfelt e4df1fe8af Issue #3162 - Correcting javadoc 2019-02-04 19:34:20 -06:00
Joakim Erdfelt c30c8d4339 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-client/pom.xml
#	jetty-http/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
#	jetty-quickstart/pom.xml
#	jetty-servlets/pom.xml
#	jetty-util/pom.xml
#	jetty-websocket/javax-websocket-client/pom.xml
#	jetty-websocket/javax-websocket-server/pom.xml
#	jetty-websocket/jetty-websocket-server/pom.xml
#	pom.xml
2019-01-30 11:56:58 -06:00
Lachlan Roberts 7d26acd882 Issue #3182 - update documentation to use new location of example files
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-24 10:43:14 +11:00
olivier lamy 63f2023e05 happy new year!!
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
Jan Bartel 4abc4f8dd4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-12-19 10:54:41 +11:00
WalkerWatch 7c4d12fb7d Updating for customrequestlog impl
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2018-12-13 13:43:22 -05:00
Greg Wilkins 1176b267b5 removed -impl from websocket name and fixed SCI
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
Simone Bordet 8ff82423f9 Issue #3162 - Use Jetty specific Servlet API jar.
Removed references to jetty-osgi-servlet-api.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 17:36:09 +01:00
Simone Bordet bfa2dbf68c Issue #3162 - Use Jetty specific Servlet API jar.
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
  to match the new Jetty Servlet API jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 16:51:29 +01:00
Jan Bartel 1baa3c3147 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-28 15:01:50 +01:00
Raymond Augé 7ef8f882bd fixes #3141 Upgrade jetty osgi tests to use spifly 1.2 (#3142)
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
2018-11-28 15:00:31 +01:00
olivier lamy 87076d5f4f Merge remote-tracking branch 'upstream/jetty-9.4.x' into jetty-10.0.x 2018-11-27 11:09:53 +10:00
Paweł Nawrocki f5445a759e Fixed invalid QoS Filter parameter names (#3149)
Signed-off-by: Pawel Nawrocki <pnaw94@hotmail.com>
2018-11-27 10:57:28 +10:00
Greg Wilkins 7dcc9d2829 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-20 14:10:52 +01:00
Jan Bartel 10622f3455
Issue #3109 Remove unnecessary aries-util. (#3110)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-19 15:19:14 +01:00
Simone Bordet 820ccd7bd1 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-11-16 12:53:38 +01:00
Simone Bordet d095413aee Added additional JPMS section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-15 16:38:10 +01:00
Simone Bordet 00c2c21700 Fixed small typos and clarified JPMS usage.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-15 15:08:42 +01:00
Joakim Erdfelt 29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt c4550056e7 Updating to version 9.4.14.v20181114 2018-11-14 15:19:10 -06:00
Joakim Erdfelt a903017f5f Updating to version 9.4.14-SNAPSHOT 2018-11-11 21:06:50 -06:00
Joakim Erdfelt 49123a3313 Updating to version 9.4.13.v20181111 2018-11-11 20:02:42 -06:00
WalkerWatch 61761429f5 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-11-09 11:22:16 -05:00
WalkerWatch 6c35d62a7a Adding link to Oracle JDR/JRE Crypto roadmap 2018-11-09 11:21:14 -05:00
Greg Wilkins d81c0cad24 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-07 14:06:21 +01:00
Jan Bartel ef261a39ae
Issue #2925 Update troubleshooting doc for files locking on windows (#3061)
* Issue #2925 Update troubleshooting doc for files locking on windows

Signed-off-by: Jan Bartel <janb@webtide.com>

* General formatting fixes.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2018-11-06 16:40:21 +01:00
Jan Bartel 5f94f249a7 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-06 10:29:10 +01:00
Jan Bartel 871f73cdf6
Jetty 9.4.x 2932 switchable classloader for session attribute values (#2964) 2018-11-06 10:03:48 +01:00
olivier lamy b5d058d128 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-11-02 19:27:14 +10:00
Greg Wilkins bb045f641e
Issue #3049 Warn on common SslContext vulnerable configurations (#3050)
* Issue #3049 Warn on common SslContext vulnerable configurations

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

* Adding documentation notes for weak cipher warnings

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Issue #3049 - SslContextFactory warnings on known bad config

+ Changes warnings from being a boolean on SslContextFactory
  to being a logger named
  "org.eclipse.jetty.util.ssl.SslContextFactory.config"

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

* Issue #3049 - SslContextFactory warnings on known bad config

+ Cleanup based on review

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

* Issue #3049 - SslContextFactory warnings on known bad config

+ Cleanup based on review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-02 05:19:03 +01:00
olivier lamy 42c49cd503 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-11-01 13:17:20 +10:00
WalkerWatch 94bfeacba5 Added note on stopping the server. Resolves #3033 2018-10-31 16:56:25 -04:00
olivier lamy 31c08f888b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-24 19:04:54 +10: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
Joakim Erdfelt 511bc60934 Fixing GITBROWSEURL in jetty-documentation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 17:24:00 -05:00
Simone Bordet 932f1a7516 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-10-17 15:49:54 +02:00
Simone Bordet 44ac57040a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-10-17 12:36:56 +02:00
Jesse McConnell b34ab04011
update gitbrowseurl for proper jetty 10 branch location 2018-10-16 16:29:20 -05:00
WalkerWatch 649b9cf22c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-11 14:09:33 -04:00
WalkerWatch 68911c54fb Updating/augmenting JPMS documentation included in PR #2934 2018-10-11 14:08:24 -04:00
Simone Bordet 41663d8e5c Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-10-11 00:36:10 +02:00
Simone Bordet 8bd68bb8cd Merged 'jetty-10.0.x' into 'jetty-10.0.x-2948-require_jdk11'. 2018-10-09 10:48:15 +02:00
Simone Bordet 1ca4e12c3b Issue #2868 - Adding SPNEGO authentication support for Jetty Client.
Removed old deprecated SPNEGO implementation on server-side.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-04 13:02:04 +02:00
Simone Bordet bd3eeeaa3f Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'. 2018-10-04 12:27:31 +02:00
WalkerWatch c25b7196bd Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-03 11:14:22 -04:00
WalkerWatch 64dc930500 Clarify Websocket intro. Resolves #2951 2018-10-03 11:13:40 -04:00
Simone Bordet 1fe6c92ee9 Issue #2948 - Require JDK 11 for Jetty 10.x.
First pass at making Jetty 10.x require JDK 11.

* Removed JDK 8 modules (in particular ALPN and ALPN *.mod files).
* Removed profiles targeting JDK 8, 9 and 10.
* Updated dependencies to newer versions that support JDK 11.
* Temporarily commented out the Jetty Maven Plugins due to
maven-plugin-plugin not working with JDK 11.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-03 11:15:30 +02:00
Simone Bordet 5cac3376c6 Issue #2191 - JPMS Support.
JPMS documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-28 13:23:43 +02:00
Simone Bordet e4ff653295 Issue #2191 - JPMS Support.
Introduced --jpms option in jetty-start to run Jetty from the module-path.

Introduced [jpms] sections in *.mod files, to specify JPMS command line
options that needs to be added to the command line generated by jetty-start.

Bumped java.transaction-api to 1.3 because it has Automatic-Module-Name.

Fixed ASM version lookup using ManifestUtils.

Fixed WebInfConfiguration.findAndFilterContainerPaths() to properly
scan the module-path, which may contain both files and directories.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-25 22:11:25 +02:00