Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,967 Commits 73 Branches 465 Tags 359 MiB
Commit Graph

275 Commits

Author SHA1 Message Date
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-02-15 12:48:24 -06:00
Simone Bordet 29d48b0de5 Improvements to the Jetty documentation. 
Documented the Jetty start mechanism.

Reorganized the documentation to look better on the TOC.

Improved JettyIncludeExtension to support replacements, deletions and callouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-10 11:27:30 +01:00
Joakim Erdfelt c80eac0386
Fixing checkstyle issue 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-26 11:13:09 -06:00
olivier lamy b214837c78 use local repo to download mod files 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-01-26 21:03:56 +10:00
olivier lamy da7fd63d98 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-01-26 18:26:18 +10:00
Joakim Erdfelt 4c51591407
Remove PMD from build (#5900) 
* Remove PMD from build

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

* Attempt to fix log4j2 distribution test

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

* Fixing jetty-start tests to use configured maven.repo.uri property

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

* Using ${env.MAVEN_REPO_URI} configured at Jenkins.

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

* no need of this

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

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
 2021-01-26 18:17:29 +10:00
Simone Bordet 95b5cfd532
Fixes #5902 - Grab Jetty startup output in documentation. (#5906) 
* Fixes #5902 - Grab Jetty startup output in documentation.

Implemented an Asciidoctor extension that uses `JettyHomeTester` to run
Jetty and capture its output.
This extension is triggered by the `ServiceLoader` mechanism, so the
documentation jar is now in the plugin classpath.

Introduced `jetty-halt.xml` so that the JVM can be halted.
In this way, Jetty does not produce the "stopping" log lines and
therefore they won't be grabbed and included in the documentation.

Used the new `include::jetty[]` directive in the documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2021-01-25 14:21:17 +01:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 15:05:57 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 12:31:00 -06:00
Simone Bordet 9fe5700260
Fixes #5880 - Move test-simple-webapp to demos. (#5881) 
* Fixes #5880 - Move test-simple-webapp to demos.

Moved test-simple-webapp to demos under demo-simple-webapp.
Moved the JSP demos into their own module: out of demo-jetty-webapp into demo-jsp-webapp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-21 15:27:03 +01:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Simone Bordet f836f87754 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-11 11:23:12 +01:00
Simone Bordet b45c32616c
Fixes #5844 - --download flag to jetty-start causes NullPointerException. 
Added test case, null guard and a couple small fixes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-07 12:51:06 +01:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-10 16:04:50 -06:00
Joakim Erdfelt 0a70fbf206
Merge remote-tracking branch 'origin/release-10.0.0' into jetty-10.0.x 2020-12-09 15:28:26 -06:00
olivier lamy aabe5ceee2 remove duplicate dependencies 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-07 21:14:59 +10:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Joakim Erdfelt e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-17 09:12:50 -06:00
Joakim Erdfelt 314c65fb14
Issue #5539 - Adding StatisticsServlet tests in test-distribution 
+ Updating module definition for JSON

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 12:31:28 -06:00
Lachlan Roberts 416579a690 fix formatting in DistributionTests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 22:24:19 +11:00
Lachlan Roberts fc4e263f93 Add module and configuration for websocket-client provided to webapp. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 22:22:13 +11:00
Lachlan Roberts 8d21bb7b63 Issue #5320 - fix the XmlHttpClientProvider for jetty 10, re-enable tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-03 17:17:27 +11:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Lachlan Roberts 1b5747cbbe Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-03 01:17:31 +11:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Lachlan 12f3c450dc
Merge pull request #5374 from eclipse/jetty-9.4.x-5320-WebSocketHttpClient 
Issue #5320 - using jetty-websocket-httpclient.xml within webapp
 2020-11-03 00:30:09 +11:00
Lachlan Roberts 60c56d8856 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-02 23:43:42 +11:00
Simone Bordet 40fd98d6a9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-02 10:47:03 +01:00
Simone Bordet a1b3d3319d
Merge pull request #5491 from eclipse/jetty-9.4.x-5488-jetty-dir.css 
Fixes #5488 - jetty-dir.css not found when using JPMS.
 2020-11-02 10:40:19 +01:00
Lachlan Roberts 3c3fcc311e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-30 12:43:31 +11:00
Joakim Erdfelt 1ad6ebabb6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-28 15:45:50 -05:00
Joakim Erdfelt 3b8e7c143d
Bump maven.resolver.version from 1.3.1 to 1.6.1 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-28 13:31:42 -05:00
Simone Bordet 4a4a73df2e Fixes #5488 - jetty-dir.css not found when using JPMS. 
Moved jetty-dir.css from jetty-util to jetty-server,
so that it can be found by ResourceHandler when using JPMS.

Updated DefaultServlet to call a ResourceHandler method
to retrieve the stylesheet.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-22 16:48:27 +02:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
Joakim Erdfelt 1e9c736692
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 17:51:32 -05:00
Joakim Erdfelt e6fb4c3ac4 More fixes to allow project to build on Windows 10 2020-10-16 16:45:25 -05:00
Lachlan Roberts 4cb475c97d Issue #5320 - also test WebSocketClient on server from WEB-INF/lib 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-15 16:15:57 +11:00
Lachlan Roberts 6cd70ce136 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 2020-10-15 14:12:21 +11:00
Lachlan Roberts 26f4062d93 Parameterize testWebsocketClientInWebapp over both http and https 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 16:35:58 +11:00
Joakim Erdfelt 345484929c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-08 08:53:15 -05:00
Joakim Erdfelt fe03a3e6c2
Bump OpenWebBeans from 2.0.11 to 2.0.18 
+ Brings in ServletContainerInitializer fix from 2.0.12

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-08 07:31:20 -05:00
Lachlan Roberts 27a0879798 dont run WebsocketClientInWebapp test with JPMS 2020-10-02 15:39:49 +10:00
Lachlan Roberts 5b96f6f984 Issue #5320 - Run jetty-websocket-httpclient.xml with server class access. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-01 12:38:17 +10:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Lachlan Roberts 00f05cb94e Issue #5320 - reproduce failure to load httpClient for WebSocketClient in webapp 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-30 15:11:05 +10:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358) 
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 11:02:32 -05:00
Joakim Erdfelt ad805d4756
Issue #5264 - More post move to /demos/ updates 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 15:38:34 -05:00
Joakim Erdfelt faf6d80390
Issue #5264 - Moving demo webapps to /demos/ tree 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 13:35:19 -05:00
Joakim Erdfelt 8a64309cdf
Issue #5264 - Reworking demo/tests into modules based on config classifiers 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 13:57:23 -05:00
Joakim Erdfelt 4ecff26022
Issue #5264 - Reworking test-distribution to use jetty-home 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 13:56:34 -05:00
Lachlan Roberts 14e6bd196e update javadoc for JDK MethodHandles bug tests, stop stacktrace in DistributionTests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-14 17:28:57 +10:00
gregw d7b3d62982 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-07 15:59:27 +02:00
Greg Wilkins 7ecf42e3f8
Issue #5162 CDI embedded integration improvements (#5177) 
* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + made listener public
 + added utility class for SCIs

* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + moved EmbeddedWeldTest to jetty-embedded

* fix javadoc

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

* Issue #5162 CDI embedded integration improvements

ventilated text

* fix test pom

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

* Fixed javadoc

* Fixed javadoc

* Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded

* trailing new line

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

* updates from review

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

* Feedback from review
 2020-09-07 14:00:20 +02:00
Joakim Erdfelt a54ed928ab
Issue #5174 - Reorganized jetty-distribution 
+ Updating license / notice files for EPLv2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-03 07:13:58 -05:00
Simone Bordet 466ec0c2d5 Disabled tests broken in Java 15 due to a JVM bug. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-02 18:52:10 +02:00
Simone Bordet ac4ea4550e Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-13 16:52:35 +02:00
Joakim Erdfelt e7a07074f5
Setting DemoBaseTest.testAsyncRest() as @Tag("external") 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-13 08:42:44 -05:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
Lachlan Roberts d5cf429537 fix websocket tests from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 12:17:20 +10:00
olivier lamy eefe3d202b revert fail release 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +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
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
Lachlan Roberts 1ad600ea49 fix WS DistributionTest incorrect test expectation 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-04-30 10:14:43 +10:00
Lachlan Roberts b0e57ffd6d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-LinkageErrorInvestigation 2020-04-29 22:52:33 +10:00
Lachlan Roberts bf5d4ea554 Issue #4800 - Revert MethodHandle changes & update DistributionTests 
- It seems it is correct to use the `MethodHandles.publicLookup().in()`
but this does not work if same webapp is deployed twice, so the
MethodHandle changes have been reverted and the test has been disabled
until a resolution to https://bugs.openjdk.java.net/browse/JDK-8244090.

- The DistributionTest has been changed to properly reproduce the issue.
There must be a class in the signature of the websocket endpoint which
is available to both webapps and the client must send and receive an echo
message to ensure that the onOpen MethodHandle is actually invoked.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-04-29 22:52:26 +10:00
olivier lamy 4a4626614c ooops checkstyle 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-04-29 15:22:35 +10:00
olivier lamy c5f8cf2f6a add a parameter to add jvm args 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-04-29 14:11:41 +10:00
Lachlan Roberts c8a1dacdd0 Issue #4800 - Improve WS DistributionTest to also test working webapp 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-04-27 10:54:06 +10:00
Lachlan Roberts fb85c71f8d Issue #4800 - invalid PathParam types should be reported at Deployment 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-04-24 17:11:23 +10:00
Lachlan Roberts 870a765464 Issue #4800 - prevent LinkageErrors for WS lookup on JDK 14 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-04-24 13:31:29 +10:00
olivier lamy 557b493588 tests fixed 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-04-22 10:24:16 +10:00
olivier lamy 6d4d7393fc do not test anymore if LinkageError is not there because it is there with java14 but still working... 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-04-22 10:23:45 +10:00
Lachlan Roberts 73382fe430 Issue #4800 - disable test DistributionTests.testSimpleWebAppWithWebsocket() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-04-22 09:42:00 +10: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
Joakim Erdfelt 08df1d9f73
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-restore-owb-hack 2020-04-07 09:44:07 -05:00
olivier lamy a189d13fd5 cleanup 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-04-07 10:59:50 +10:00
olivier lamy be50caf591 Issue #4690 Allow DistributionTester to work with log files 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-04-07 10:59:50 +10:00
Joakim Erdfelt f3bd6611f4
Fix OWB (Open WebBeans) tests. 
+ OWB needs init-parameter to allow it's own
  ServletContainerInitializer found at
  org.apache.webbeans.servlet.WebBeansConfigurationListener$Auto
  to execute and properly add the required Listener for
  OWB to function.
+ See OWB-1296

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-03-25 07:12:29 -05:00
Simone Bordet e215d071c8 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'. 2020-03-23 16:24:04 +01:00
Joakim Erdfelt 43419802b7
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-03-20 11:12:08 -05: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
Joakim Erdfelt a16abe1693
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency. 
+ Mark as a test dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-03-19 17:46:41 -05:00