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

1887 Commits

Author SHA1 Message Date
olivier lamy f745d5d5df remove unused imports and upgrade testcontainers.version 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-15 17:40:15 +10:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
olivier lamy c48aee0a54 maven war plugin 3.3.0 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-11 10:08:41 +10:00
Jan Bartel 74a2ce7a42
Issue #4826 Upgrade to apache jsp 8.5.54 (#4932) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-06-03 10:04:55 +02:00
Jan Bartel 42155e889b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-01 14:47:07 +02:00
olivier lamy ab0d5e7121 simplify release script to not call goals already triggered by eclipse-release profile 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-31 09:04:59 +10:00
olivier lamy d6c77a8a44 fix merge from 9.4.x 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 20:41:15 +10:00
olivier lamy 65dbcc7c86 fix merge 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 18:26:08 +10:00
olivier lamy c05bd6c26d use testcontainers/docker to run jdbc sessions tests with Mariadb remote 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00
olivier lamy 9c7d36fd51 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-16 20:03:09 +10:00
Jan Bartel 74a506161d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-05-13 12:13:29 +02:00
Jan Bartel 6527b3b083
Issue #4868 update asm 7.3.1 (#4869) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-05-13 12:12:14 +02:00
olivier lamy 33abe753de Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-11 15:41:51 +10:00
olivier lamy 933ab641ee test helper 5.4 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-11 15:38:15 +10:00
olivier lamy 8771360425 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-08 11:02:14 +10:00
olivier lamy cba05a3db0 increase surefire memory 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-08 11:00:49 +10:00
olivier lamy 972cd95ec0 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-08 10:21:41 +10:00
Olivier Lamy 78992a126c
Start a mongo instance for testing using docker via java code (#4840) 
* remove slow mongo maven plugin which was forking an external process and now run mongodb in a container so we can even now test with different version using -Dmongo.docker.version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-08 07:06:03 +10:00
olivier lamy 72cb9bf3d8 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-04-22 15:14:43 +10:00
olivier lamy 32aa5d6453 not sure if it is used but at least we will not hit this repo when building 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-04-22 14:52:14 +10:00
Simone Bordet be4cbd69c1 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-04-19 16:50:04 +02:00
Simone Bordet fe7f71fda1 Excluding the "external" tests to make builds in Jenkins more reliable. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-04-19 16:47:49 +02:00
Simone Bordet 15f7e0671b Issue #4443 - Track backport of ALPN APIs to Java 8. 
Removed Java 8 profiles, not needed anymore.
Jetty 9.4.x requires Java 9+ to be built, in order to build Java 9 specific modules.
The ALPN boot jar used in tests was either replaced by the ALPN agent or the tests only run in Java 9+.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-04-18 16:21:36 +02:00
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
Simone Bordet 2969a0a7af Do not emit compilation warnings for test sources. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-03-26 18:01:27 +01:00
Joakim Erdfelt 2c600f2b68
Issue #4685 - Mark jetty-slf4j-impl as test scope by default 
+ Update logging in test-hazelcast-sessions
+ Update logging in test-infinispan-sessions

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-03-20 09:55:15 -05:00
Olivier Lamy 0541c5efb4
fix javadoc aggregate generation by using last maven javadoc plugin 3.2.0 (#4675) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-03-19 07:06:13 +10:00
Simone Bordet b22c0b196f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-18 17:00:01 +01:00
Simone Bordet 6df47dd183 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4443-alpn-backport-8u252'. 2020-03-18 10:57:23 +01:00
Simone Bordet 8a5fc6375b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-17 23:42:29 +01:00
Simone Bordet 785b640327 Fixes #2896 - Wrong Certificate Selected When Using Multiple Virtual Host Names in Conscrypt 
Updating to a Conscrypt version that supports this feature.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-03-17 23:40:38 +01:00
Simone Bordet 9bb92f81bd Issue #4443 - Track backport of ALPN APIs to Java 8. 
Modified jetty-alpn-openjdk8-* classes to support both
pre 8u252 (via alpn-boot) and post 8u252 (via standard API).

Replaced usages of -Xbootclasspath with -javaagent, and
using Jetty ALPN Agent jar rather than Jetty ALPN boot jar.

Removed all alpn-1.8.0*.mod files since now it is
possible to use a fixed version of the ALPN Agent
to cover all the versions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-03-17 11:40:29 +01:00
Joakim Erdfelt 57604d0955
Issue #4572 - Mechanical Change to use org.slf4j 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-03-16 15:48:25 -05:00
Joakim Erdfelt 8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J 
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
       org.eclipse.jetty.util.log.Logger but as
  simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
  to org.eclipse.jetty.logging.StacklessLogging found in
  the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
  + and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
  + Also adding note to jetty-util classes that are used by
    jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-03-16 11:21:54 -05:00
olivier lamy 1c4a21c9be Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-03-09 14:28:53 +10:00
Olivier Lamy 3a77542303
upgrade shade plugin and align version (#4639) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-03-05 09:10:12 +10:00
olivier lamy 77a54c21a1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-03-03 20:53:26 +10:00
Olivier Lamy 3a8b45d20c
Issue #4619 align derby version (#4626) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-03-03 10:20:27 +10:00
Joakim Erdfelt 8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00
Joakim Erdfelt a304fd9f35 Updating to version 9.4.27.v20200227 2020-02-27 12:21:57 -06:00
olivier lamy 422b32be9e Revert "Issue #4562 remove deprecated jetty-runner (#4563)" 
This reverts commit ebed3e5b38.
 2020-02-20 10:33:50 +10:00
Olivier Lamy ebed3e5b38
Issue #4562 remove deprecated jetty-runner (#4563) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-02-13 11:13:20 +10:00
olivier lamy d485c9e811 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-02-12 16:36:48 +10:00
Olivier Lamy 602e700e02
use pmd plugin 3.13.0 (#4566) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-02-12 16:30:56 +10:00
Simone Bordet 7746be770a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-30 10:17:10 +01:00
Simone Bordet f52ed62f36 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-30 10:09:34 +01:00
Simone Bordet 305e4609b2 Updated ALPN version for JDK 8u241 and 8u242. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-30 10:03:38 +01:00
olivier lamy ff19bef4dc alpn for jdk 1.8.0_242 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-01-24 19:59:28 +10:00
Greg Wilkins a76fd0e948 updated Weld 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-01-21 10:21:52 +01:00
Simone Bordet d0e6d123ba
Merge pull request #4494 from eclipse/jetty-10.0.x-3185-osgi_required_environment_java11 
Fixes #3185 - Bundle-RequiredExecutionEnvironment: JavaSE-11 for Jett…
 2020-01-20 09:43:55 +01:00
Jan Bartel fedc7c6599
Issue #4360 Update to jasper 8.5.49 (#4487) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-01-20 09:21:16 +01:00
Jan Bartel b805bf1324
Issue #4361 Update to apache jsp 9.0.29 (#4488) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-01-20 09:20:23 +01:00
Simone Bordet ab94112f66 Fixes #3185 - Bundle-RequiredExecutionEnvironment: JavaSE-11 for Jetty 10.0.x. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-19 19:03:09 +01:00
Joakim Erdfelt 56fc476d55 Updating to version 9.4.27-SNAPSHOT 2020-01-17 07:00:10 -06:00
Joakim Erdfelt 7b38981d25 Updating to version 9.4.26.v20200117 2020-01-17 06:21:47 -06:00
Joakim Erdfelt 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
Joakim Erdfelt 33a5a257aa
Updates from review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-15 11:32:04 -06:00
Joakim Erdfelt 1c00006ca7
Checkstyle now mandatory on build 
+ Removed checkstyle suppressions
+ Force scan on source directories (main and test)
+ Excluding generated / filtered / copied sources
+ Removed Jenkins job for checkstyle

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-14 14:47:16 -06:00
Joakim Erdfelt 51c4cbeebe
Merge branch 'jetty-10.0.x-3578-epl2' of github.com:eclipse/jetty.project into jetty-10.0.x-3578-epl2 2020-01-09 15:57:20 -06:00
Joakim Erdfelt 1f8ad08281
Fixing Checkstyle violations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-09 15:56:06 -06:00
Simone Bordet ce7c993c0e Fixes #3578 - Adopt EPL-2.0 for Jetty-10. 
Updated documentation files.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-09 21:56:05 +01:00
Joakim Erdfelt 0e0f5822c3
Issue #3578 - Adding build reactor local remote-resources 
+ LICENSE and NOTICE.txt are now part of the remote-resources
  bundle on org.eclipse.jetty:build-resources:${project.version}
+ LICENSE and NOTICE.txt are managed only in one place now,
  the project root.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-09 13:59:51 -06:00
Simone Bordet 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
Simone Bordet c19d35b34f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-07 17:24:30 +01:00
Simone Bordet 69808d3851
Merge pull request #4454 from JLLeitschuh/patch-1 
Use HTTPS instead of HTTP to download SNAPSHOT Deps
 2020-01-07 17:23:57 +01:00
Simone Bordet a5c99207fc Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-07 17:02:40 +01:00
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-07 16:25:32 +01:00
Jonathan Leitschuh 46140ed097 HTTPS instead of HTTP to download SNAPSHOT Deps 
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
 2020-01-04 11:45:43 -05:00
Joakim Erdfelt f4e7e4c3db Merge branch 'release-9.4.25' into jetty-9.4.x 2020-01-03 12:49:27 -06:00
olivier lamy ff48fba585 happy new year 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-01-02 21:59:21 +01:00
olivier lamy e1371a1c13 happy new year 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-01-02 21:54:05 +01:00
Joakim Erdfelt 8974176c4b Updating to version 9.4.26-SNAPSHOT 2019-12-20 11:30:41 -06:00
Joakim Erdfelt a9729c7e7f Updating to version 9.4.25.v20191220 2019-12-20 10:46:56 -06:00
Simone Bordet 7247639694 Issue #4225 - Fix JPMS transitivity. 
Integrated Jetty WebSocket API 1.1.2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-12-20 16:59:47 +01:00
Simone Bordet 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
Joakim Erdfelt c4791d8a58
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-26 14:15:47 -06:00
Joakim Erdfelt 19e740451a
Bump up jetty-version-maven-plugin to version 2.6 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-11-26 14:15:23 -06:00
Joakim Erdfelt 2777229867
Merge branch `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
#	build-resources/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/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/infinispan-common/pom.xml
#	jetty-infinispan/infinispan-embedded-query/pom.xml
#	jetty-infinispan/infinispan-embedded/pom.xml
#	jetty-infinispan/infinispan-remote-query/pom.xml
#	jetty-infinispan/infinispan-remote/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-openid/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/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java
#	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-webapp/pom.xml
#	jetty-websocket/javax-websocket-client/pom.xml
#	jetty-websocket/javax-websocket-server/pom.xml
#	jetty-websocket/jetty-websocket-api/pom.xml
#	jetty-websocket/jetty-websocket-common/pom.xml
#	jetty-websocket/jetty-websocket-server/pom.xml
#	jetty-websocket/jetty-websocket-tests/pom.xml
#	jetty-websocket/pom.xml
#	jetty-websocket/websocket-core/pom.xml
#	jetty-websocket/websocket-servlet/pom.xml
#	jetty-xml/pom.xml
#	pom.xml
#	tests/jetty-jmh/pom.xml
#	tests/pom.xml
#	tests/test-continuation/pom.xml
#	tests/test-distribution/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-cdi-common-webapp/pom.xml
#	tests/test-webapps/test-felix-webapp/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-owb-cdi-webapp/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-simple-webapp/pom.xml
#	tests/test-webapps/test-webapp-rfc2616/pom.xml
#	tests/test-webapps/test-weld-cdi-webapp/pom.xml
 2019-11-26 10:46:22 -06:00
Joakim Erdfelt 5d7f7d6499 Merge branch 'release-9.4.24' into jetty-9.4.x 2019-11-26 10:31:28 -06:00
olivier lamy 3b7400b3f7 rerunFailingTestsCount only for Jenkins 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-11-25 16:09:39 +10:00
Olivier Lamy 11adf00338 Issue #2634 fix occasional exception stack trace in UnixSocketTest (#4339) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-11-21 17:16:08 +10:00
Olivier Lamy 07680b4bb2
Issue #2634 fix occasional exception stack trace in UnixSocketTest (#4339) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-11-21 17:04:16 +10:00
Joakim Erdfelt 0f7a3b2d91 Updating to version 9.4.25-SNAPSHOT 2019-11-20 16:08:38 -06:00
Joakim Erdfelt 363d5f2df3 Updating to version 9.4.24.v20191120 2019-11-20 15:25:01 -06:00
Joakim Erdfelt dc03431de2 Merge branch 'release-9.4.23' into jetty-9.4.x 2019-11-20 07:14:53 -06:00
olivier lamy ba30800f66 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-19 21:27:30 +10:00
olivier lamy 9ab6a073fa we do not need those repositories now 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-11-19 20:28:43 +10:00
Joakim Erdfelt 453d41940b Updating to version 9.4.24-SNAPSHOT 2019-11-18 13:52:51 -06:00
Joakim Erdfelt abbccc65d6 Updating to version 9.4.23.v20191118 2019-11-18 13:09:44 -06:00
Simone Bordet fb691fbe5a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-18 10:05:16 +01:00
Jan Bartel ac63c121b6 Issue #3869 Update to asm 7.2 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-18 16:49:15 +11:00
olivier lamy b4cc3ef2de Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-18 07:30:48 +10:00
olivier lamy e69eea86c8 make rerunFailingTestsCount a property so we can change it on cli if needed 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-11-18 07:20:42 +10:00
olivier lamy e60a109897 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-18 07:18:22 +10:00