Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,091 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

565 Commits

Author SHA1 Message Date
Joakim Erdfelt cff63f2b6a Merge of `jetty-9.4.x` to `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
 2019-02-21 09:45:12 -05:00
Simone Bordet 1c55e2bf79 Issue #3303 - Update to jakarta ee javax artifacts for jetty-10. 
Updated javax.annotation -> jakarta.annotation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-12 18:56:16 +01:00
Simone Bordet a1e6d5856a Issue #3303 - Update to jakarta ee javax artifacts for jetty-10. 
Updated javax.transaction -> jakarta.transaction.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-12 14:41:05 +01:00
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
Simone Bordet 33f314e9f5 Issue #3162 - Use Jetty specific Servlet API jar. 
Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 18:51:51 +01: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
Joakim Erdfelt 02dd7d1887
Merge pull request #3289 from eclipse/jetty-10.0.x-websocket-artifact-ids 
Issue #3288 - Correcting Jetty WebSocket API artifactIds
 2019-01-24 10:47:12 -06:00
olivier lamy 3ffdd9427d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-24 14:41:39 +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
Joakim Erdfelt 5095c8a7b2 Issue #3288 - Correcting Jetty WebSocket API artifactIds 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-23 15:58:11 -06:00
Olivier Lamy 826c27a2b2
- move duplicate configuration to parent pom (#3265) 
- upgrade invoker plugin version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-24 07:29:49 +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 63f2023e05 happy new year!! 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 12:17:53 +10: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 6ff23e296d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-22 22:00:07 +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 ab2a8b0fe3
upgrade logback and log4j-slf4j (new artifact log4j-slf4j18-impl) to support slf4j api 1.8 (#3209) 
* upgrade logback and version of log4j-slf4j support slf4j 1.8 (new artifact log4j-slf4j18-impl)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-22 10:01:48 +10:00
olivier lamy bd4933b33c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-21 21:48:36 +10:00
Olivier Lamy 63820e5405
activate Maven enforcer Upper bound dependencies check (#3116) 
* add requireUpperBoundDeps rule

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-21 21:35:31 +10:00
olivier lamy df92c7d5ec fix it with declaring correct version of slf4j and excluding logback as we are now slf4j api 1.8.0-beta2 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-19 10:15:14 +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
Olivier Lamy 9ca77a23aa issue #3186 add it to override javax.annotation provided by maven core (#3194) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-18 17:38:11 +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 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 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
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
Greg Wilkins 254dc88743 Merge branch 'jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-01 20:24:43 +01: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 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
olivier lamy 925afac48b align used algorithm to detect java bin to use 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-10-24 14:30:13 +10:00
olivier lamy f4f3dc679a fix it test: add new property to be able to configure used java, fix jetty-http.xml with compliance mode changed 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-10-24 10:57:09 +10:00
olivier lamy b7b84e341b no need of this profile wrong merge from 9.4.x 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-10-18 16:21:29 +10:00
Jan Bartel 2bb8902286
Issue #2985 Configuration replacement algorithm (#2987) 
* Issue #2985 Configuration replacement algorithm

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-10-18 09:21:06 +11:00
Jan Bartel fefc3db0ba Remove unused field _preconfigProcessor; reformat src for 
o.e.j.maven.plugin.JettyWebAppContext; fix comment header in
o.e.j.quickstart.ExtraXmlDescriptorProcessor.
 2018-10-17 15:55:41 +11:00
olivier lamy 6a0b9c8da2 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-17 11:47:33 +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
Greg Wilkins 42cda7bc7f Issue #2191 JPMS Support 
Renamed ClasspathPattern to ClassMatcher as it also supports JPMS modules etc.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-10-17 10:08:20 +11:00
Jan Bartel ff81168b57 Fix quickstart; add MavenMetaInfConfiguration to services for plugin 2018-10-16 11:26:52 +11:00
Simone Bordet a8b17cee8d Issue #2948 - Require JDK 11 for Jetty 10.x. 
Removed/updated Maven Compiler Plugin source/target to 11.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-10-12 09:48:01 +02:00
Jan Bartel d2f115ddd3 Fix jetty-context.xml file for jetty-maven-plugin it test. 2018-10-11 18:26:15 +11:00
olivier lamy 56ce28b49d maven-plugin-plugin is working now 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-10-09 12:17:35 +10:00
Jan Bartel c165d07492 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-09-26 12:13:31 +10:00
Jan Bartel 5593e5b479
Jetty 9.4.x 2903 delay listener instantiation (#2930) 
* Issue #2903 Ensure listeners not instantiated for quickstart gen

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-09-26 11:27:57 +10:00
olivier lamy 3682638961 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-25 20:54:14 +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
WalkerWatch defa9e42f2 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-18 10:54:36 -04:00