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

18649 Commits

Author SHA1 Message Date
Joakim Erdfelt ba577ba972
Merge pull request #5508 from eclipse/dependabot/maven/jetty-9.4.x/org.mariadb.jdbc-mariadb-java-client-2.7.0 
Bump mariadb-java-client from 2.6.0 to 2.7.0
 2020-11-03 07:44:56 -06:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Joakim Erdfelt 981b50df58
Merge pull request #5559 from eclipse/jetty-9.4.x-5555-NPE-NamedFilterMapping 
Jetty 9.4.x 5555 npe named filter mapping
 2020-11-02 07:57:18 -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
gregw 4c49ca5184 More cleanup for #5555 
Some more cleanup for #5555
 2020-11-02 14:08:46 +01:00
Lachlan Roberts 60c56d8856 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-02 23:43:42 +11:00
Greg Wilkins b77ee515a5
Fixes #5555 NPE if Filter of named servlet (#5556) 
Fixed #5555 NPE if there is a filter with a servlet name mapping, but a request is received for a servlet without a name match.
Added more simple tests for servlet and filter mappings
 2020-11-02 13:30:52 +01:00
gregw f21c606f1d Fixes #5539 Stats XML format 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-02 10:45:45 +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
dependabot[bot] 40acf60936
Bump geronimo-annotation_1.3_spec from 1.1 to 1.3 (#5552) 
Bumps geronimo-annotation_1.3_spec from 1.1 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-02 19:31:04 +10:00
dependabot[bot] e70e995f0c
Bump openwebbeans.version from 2.0.18 to 2.0.19 (#5551) 
Bumps `openwebbeans.version` from 2.0.18 to 2.0.19.

Updates `openwebbeans-web` from 2.0.18 to 2.0.19
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Updates `openwebbeans-jetty9` from 2.0.18 to 2.0.19
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-02 19:30:29 +10:00
gregw 365bab153c Fixes #5555 NPE if Filter of named servlet 
Fixed #5555 NPE if there is a filter with a servlet name mapping, but a request is received for a servlet without a name match.
Added more simple tests for servlet and filter mappings
 2020-11-02 10:19:08 +01:00
dependabot[bot] 9b4b52df59
Bump pax-url-wrap from 2.5.2 to 2.6.1 
Bumps [pax-url-wrap](https://github.com/ops4j/org.ops4j.pax.url) from 2.5.2 to 2.6.1.
- [Release notes](https://github.com/ops4j/org.ops4j.pax.url/releases)
- [Commits](https://github.com/ops4j/org.ops4j.pax.url/compare/url-2.5.2...url-2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-02 06:40:10 +00:00
Lachlan Roberts 458d67e3db Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 2020-11-02 15:07:05 +11:00
dependabot[bot] 2f295c126f
Bump mariadb-java-client from 2.6.0 to 2.7.0 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.0...2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-30 18:18:43 +00:00
Joakim Erdfelt 8b61d70af5
Merge pull request #5510 from eclipse/dependabot/maven/jetty-9.4.x/io.grpc-grpc-core-1.33.0 
Bump grpc-core from 1.0.1 to 1.33.0
 2020-10-30 13:18:16 -05:00
Joakim Erdfelt aa45104649
Merge pull request #5460 from eclipse/dependabot/maven/jetty-9.4.x/org.asciidoctor-asciidoctor-maven-plugin-2.1.0 
Bump asciidoctor-maven-plugin from 1.5.6 to 2.1.0
 2020-10-30 13:17:32 -05:00
Joakim Erdfelt 1f727cd10a
Merge pull request #5538 from eclipse/jetty-9.4.x-5531-ssl-dump-protocols 
Issue #5535 - Adding support for regex include/exclude of Protocols to SslContextFactory
 2020-10-30 13:07:30 -05:00
Joakim Erdfelt 249cb02a75
Issue #5535 - Removing irrelevant lines on test 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-30 11:22:46 -05:00
Baoyi Chen 1f5b446462 Fix issue #5499 
this PR let the ByteAccumulator recyclable. after invoke ByteAccumulator.transferTo method
we can invoke ByteAccumulator.recycle method to reuse byte[] via ByteAccumulator.newByteBuffer method

Signed-off-by: Baoyi Chen <chen.bao.yi@qq.com>
 2020-10-31 00:08:30 +08:00
Joakim Erdfelt 074b4f90f7
Issue #5535 - Adding regex include/exclude of Protocols to SslContextFactory 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-30 10:29:35 -05:00
Lachlan Roberts 59883af8bf update version to 9.4.34-SNAPSHOT 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-30 15:00:38 +11: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 c969fba71a
Issue #5531 - Using .setExcludeProtocols correctly. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-29 20:28:21 -05:00
Joakim Erdfelt cff4771375
Issue #5531 - Test excluded protocol behavior 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-29 13:57:20 -05:00
Joakim Erdfelt dadd299e47
Cleanup of SslContextFactoryTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-29 13:44:21 -05:00
Joakim Erdfelt 1c3c3ca092
Merge pull request #5529 from eclipse/dependency/jetty-9.4.x/maven.resolver.version-1.6.1 
Bump maven.resolver.version from 1.3.1 to 1.6.1
 2020-10-28 15:44:55 -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
Greg Wilkins 7a0de6af3a
Fixes #5498 ServletHolder cleanup (#5514) 
* Fixes #55498 ServletHolder cleanup

Various cleanups for #5498 including:
 + renaming multiple `_servlet` fields in inner classes to avoid confusion
 + better comments in prepare method to describe why it is needed
 + call prepare from Invoker servlet
 + The `_servlet` field is not set until after the servlet is initialized
 + Consistent wrapping of `SingleThreadedWrapper` now in `initServlet`
 + The `getServlet` method now looks the volatile `_servlet` to avoid locking if possible
 + The `handle` method now calls `getServletInstance` as servlet will have been initialized in `prepare`
 + Found and fixed race with making unavaiable servlet available again
 + fixed nanotime overflow
 + fixed several compiler warnings/suggestions
 + removed while true from unavailable servlet
 + Do not destroy servlets unless init has been called.
 + Added TODOs about calling predestroy on instances not created by the holder.
 + Do not destroy servlets unless init has been called.
 + Added TODOs about calling predestroy on instances not created by the holder.
 + improved dump and toString
 2020-10-28 17:46:49 +01:00
Joakim Erdfelt b3186a90c2
Merge pull request #5512 from eclipse/dependency/jetty-9.4.x/org.eclipse.platform-org.eclipse.osgi.services-3.9.0 
Bump org.eclipse.osgi.services from 3.7.100 to 3.9.0
 2020-10-28 11:32:57 -05:00
Joakim Erdfelt 273974ce55
Merge pull request #5513 from eclipse/dependency/jetty-9.4.x/org.eclipse.platform-org.eclipse.osgi-3.16.0 
Bump org.eclipse.osgi (platform) from 3.13.100 to 3.16.0
 2020-10-28 11:32:44 -05:00
Greg Wilkins 6698a314ee
Fixes #5521 ResourceCollection list NPE (#5523) 
Fixes #5521 ResourceCollection list NPE
 2020-10-28 15:23:29 +01:00
Olivier Lamy 47885f7ecb
Jetty 9.4.x h2spec-maven-plugin now check if docker is available (new version fixing issues with generated junit file) (#5497) 
* skip h2spec if no docker available

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

* active snapshot-repositories for jenkins build

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

* h2spec plugin 1.0.1

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

* new snapshot to debug jenkins

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

* simplify build to ease debug

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

* force snapshot download:

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

* use h2spec release 1.0.2

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

* remove commented sections

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

* no need of this profile

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

* profile not needed anymore

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-28 12:07:49 +10:00
olivier lamy 9285d8df71 use mvn -fae,--fail-at-end per default 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-28 11:11:43 +10:00
Joakim Erdfelt b480a97b44
Issue #5519 - Disable problematic HttpClientTLSTest.testMismatchBetweenTLSProtocolAndTLSCiphersOnClient test 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-27 16:58:05 -05:00
Joakim Erdfelt 4f38624a6c
Bump org.eclipse.osgi (platform) from 3.13.100 to 3.16.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-27 16:12:16 -05:00
Joakim Erdfelt 227e74f1e0
Bump org.eclipse.osgi.services from 3.7.100 to 3.9.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-27 16:11:29 -05:00
Joakim Erdfelt af31eac07e
Disabling SslBytesClientTest due to JDK 8u272 differences. 2020-10-27 16:03:20 -05:00
dependabot[bot] 603509b593
Bump appassembler-maven-plugin from 2.0.0 to 2.1.0 (#5507) 
Bumps [appassembler-maven-plugin](https://github.com/mojohaus/appassembler) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/mojohaus/appassembler/releases)
- [Commits](https://github.com/mojohaus/appassembler/compare/appassembler-2.0.0...appassembler-2.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-27 20:38:35 +10:00
dependabot[bot] 85e9d61a54
Bump jetty-build-support from 1.4 to 1.5 (#5509) 
Bumps [jetty-build-support](https://github.com/eclipse/jetty.toolchain) from 1.4 to 1.5.
- [Release notes](https://github.com/eclipse/jetty.toolchain/releases)
- [Commits](https://github.com/eclipse/jetty.toolchain/compare/jetty-toolchain-1.4...jetty-toolchain-1.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-27 20:38:02 +10:00
olivier lamy fda530444c Revert "add surefire timeout for httpclient test" 
This reverts commit 6845947bbf.
 2020-10-27 11:55:35 +10:00
olivier lamy 6845947bbf add surefire timeout for httpclient test 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-27 08:39:32 +10:00
Joakim Erdfelt 9617db39f8
Merge pull request #5515 from eclipse/jetty-9.4.x-5511-delete-SslEngineBehaviorTest 
Closes #5511 - Deleting old SslEngineBehaviorTest
 2020-10-26 10:22:39 -05:00
Joakim Erdfelt 64d323fce1
Closes #5511 - Deleting old SslEngineBehaviorTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-26 09:06:03 -05:00
Joakim Erdfelt 0d03196a52
Dumping JVM details for when SslEngineBehaviorTest.checkSslEngineBehaviour fails 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-26 08:54:00 -05:00
dependabot[bot] 4cf5017cea
Bump grpc-core from 1.0.1 to 1.33.0 
Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.0.1 to 1.33.0.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.0.1...v1.33.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-26 06:25:22 +00:00
Joakim Erdfelt 3ec5c340fd
Merge remote-tracking branch 'origin/release-9.4.33' into jetty-9.4.x 2020-10-22 12:46:41 -05:00
Simone Bordet a19bec92ca Added alpn-16.mod to allow building with Java 16. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-22 17:33:07 +02: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