c09e4d6f86
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 08:46:29 +10:00
de1b6745c5
the DO NOT EDIT comment in .mod files should start with '#'
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 16:47:22 +10:00
eefe3d202b
revert fail release
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
9619a5a743
Updating to version 10.0.0.beta1
2020-07-10 14:23:28 +10:00
aaeffb719e
Updating to version 10.0.0-SNAPSHOT
2020-07-09 12:25:34 +10:00
23c99ffdbe
Updating to version 10.0.0.beta1
2020-07-09 11:20:55 +10:00
6df6fa33b8
Updating to version 9.4.31-SNAPSHOT
2020-06-11 08:24:34 -05:00
271836e4c1
Updating to version 9.4.30.v20200611
2020-06-11 07:21:18 -05:00
ce7ef4396f
Issue #4913 - jetty-maven-plugin recursively delete target jetty-base
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-27 14:05:36 +10:00
5d6f3e2ddc
Updating to version 9.4.30-SNAPSHOT
2020-05-21 13:42:25 -05:00
77c232aed8
Updating to version 9.4.29.v20200521
2020-05-21 12:04:14 -05:00
2addb6a655
Jetty 10.0.x use HandlerList instead of HandlerCollection ( #4757 )
...
* Use HandlerList instead of HandlerCollection
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Use HandlerList instead of HandlerCollection
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-04-15 18:42:28 +02:00
5699b9ff3d
Updating to version 9.4.29-SNAPSHOT
2020-04-08 13:15:04 -05:00
ab228fde9e
Updating to version 9.4.28.v20200408
2020-04-08 12:33:56 -05:00
5c2e0b32a4
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-04-02 12:32:22 +10:00
ea06ba1865
Issue #4699 fix jar files from multimodules not scanned ( #4742 )
...
* Issue #4699 fix jar files from multimodules not scanned
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix license headers
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-02 08:06:10 +10:00
b22c0b196f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-03-18 17:00:01 +01:00
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
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
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
8aabb52557
Updating to version 9.4.28-SNAPSHOT
2020-02-27 13:03:44 -06:00
a304fd9f35
Updating to version 9.4.27.v20200227
2020-02-27 12:21:57 -06:00
55748f12c2
Issue #4581 - remove unnecessary javadoc on Override methods
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 11:33:56 +11:00
fe8b11dd48
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-02-01 11:27:09 +01:00
769cd9de69
Merge pull request #3364 from eclipse/jetty-9.4.x_maven_plugin_site
...
Issue #3247 Generate jetty-maven-plugin website
2020-01-31 07:14:24 -06:00
5aaec6e23f
Issue #4321 Refactored Graceful shutdown ( #4482 )
...
* Issue #4321 Refactored Graceful shutdown
removed stopTimeout from all abstractLifeCycles. It is on Graceful.LifeCycle, which is only implemented by components that can start a graceful shutdown (eg Server, ContextHandler and QueuedThreadPool)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
cleanup after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
reinstate other stop tests (more work to do).
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Fixes for stop test by improving LocalConnector shutdown handling
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Removed broken test on LocalConnector that is already tested in GracefulStopTest
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Fixed all stop tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
fixed checkstyle
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
No stopTimeout JMX attribute
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Dump stopTimeout
test with default stopTimeout
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
USe sendError for 503
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
minor cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Simplifications after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-30 17:05:03 +01:00
56fc476d55
Updating to version 9.4.27-SNAPSHOT
2020-01-17 07:00:10 -06:00
7b38981d25
Updating to version 9.4.26.v20200117
2020-01-17 06:21:47 -06:00
01a5974f4b
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java
# jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/matchers/HttpFieldsMatchersTest.java
# jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterLenientTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletLifeCycleTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultNoRecompressTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
# jetty-unixsocket/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketClient.java
# jetty-util/src/test/java/org/eclipse/jetty/util/B64CodeTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java
# jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/LargeMessageTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/utils/ReflectUtilsTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/RestartContextTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfigTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilQuoteTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ConnectionManagerTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase11.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase12.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase4.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase73.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScannerTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ConnectionStateTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/http/HttpResponseHeaderParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageDebug.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/Utf8CharBufferTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/UnitGenerator.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8PartialBuilderTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RedirectWebSocketClientTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6BadUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6GoodUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7BadStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7GoodStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java
# pom.xml
# tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationsTest.java
# tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java
# tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
# tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java
2020-01-15 12:20:20 -06:00
8c65309963
Addressing Checkstyle violations in src/test/java
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
1f8ad08281
Fixing Checkstyle violations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-09 15:56:06 -06:00
5f82e17d2f
Issue #3578 - Adopt EPL-2.0 for Jetty-10.
...
WIP: updated copyright headers for Java files.
TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 20:10:19 +01:00
a5c99207fc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-07 17:02:40 +01:00
923ec38adf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2020-01-07 16:51:25 +01:00
e3c8546667
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2020-01-07 16:35:05 +01:00
de890bb1b7
Happy New Year 2020.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
f4e7e4c3db
Merge branch 'release-9.4.25' into jetty-9.4.x
2020-01-03 12:49:27 -06:00
ff48fba585
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:59:21 +01:00
e1371a1c13
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
c98897315c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4225-jpms_transitivity
2019-12-27 19:27:59 +11:00
db0edf23de
Update websocket artifact IDs
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-23 13:32:21 +11:00
8974176c4b
Updating to version 9.4.26-SNAPSHOT
2019-12-20 11:30:41 -06:00
a9729c7e7f
Updating to version 9.4.25.v20191220
2019-12-20 10:46:56 -06:00
e3bb5a7515
Issue #4225 - Fix JPMS transitivity.
...
Reworked all module-info.java files to take into
account JPMS transitivity.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-19 18:17:35 +01:00
0e6a1ce76b
Issue #4402 Fix NPE in JettyRunWarExplodedMojo ( #4406 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-10 12:29:40 +11:00
c0f8a46c35
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunDistro.java
2019-12-02 15:29:30 -06:00
c9a65c4676
Allow building against newest version of maven-artifact-transfer ( #4381 )
...
In later versions of maven-artifact-transfer the package names have
been refactored, this change accomodates for that.
Signed-off-by: Mat Booth <mat.booth@redhat.com>
2019-12-03 07:08:01 +10:00
02bb5affd9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 15:32:04 +11:00
c440a3f972
Issue #4363 Restore contextXml config for jetty maven plugin ( #4367 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 14:56:59 +11:00
0f7a3b2d91
Updating to version 9.4.25-SNAPSHOT
2019-11-20 16:08:38 -06:00
Lachlan Roberts
olivier lamy
Joakim Erdfelt
Greg Wilkins
Simone Bordet
Jan Bartel
Jesse McConnell
Mat Booth