Commit Graph

18416 Commits

Author SHA1 Message Date
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
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
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
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
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 f4c55c65e0
Merge pull request #5481 from eclipse/jetty-9.4.x-5480-npe-webinfconfiguration
NPE protection on WebInfConfiguration.deconfigure()
2020-10-20 17:27:33 -05:00
Joakim Erdfelt fa6c8f7dec
Issue #5480 - Only delete non-persist temp dir if not-empty
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 17:19:54 -05:00
Joakim Erdfelt c7ae5b50ab
Issue #5480 - Safer temp directory management
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:53:09 -05:00
Joakim Erdfelt 6be6fae291
Issue #5480 - NPE Check in WebInfConfiguration.deconfigure()
+ Removing Temp dir deletion in configureTempDirectory()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:30:39 -05:00
Joakim Erdfelt 227dd47157
Issue #5480 - Fail in jetty-maven-plugin if unable to create temp directory.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:29:22 -05:00
Joakim Erdfelt 0e98c370fd
Issue #5480 - NPE protection on IO.delete(File)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:28:36 -05:00
Joakim Erdfelt 4ecaf3049c
Merge pull request #5479 from eclipse/jetty-9.4.x-5475-ScanForAsmVersion
Fixes #5475 Scan for updated ASM version
2020-10-20 10:50:29 -05:00
Joakim Erdfelt 7155066d4a
Issue #5475 - Adding debug log output for asmVersion detect
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 10:07:43 -05:00
Joakim Erdfelt a3e3632340
Issue #5475 - Changing ASM API version lookup to use Reflection against ASM Opcodes.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 09:34:38 -05:00
gregw fa713979c0 Fixes #5475 Scan for updated ASM version
Scan for the highest known ASM version so we can always run on latest JVM if the ASM jar is updated.
2020-10-20 13:29:30 +02:00
Jan Bartel 936cd465e7
Bump spifly from 1.2.4 to 1.3.2 (#5477)
* Issue #5475 Update to spifly 1.3.2

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-10-19 17:58:20 +02:00
dependabot[bot] 5eeae2ad5c
Bump jsp-api from 2.1 to 2.2 (#5462)
Bumps jsp-api from 2.1 to 2.2.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 20:42:15 +10:00
dependabot[bot] 68f759ad6c
Bump xslthl from 2.0.1 to 2.1.3 (#5463)
Bumps xslthl from 2.0.1 to 2.1.3.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 19:01:56 +10:00
dependabot[bot] eeb918d530
Bump maven-remote-resources-plugin from 1.5 to 1.7.0 (#5464)
Bumps [maven-remote-resources-plugin](https://github.com/apache/maven-remote-resources-plugin) from 1.5 to 1.7.0.
- [Release notes](https://github.com/apache/maven-remote-resources-plugin/releases)
- [Commits](https://github.com/apache/maven-remote-resources-plugin/compare/maven-remote-resources-plugin-1.5...maven-remote-resources-plugin-1.7.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 18:50:13 +10:00
dependabot[bot] 1eae4ddae2
Bump jmh.version from 1.21 to 1.26 (#5461)
Bumps `jmh.version` from 1.21 to 1.26.

Updates `jmh-core` from 1.21 to 1.26

Updates `jmh-generator-annprocess` from 1.21 to 1.26

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 18:49:47 +10:00
Simone Bordet 8de2fbce49 Code cleanup, merging streams[Opened|Closed] from subclasses into HTTP2Session.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-18 13:01:40 +02:00
Joakim Erdfelt fed8484d88
Merge pull request #5458 from eclipse/jetty-9.4.x-5451-temp-perms-cleanup
Issue #5451 - Removing file/dir permission management from codebase
2020-10-17 05:28:13 -05:00
Joakim Erdfelt e6fb4c3ac4 More fixes to allow project to build on Windows 10 2020-10-16 16:45:25 -05:00
Joakim Erdfelt 07d35d32ae Fixing windows build/test issues. 2020-10-16 15:39:38 -05:00
Joakim Erdfelt 97f795160c Fixing windows build/test issues. 2020-10-16 13:54:27 -05:00
Joakim Erdfelt d612f12cf6
Issue #5451 - Removing file/dir permission management from codebase
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-16 13:17:28 -05:00