Commit Graph

845 Commits

Author SHA1 Message Date
Joakim Erdfelt c70034766e Updating to version 9.3.27-SNAPSHOT 2019-04-03 18:46:31 -05:00
Joakim Erdfelt dae476e369 Updating to version 9.3.26.v20190403 2019-04-03 18:16:32 -05:00
Joakim Erdfelt 2ccde9772b Undoing bad release-9.3.26 2019-04-03 18:11:16 -05: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
Greg Wilkins 9f4b3542cb Updating to version 9.3.27-SNAPSHOT 2019-04-03 17:32:08 +11:00
Greg Wilkins 7ec6d2fb32 Updating to version 9.3.26.v20190403 2019-04-03 13:06:51 +11:00
Joakim Erdfelt 5658bf96f6 Issue #1676 - Removing Deprecated Resource.getURL()
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 10:21:42 -05:00
Joakim Erdfelt e476cec6d3 Issue #1676 - Removing deprecated methods and classes
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-28 17:54:28 -05:00
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
Joakim Erdfelt 0e7a2738d5 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2019-02-18 16:53:53 -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
Joakim Erdfelt 9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Joakim Erdfelt eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05: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
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
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 5aaae07b94 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-11 21:09:14 +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
olivier lamy a8e9a8a78b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-11 14:21:49 +10:00
Olivier Lamy 154e5ea1a5
align plugin version (#2893)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 18:38:34 +10:00
olivier lamy 32912b922d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-06 17:39:57 +10:00
olivier lamy 1504b7da93 Revert "Issue #2431 - Upgrade to Junit 5 (#2436)"
This reverts commit e24fc48539.
2018-09-06 09:27:11 +10:00
Jan Bartel ffb11fd98f Fix junit version in jetty-maven-plugin 2018-09-06 07:36:47 +10:00
Joakim Erdfelt e24fc48539 Issue #2431 - Upgrade to Junit 5 (#2436)
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
  - this will be a formal release once this issue has been
    resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
  due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
  to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
  to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration

junit 4      | junit 5 / jupiter
------------ | -----------
@Before      | @BeforeEach
@After       | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass  | @AfterAll

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 21:27:18 +10:00
Joakim Erdfelt a3f1592c50 Issue #2431 - Upgrade to Junit 5 (#2436)
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
  - this will be a formal release once this issue has been
    resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
  due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
  to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
  to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration

junit 4      | junit 5 / jupiter
------------ | -----------
@Before      | @BeforeEach
@After       | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass  | @AfterAll

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
Jesse McConnell 863a19bccf
Updating to version 9.3.26-SNAPSHOT 2018-09-04 17:23:31 -05:00
Jesse McConnell 3ce520221d
Updating to version 9.3.25.v20180904 2018-09-04 16:08:21 -05:00
Jesse McConnell dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT 2018-08-30 10:48:22 -05:00
Jesse McConnell 2720868475
Updating to version 9.4.12.v20180830 2018-08-30 08:56:44 -05:00
Greg Wilkins 5afe2e215f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-23 17:17:46 +10:00
Greg Wilkins 460f3fcb9b
Close on graceful #2749 (#2772)
Cleanup of Graceful shutdown, plus ensure Connection:close if connector is shutdown for #2749 
* WIP close connection when shutting down
* WIP use HttpChannel.Listener
* cleanups
* support graceful stop of a context
* only close connections if the connector is shutdown
* minor cleanups
* fixed toString and test
* fixed imports
* Move close logic to HttpConnection
* fixed generator to not override persistent
* Issue #2749 - Close connections on graceful shutdown.
* Small fix after review.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-23 08:08:17 +10:00
Greg Wilkins f15bd225b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-21 14:47:19 +10:00
Kazuhiro Sera 96218e8bc4 Fix typos detected by github.com/client9/misspell
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
Joakim Erdfelt 516d93c488 Updating to version 9.2.27-SNAPSHOT 2018-08-06 11:33:22 -05:00
Joakim Erdfelt 8c637489ae Updating to version 9.2.26.v20180806 2018-08-06 10:51:25 -05:00
Simone Bordet 0892ed8983 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-07-18 16:25:39 +02:00
Joakim Erdfelt 0b69f00665 Updating to version 9.4.12-SNAPSHOT 2018-07-11 17:32:16 -05:00
Joakim Erdfelt 260596dd10 Updating to version 9.4.12.RC0 2018-07-11 16:30:55 -05:00
lachan-roberts e05c11ae30 Changing default Http headerCacheSize from 512 to 4096
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-10 10:39:45 +10:00
Joakim Erdfelt 30f6132117 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-07-03 10:55:22 -05:00
olivier lamy 127b302999 increase default timeout to prevent failure on slow machines
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-13 12:13:59 +10:00
Joakim Erdfelt 0cd4dacbac Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	VERSION.txt
#	aggregates/jetty-all-compact3/pom.xml
#	aggregates/jetty-all/pom.xml
#	apache-jsp/pom.xml
#	apache-jstl/pom.xml
#	examples/async-rest/async-rest-jar/pom.xml
#	examples/async-rest/async-rest-webapp/pom.xml
#	examples/async-rest/pom.xml
#	examples/embedded/pom.xml
#	examples/pom.xml
#	jetty-alpn/jetty-alpn-client/pom.xml
#	jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
#	jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
#	jetty-alpn/jetty-alpn-java-client/pom.xml
#	jetty-alpn/jetty-alpn-java-server/pom.xml
#	jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
#	jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
#	jetty-alpn/jetty-alpn-server/pom.xml
#	jetty-alpn/pom.xml
#	jetty-annotations/pom.xml
#	jetty-ant/pom.xml
#	jetty-bom/pom.xml
#	jetty-cdi/cdi-2/pom.xml
#	jetty-cdi/cdi-core/pom.xml
#	jetty-cdi/cdi-full-servlet/pom.xml
#	jetty-cdi/cdi-servlet/pom.xml
#	jetty-cdi/cdi-websocket/pom.xml
#	jetty-cdi/pom.xml
#	jetty-cdi/test-cdi-webapp/pom.xml
#	jetty-client/pom.xml
#	jetty-continuation/pom.xml
#	jetty-deploy/pom.xml
#	jetty-distribution/pom.xml
#	jetty-documentation/pom.xml
#	jetty-fcgi/fcgi-client/pom.xml
#	jetty-fcgi/fcgi-server/pom.xml
#	jetty-fcgi/pom.xml
#	jetty-gcloud/jetty-gcloud-session-manager/pom.xml
#	jetty-gcloud/pom.xml
#	jetty-hazelcast/pom.xml
#	jetty-home/pom.xml
#	jetty-http-spi/pom.xml
#	jetty-http/pom.xml
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-common/pom.xml
#	jetty-http2/http2-hpack/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-http2/pom.xml
#	jetty-infinispan/pom.xml
#	jetty-io/pom.xml
#	jetty-jaas/pom.xml
#	jetty-jaspi/pom.xml
#	jetty-jmx/pom.xml
#	jetty-jndi/pom.xml
#	jetty-jspc-maven-plugin/pom.xml
#	jetty-maven-plugin/pom.xml
#	jetty-memcached/jetty-memcached-sessions/pom.xml
#	jetty-memcached/pom.xml
#	jetty-nosql/pom.xml
#	jetty-osgi/jetty-osgi-alpn/pom.xml
#	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
#	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
#	jetty-osgi/jetty-osgi-boot/pom.xml
#	jetty-osgi/jetty-osgi-httpservice/pom.xml
#	jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi-context/pom.xml
#	jetty-osgi/test-jetty-osgi-fragment/pom.xml
#	jetty-osgi/test-jetty-osgi-server/pom.xml
#	jetty-osgi/test-jetty-osgi-webapp/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-plus/pom.xml
#	jetty-proxy/pom.xml
#	jetty-quickstart/pom.xml
#	jetty-rewrite/pom.xml
#	jetty-runner/pom.xml
#	jetty-security/pom.xml
#	jetty-server/pom.xml
#	jetty-server/src/main/config/etc/jetty-http.xml
#	jetty-server/src/main/config/etc/jetty-ssl.xml
#	jetty-servlet/pom.xml
#	jetty-servlets/pom.xml
#	jetty-spring/pom.xml
#	jetty-start/pom.xml
#	jetty-unixsocket/pom.xml
#	jetty-util-ajax/pom.xml
#	jetty-util/pom.xml
#	jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
#	jetty-webapp/pom.xml
#	jetty-websocket/javax-websocket-client-impl/pom.xml
#	jetty-websocket/javax-websocket-server-impl/pom.xml
#	jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
#	jetty-websocket/pom.xml
#	jetty-websocket/websocket-api/pom.xml
#	jetty-websocket/websocket-client/pom.xml
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
#	jetty-websocket/websocket-common/pom.xml
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
#	jetty-websocket/websocket-server/pom.xml
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
#	jetty-websocket/websocket-servlet/pom.xml
#	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
#	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
#	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
#	jetty-xml/pom.xml
#	pom.xml
#	tests/pom.xml
#	tests/test-continuation/pom.xml
#	tests/test-http-client-transport/pom.xml
#	tests/test-integration/pom.xml
#	tests/test-jmx/jmx-webapp-it/pom.xml
#	tests/test-jmx/jmx-webapp/pom.xml
#	tests/test-jmx/pom.xml
#	tests/test-loginservice/pom.xml
#	tests/test-quickstart/pom.xml
#	tests/test-sessions/pom.xml
#	tests/test-sessions/test-file-sessions/pom.xml
#	tests/test-sessions/test-gcloud-sessions/pom.xml
#	tests/test-sessions/test-hazelcast-sessions/pom.xml
#	tests/test-sessions/test-infinispan-sessions/pom.xml
#	tests/test-sessions/test-jdbc-sessions/pom.xml
#	tests/test-sessions/test-memcached-sessions/pom.xml
#	tests/test-sessions/test-mongodb-sessions/pom.xml
#	tests/test-sessions/test-sessions-common/pom.xml
#	tests/test-webapps/pom.xml
#	tests/test-webapps/test-http2-webapp/pom.xml
#	tests/test-webapps/test-jaas-webapp/pom.xml
#	tests/test-webapps/test-jetty-webapp/pom.xml
#	tests/test-webapps/test-jndi-webapp/pom.xml
#	tests/test-webapps/test-mock-resources/pom.xml
#	tests/test-webapps/test-proxy-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/pom.xml
#	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
#	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
#	tests/test-webapps/test-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05:00
olivier lamy eed55854e5 #2600 increase wait time as start can be long for some machines
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-11 18:00:42 +10:00
Simone Bordet 4f1dd352d6
Issue #2468 - Remove SoLinger. (#2644)
* Issue #2468 - Remove SoLinger.

For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.

As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-09 13:21:24 +02:00
Joakim Erdfelt 3932b11e64 Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x 2018-06-07 14:31:24 -05:00
Joakim Erdfelt 0e6c91b604 Updating to version 9.2.26-SNAPSHOT 2018-06-06 18:54:58 -05:00
Joakim Erdfelt 4830fd15e9 Updating to version 9.2.25.v20180606 2018-06-06 16:42:54 -05:00
olivier lamy c134792d2d fix issue for windows build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-06 21:39:06 +10:00
Joakim Erdfelt e4bfe00dce Updating to version 9.4.12-SNAPSHOT 2018-06-05 14:18:37 -05:00
Joakim Erdfelt d5fc0523cf Updating to version 9.4.11.v20180605 2018-06-05 13:23:02 -05:00
Joakim Erdfelt 5eefa90e05 Updating to version 9.3.25-SNAPSHOT 2018-06-05 13:13:07 -05:00
Joakim Erdfelt 84205aa28f Updating to version 9.3.24.v20180605 2018-06-05 12:11:03 -05:00
Joakim Erdfelt f0ff571c98 Reverting version to 9.3.24-SNAPSHOT 2018-06-05 12:06:58 -05:00
Joakim Erdfelt 13640c297c Bumping version to 9.3.25-SNAPSHOT 2018-06-05 11:58:37 -05:00
Olivier Lamy 28466efa04
rework maven it test to avoid duplicate class, try to make port file creation atomic (#2607)
* use a single instance of the class TestGetContent.java #2600
* make the jetty.port file creation atomic
* enforce some tests
* ensure we use the correct java home to run invoker plugin, yes this should fail on ci for jdk9+
* use an other maven home for invoker runs
* include failsafe-reports from maven invoker plugin

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-05 18:18:42 +10:00
Olivier Lamy 154298af64
run maven it tests as default #2576
* run maven its test per default #2576

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-30 08:33:25 +10:00
Greg Wilkins 2bcc528920 expand spruious tabs in java sources
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-29 10:40:09 +02:00
olivier lamy a52ff588dc no need of this field
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-06 20:48:05 +10:00
Olivier Lamy 4c4294ffc2
Issue #2496 - Add Integration Tests for jetty-maven-plugin skip behavior (#2507)
* Add Integration Tests for jetty-maven-plugin skip behavior #2496

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

* add missing license headers

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

* add missing license headers

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

* add missing license headers

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

* add missing license headers

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-05 10:03:56 +10:00
Olivier Lamy 5faf018fbc
[WIP] [DO NOT MERGE] ensure maven its run correctly (#2505)
* ensure we correctly run maven it tests

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

* ensure we correctly run maven it tests

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-04 13:35:54 +10:00
Joakim Erdfelt 1732ffca51 Updating to version 9.4.11-SNAPSHOT 2018-05-03 11:48:05 -05:00
Joakim Erdfelt daa59876e6 Updating to version 9.4.10.v20180503 2018-05-03 10:55:19 -05:00
Joakim Erdfelt 4248388a77 Issue #2496 - Standardizing skip message syntax.
+ Both configuration based and manual skip now have the same
  skip message syntax.

+ Moving configuration based skip evaluation to earlier point
  to eliminate noise that is unrelated to skip message.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-02 13:34:30 -05:00
Joakim Erdfelt 97ace5a45c Issue #2496 - Improving plugin execution skip language.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-02 13:25:22 -05:00
Joakim Erdfelt 8763c6065d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-04-20 11:32:46 -05:00
Olivier Lamy ce1317f204
add it test for #2430 which works... (#2442)
* add it test for 2430 which works...

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

* fix missing header

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-16 10:22:56 +10:00
Olivier Lamy 42d9da56c0
use maven annotations for jetty plugins #2404 (#2400)
* use maven annotations for jspc mojo

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

* use maven annotation for jetty-maven-plugin

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-03 17:30:25 +10:00
Jan Bartel 67d887758d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-03-29 17:36:29 +11:00
Jan Bartel b4e400f236 Jetty 9.4.x 2231 refactor session tests (#2382)
* Issue #2231 WIP

* Issue #2231 Add tests for FileSessionDataStore and MongoSessionDataStore.

* Issue #2231 create unit tests for every SessionDataStore

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

* Issue #2231 Refactor session tests

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

* Issue #2231 Refactor and cleanup session tests.

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

* hazelcast tests faster

Signed-off-by: olivier lamy <olamy@webtide.com>

* make hazelcasts tests even faster

Signed-off-by: olivier lamy <olamy@webtide.com>

* cleanup comments

Signed-off-by: olivier lamy <olamy@webtide.com>

* run mongodb test in embdedded mode

Signed-off-by: olivier lamy <olamy@webtide.com>

* mongodb embedded test enabled per default

Signed-off-by: olivier lamy <olamy@webtide.com>

* Issue #2231 more session tests

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

* fix mongodb embedded tests

Signed-off-by: olivier lamy <olamy@webtide.com>

* cleanup code

Signed-off-by: olivier lamy <olamy@webtide.com>

* use Logger rather than System.err.println

Signed-off-by: olivier lamy <olamy@webtide.com>

* Issue #2231 Add test for DefaultSessionCache

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

* Issue #2231 Redisable mongo tests by default.

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

* fix issue with empty local repo build

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

* jenkins should run mongodb tests

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

* build this plugin last so we should not hit the maven invoker plugin

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

* build test first for this one

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

* use invoker plugin 3.0.2-SNAPSHOT as there is a fix for https://issues.apache.org/jira/browse/MINVOKER-191

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

* temporary use of apache snapshots repository because of maven-invoker-plugin 3.0.2-SNAPSHOT

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-28 20:14:15 +10:00
Olivier Lamy 6821506985 add list of supported packaging for run mojos #2372 (#2375)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-27 17:45:00 +11:00
Joakim Erdfelt f56fb440a5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-03-26 11:50:47 -05:00
Olivier Lamy 636ed4a0fe
align maven version used #2373 (#2374)
align maven version used #2373

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-23 20:32:29 +10:00
Olivier Lamy 682ac94373
rename classes to avoid using Servlet in the name as it is confusing #2370 (#2371)
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-23 13:03:15 +10:00
Olivier Lamy d726fe5c03
deploy war mojo it test (#2365)
* add it test for JettyDeployWar mojo #2213

Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-23 10:52:49 +10:00
Joakim Erdfelt 1c04f9838d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-22 16:42:42 -05:00
Joakim Erdfelt a74a328024 Merge branch 'release-9.4.9' into jetty-9.4.x 2018-03-21 16:33:56 -05:00
Olivier Lamy 5286fb8081
[WIP] add it test for jspc plugin so we can test it with jdk10 (#2363)
* add it test for jspc plugin so we can test it with jdk10

Signed-off-by: olivier lamy <olamy@webtide.com>

* record maven invoker results

Signed-off-by: olivier lamy <olamy@webtide.com>

* seems to be require as a dependency

Signed-off-by: olivier lamy <olamy@webtide.com>

* no need of install

Signed-off-by: olivier lamy <olamy@webtide.com>

* remove invoker as it do not support well parallel

Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-21 21:11:16 +10:00
Joakim Erdfelt c3cc138a3b Updating to version 9.4.10-SNAPSHOT 2018-03-20 08:25:59 -05:00
Joakim Erdfelt 1f8159b1e4 Updating to version 9.4.9.v20180320 2018-03-20 07:18:24 -05:00
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
Joakim Erdfelt f9658f06b5 Issue #2139 - updating all DTD references to to configure_9_3.dtd
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-13 14:36:12 -05:00
olivier lamy c22eedac8b upgrade surefire version to 2.21.0
Signed-off-by: olivier lamy <olamy@webtide.com>

use a property for surefire version and align version

Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-09 15:12:20 +10:00
Joakim Erdfelt e3e3f9eb0b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-06 11:16:25 -06:00
Lachlan Roberts a639ee9275 Resolved errorprone MissingOverride warnings #2206
`@Override` was added to methods which were missing the annotation #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
Joakim Erdfelt a05b157c03 Updating to version 9.3.24-SNAPSHOT 2018-02-28 16:39:30 -06:00
Joakim Erdfelt 0554f8d8b4 Updating to version 9.3.23.v20180228 2018-02-28 15:45:57 -06:00
olivier lamy 866461a501 use a separated local maven repo per build and run maven in multi thread surefire configuration improvement
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-27 10:06:52 +10:00
Jan Bartel 85ed19ce3f Issue #2209 Require war packaging only for some jetty maven plugin goals.
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-22 14:31:42 +11:00
Jan Bartel 8e9828bb66 Issue #2170 Add extra info re jetty maven plugin integration test log output 2018-02-21 17:19:34 +11:00
Joakim Erdfelt 3001c8af2f Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x 2018-02-07 15:35:04 -06:00
olivier lamy e24b88b433 fix typo
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-01 18:43:40 +10:00
olivier lamy 51c895db06 #2170 add a basic README for Maven integration tests
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-01 11:00:25 +10:00
olivier lamy bd24762d01 change failsafe plugin version to fix maven plugin its #2170
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-01 10:40:13 +10:00
Jan Bartel 7b2e490036 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-12 22:24:17 +01:00
Jan Bartel 65101b776b
Issue #2080 Exclude cdi packages coming from maven plugin dependencies (#2084)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-01-12 18:56:00 +01:00
Joakim Erdfelt 650b804142 Issue #2108 - Updating license headers for year 2018 2018-01-09 10:14:52 -06:00
Joakim Erdfelt d5a0878019 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-09 10:08:30 -06:00
Joakim Erdfelt 21365234f8 Issue #2108 - Updating license headers for year 2018 2018-01-09 09:44:41 -06:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Joakim Erdfelt fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt 067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
Greg Wilkins 45e3abbdcf Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-09 13:17:32 +01:00
olivier lamy 5a323a01dd more javadoc fixes #2056
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-09 13:35:58 +11:00
olivier lamy 041a3260b6 more javadoc fixes #2056
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-09 09:04:29 +11:00
Joakim Erdfelt bd01e1877a Updating to version 9.2.25-SNAPSHOT 2018-01-05 11:35:42 -06:00
Joakim Erdfelt a617842695 Updating to version 9.2.24.v20180105 2018-01-05 10:11:08 -06:00
Joakim Erdfelt 2dd970b055 Updating to version 9.2.24-SNAPSHOT 2017-12-18 10:43:47 -06:00
Joakim Erdfelt cdbe733684 Updating to version 9.2.23.v20171218 2017-12-18 09:06:48 -06:00
Joakim Erdfelt ff53002fac Updating to version 9.4.9-SNAPSHOT 2017-11-21 13:11:31 -07:00
Joakim Erdfelt 82b8fb23f7 Updating to version 9.4.8.v20171121 2017-11-21 12:33:52 -07:00
Jesse McConnell a72eb0001d Updating to version 9.3.23-SNAPSHOT 2017-10-30 15:39:57 -05:00
Jesse McConnell 705048cc49 Updating to version 9.3.22.v20171030 2017-10-30 15:16:29 -05:00
Jan Bartel 37c51710b0 Issue #1213 2017-10-18 10:05:59 +11:00
Jan Bartel 1a807b5195 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-11 16:19:09 +11:00
Jan Bartel 98f57fa97f Issue #1868
Fix javadoc
2017-10-11 16:18:30 +11:00
Jan Bartel 6df5377634 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-11 15:41:54 +11:00
Jan Bartel 5656594b4b Issue #1868 2017-10-11 15:40:55 +11:00
Jan Bartel e9d813552b Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-05 17:37:11 +11:00
Jan Bartel 09e9cd1bef Issue #1640
Use unique package names for it tests for jenkins tracking.
2017-10-04 13:24:26 +11:00
Jan Bartel b04e8a285a Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-03 18:31:19 +11:00
Jan Bartel d5ff4fa075 Issue #1640
Fix integration test for run mojo.
2017-10-03 17:59:03 +11:00
Jan Bartel f4ccbc8c70 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-03 16:35:58 +11:00
Jan Bartel b451ee7a63 Issue #1640
Update javadoc.
2017-10-03 14:19:59 +11:00
Jan Bartel 2f5f01a160 Issue #1640
Documentation.
2017-09-21 16:08:33 +10:00
Jan Bartel 303784042e Issue #1640
Clean up import statements.
2017-09-21 14:10:55 +10:00
Jan Bartel c124803e6d Issue #1640
Change jetty:run-forked to use presence of file as signal child process has started.
2017-09-21 08:57:17 +10:00
Jan Bartel 65d77ff129 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640 2017-09-19 12:01:52 +10:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Jan Bartel 320f734fcd Issue #1640
Improve javadocs
2017-09-14 08:53:27 +10:00
Jan Bartel 860e0ec904 Allow setting of env for forked process that runs distro 2017-08-24 16:50:07 +10:00
Jan Bartel b37fcf3f2c Issue #1768 2017-08-24 16:35:41 +10:00
Jan Bartel 87d0598d8c Add it tests for jetty:run-distro 2017-08-15 16:35:17 +10:00
Jan Bartel 2acb97db2f Issue #1640
Replay changes after change to jetty-9.4.x base branch.
2017-08-10 13:56:05 +10:00
Joakim Erdfelt 3ec5f8fa3d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-09 16:21:08 -07:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Jan Bartel 19e539a87d Issue #1623
Remove projects.classes.dirs, using only lib.jars property.
2017-08-08 09:15:48 -07:00
Olivier Lamy 98eb354c46 use invoker plugin 3.0.1 released version (#1683)
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:15:25 -07:00
Jan Bartel ccf89b81ad Issue #1623
Ensure restarts recreate classpath.
2017-08-08 09:15:06 -07:00
olivier lamy 2c60f59325 some cleanup per Jan review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:15:04 -07:00
olivier lamy 0fac9c390a simplify code, add more details in junit failure #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:14:56 -07:00
Joakim Erdfelt b8759bc2c7 Renaming to fit Eclipse Jetty naming guidelines 2017-08-08 09:14:23 -07:00
olivier lamy 6ac625e226 add it test for run war exploded mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:55 -07:00
olivier lamy 4b513c61e8 add it test for run war mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:55 -07:00
olivier lamy dfb4e85c0a fix fragment from dependent projects #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:54 -07:00
olivier lamy aae7b38b82 version in only one place
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:53 -07:00
olivier lamy 8095da3848 try to fix web fragment for directory classes #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:52 -07:00
olivier lamy 7dcab0e5a2 add test with fragment for #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:52 -07:00
olivier lamy 4024273fa6 Add it test for Maven Plugin #1638
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:51 -07:00
olivier lamy 2f9dc58699 fix run forked support of reactor projects
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:50 -07:00
olivier lamy 1cdc94f0a5 add test for run forked mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:49 -07:00
olivier lamy b0e5681451 add it for run mojo #1638
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:47 -07:00
Greg Wilkins a105be95e4 Issue #1637 Thread per HTTP/2 Connection
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class.   A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.

Squashed commit of the following:

commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b56
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 21 10:48:22 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 58a5a9a655ee1a72a66f54ac8c95d7c9d73afe85
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Jun 14 15:56:43 2017 +0200

    Code cleanups.

commit 4e5296216b52948523572352cba391438ff6b494
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:34:58 2017 +0200

    refixed Producing to Reproducing

commit a1f8682f86d1f0803121162e3f14d7768286d3ed
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:26:29 2017 +0200

    fixed Producing to Reproducing

commit 9468932e062d2271d8dc1d43a78544757732fff5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:33:44 2017 +0200

    fixed javadoc

commit 9d4941eb97638fec09b3fe34d423538d17943b6f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:05:27 2017 +0200

    Renamed Preallocated to ReservedThread

commit 6d3379ab64c6dcc2a7aa8ec7088afd77863816c2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 12:28:52 2017 +0200

    Added configuration in modules

commit 1bd1adea4682538e1546c2ae53f4c9340dafb3bb
Merge: 83418a9 6702248
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:09:29 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 83418a91320c8bfc54465ca02efdce0d2c874a0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:08:35 2017 +0200

    javadoc

commit 62918fd39189fed3414fec4a7c8380c21e90a4b8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Jun 10 00:04:06 2017 +0200

    Improved EatWhatYouKill implementation

    Simplified by abstracting out PreallocatedExecutor
    Removed invocation execution
    HTTP2 now uses a shared PreallocationExcecutor between connection
2017-08-08 09:13:44 -07:00
olivier lamy 20ca6277a8 use outputDirectory from reactor projects rather than having to install dependencies first #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:38 -07:00
Joakim Erdfelt 3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -07:00
Joakim Erdfelt a7bcac6d75 Updating to version 9.3.20.v20170531 2017-08-08 09:07:35 -07:00
Simone Bordet 4bee2e877f Merged branch 'jetty-9.4.x' into 'master'. 2017-08-02 23:02:06 +02:00
Jan Bartel 4e1105a526 Issue #1623
Remove projects.classes.dirs, using only lib.jars property.
2017-08-02 15:37:39 +10:00
Joakim Erdfelt 11a544d6ac Updating to version 9.3.22-SNAPSHOT 2017-08-01 11:26:37 -07:00
Joakim Erdfelt bb1d69ca52 Updating to version 9.3.21.M0 2017-08-01 10:47:04 -07:00
Simone Bordet 38f41e9676 Merged branch 'jetty-9.4.x' into 'master'. 2017-07-26 11:09:28 +02:00
Olivier Lamy 0ef76d56f0 use invoker plugin 3.0.1 released version (#1683)
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-07-26 08:45:01 +02:00
Jan Bartel 580310f523 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-20 13:27:03 +02:00
Jan Bartel 41938b2310 Issue #1623
Ensure restarts recreate classpath.
2017-07-20 13:24:46 +02:00
Jan Bartel 5e04d8160b Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-20 13:14:51 +02:00
olivier lamy 1b5b59cca3 some cleanup per Jan review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-07-20 14:10:42 +10:00
olivier lamy c78ba059c0 simplify code, add more details in junit failure #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-07-19 21:50:37 +10:00
Joakim Erdfelt a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt 2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
This reverts commit 38c112764d.
2017-07-12 11:28:32 -07:00
Joakim Erdfelt 5b6b80ef81 Merge remote-tracking branch 'origin/jetty-9.4.x' into backport-jws11 2017-07-12 11:18:20 -07:00
Joakim Erdfelt c465a9d833 Renaming to fit Eclipse Jetty naming guidelines 2017-07-10 18:17:16 -07:00
Joakim Erdfelt ee8d4c1587 gitattributes followup 2017-07-06 16:24:31 -07:00
Joakim Erdfelt 38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
olivier lamy 8146001093 add it test for run war exploded mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-24 21:27:24 +10:00
olivier lamy 388106303f add it test for run war mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-24 21:22:06 +10:00
olivier lamy 008158d975 fix fragment from dependent projects #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 21:32:11 +10:00
olivier lamy 4d43261031 version in only one place
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 20:46:09 +10:00
olivier lamy 52fa23b968 try to fix web fragment for directory classes #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 20:35:59 +10:00
olivier lamy 7e27f03884 add test with fragment for #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 15:51:38 +10:00
olivier lamy 5f96644cf8 Add it test for Maven Plugin #1638
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 15:07:18 +10:00
olivier lamy d72718b67f fix run forked support of reactor projects
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 14:55:44 +10:00
olivier lamy 1e7e356865 add test for run forked mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 10:42:03 +10:00
olivier lamy a275032915 add it for run mojo #1638
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-22 16:24:13 +10:00
Greg Wilkins 23c8e64fd8 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-21 14:40:13 +02:00
Greg Wilkins 11b5cf5a2b Issue #1637 Thread per HTTP/2 Connection
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class.   A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.

Squashed commit of the following:

commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b56
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 21 10:48:22 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 58a5a9a655ee1a72a66f54ac8c95d7c9d73afe85
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Jun 14 15:56:43 2017 +0200

    Code cleanups.

commit 4e5296216b52948523572352cba391438ff6b494
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:34:58 2017 +0200

    refixed Producing to Reproducing

commit a1f8682f86d1f0803121162e3f14d7768286d3ed
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:26:29 2017 +0200

    fixed Producing to Reproducing

commit 9468932e062d2271d8dc1d43a78544757732fff5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:33:44 2017 +0200

    fixed javadoc

commit 9d4941eb97638fec09b3fe34d423538d17943b6f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:05:27 2017 +0200

    Renamed Preallocated to ReservedThread

commit 6d3379ab64c6dcc2a7aa8ec7088afd77863816c2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 12:28:52 2017 +0200

    Added configuration in modules

commit 1bd1adea4682538e1546c2ae53f4c9340dafb3bb
Merge: 83418a9 6702248
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:09:29 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 83418a91320c8bfc54465ca02efdce0d2c874a0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:08:35 2017 +0200

    javadoc

commit 62918fd39189fed3414fec4a7c8380c21e90a4b8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Jun 10 00:04:06 2017 +0200

    Improved EatWhatYouKill implementation

    Simplified by abstracting out PreallocatedExecutor
    Removed invocation execution
    HTTP2 now uses a shared PreallocationExcecutor between connection
2017-06-21 11:48:41 +02:00
Joakim Erdfelt 5638f7b25b Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-16 14:33:01 -07:00
olivier lamy 43f778946f use outputDirectory from reactor projects rather than having to install dependencies first #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-16 10:46:21 +10:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt 6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt 429380d36a Updating to version 9.3.21-SNAPSHOT 2017-05-31 16:10:04 -07:00
Joakim Erdfelt 0f3b1cbe36 Updating to version 9.3.20.v20170531 2017-05-31 15:24:57 -07:00
Greg Wilkins b5a3eb1f70 removed Configuration marker classes 2017-05-11 11:32:23 +02:00
Joakim Erdfelt cf56168f7d Updating to version 9.3.20-SNAPSHOT 2017-05-02 15:26:56 -07:00
Joakim Erdfelt d36d57d5c7 Updating to version 9.3.19.v20170502 2017-05-02 14:31:51 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Joakim Erdfelt 92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt 3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Joakim Erdfelt 9e2aeda052 Updating to version 9.3.19-SNAPSHOT 2017-04-06 07:47:53 -07:00
Joakim Erdfelt 63273aa40b Updating to version 9.3.18.v20170406 2017-04-06 06:31:02 -07:00
Jan Bartel 976ffb7ecd Issue #877
And also #1117
2017-03-23 11:24:22 +11:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt a6a0ab991f Updating to version 9.3.18-SNAPSHOT 2017-03-17 09:48:19 -07:00
Joakim Erdfelt 307d23975e Updating to version 9.3.17.v20170317 2017-03-17 09:07:39 -07:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Jens Reimann 4acaf2c250 Remove "and others" in order to pass Jetty CI
Signed-off-by: Jens Reimann <jreimann@redhat.com>
2017-02-07 09:06:20 +01:00
Jens Reimann 0f19cb7e97 Allow to externally provide 'daemon' parameter
This change allows to provide the 'daemon' parameter using a property
using "-Djetty.daemon" in addition.

Signed-off-by: Jens Reimann <jreimann@redhat.com>
2017-02-06 16:17:30 +01:00
Jesse McConnell e695fc80d6 Updating to version 9.2.22-SNAPSHOT 2017-01-20 12:32:51 -06:00
Jesse McConnell 513b5e5f90 Updating to version 9.2.21.v20170120 2017-01-20 12:32:00 -06:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Jesse McConnell 6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Jan Bartel 79c364368d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-24 15:51:06 +11:00
Jan Bartel 40d9e56d92 Issue #1117 2016-11-24 14:04:37 +11:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Joakim Erdfelt 2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt 14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Joakim Erdfelt 458aebbd01 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-20 15:11:40 -07:00
Joakim Erdfelt 76992139f8 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-10-20 15:11:25 -07:00
Joakim Erdfelt 2d650512bf Skipping jacoco collection on build/test/support/integration modules 2016-10-20 12:48:32 -07:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Jesse McConnell 863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell b91cc8a4ea set for release 2016-09-30 18:01:20 +00:00
Joakim Erdfelt 6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt 8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Joakim Erdfelt fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt 7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Jan Bartel 749b68341d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-28 15:38:22 +10:00
Jan Bartel d229fb0db3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-28 15:37:15 +10:00