Commit Graph

2709 Commits

Author SHA1 Message Date
Jan Bartel d114d8ffc4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-21 11:49:36 +10:00
Jan Bartel d3bfb61761
Jetty 10.0.x 6687 upgrade infinispan (#6766)
* Issue #6687 Update to infinispan 11.0.11

Signed-off-by: Jan Bartel <janb@webtide.com>


* fix upperbound dependency
* use infinispan bom

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

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-21 11:16:50 +10:00
Joakim Erdfelt e629e1c26e
Merge pull request #6797 from eclipse/jetty-10.0.x-version-rollup
Rollup of version changes for 10.0.x
2021-09-13 18:20:27 -05:00
Olivier Lamy d90c7152d5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-09-14 06:21:42 +10:00
dependabot[bot] b44dde6098
Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 (#6755)
* Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0

Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M3...enforcer-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* fix some upper bound issues and exclude more javax

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

* fix upperbound dependencies issue with enforcer plugin upgrade

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

* exclude this wrong which makes enforcer plugin fail and btw it's not used

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

* fix last enforcer upperbound issues

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-14 06:10:48 +10:00
Joakim Erdfelt 976ce25b89
Bump openwebbeans.version to 2.0.23
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-09-13 14:18:43 -05:00
Jan Bartel 147ea963cc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-10 10:24:13 +10:00
Jan Bartel 3b04e5af97
Issue #6735 Fix xml for infinispan-remote-query and infinispan-embedded-query (#6747)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-09-10 10:12:05 +10:00
dependabot[bot] d51cec2d1d
Bump openwebbeans.version from 2.0.20 to 2.0.23 (#6750)
Bumps `openwebbeans.version` from 2.0.20 to 2.0.23.

Updates `openwebbeans-web` from 2.0.20 to 2.0.23
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.20...openwebbeans-2.0.23)

Updates `openwebbeans-jetty9` from 2.0.20 to 2.0.23
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.20...openwebbeans-2.0.23)

---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-10 08:59:40 +10:00
dependabot[bot] 30b42d20d9
Bump org.apache.felix.framework from 6.0.3 to 7.0.1 (#6707)
Bumps org.apache.felix.framework from 6.0.3 to 7.0.1.

---
updated-dependencies:
- dependency-name: org.apache.felix:org.apache.felix.framework
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-09 17:41:52 +10:00
Olivier Lamy 91e2de166e
fix parent version 2021-09-03 18:08:54 +10:00
Olivier Lamy f3e55848e5
fix parent version 2021-09-03 18:08:22 +10:00
Lachlan Roberts 4317c17c84 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-02 10:26:33 +10:00
Lachlan Roberts 59a5b7c9ef Changes from review.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-31 11:28:59 +10:00
Lachlan Roberts ead1f6b160 Issue #6601 - export websocket-core-common to jetty-util for DecoratedObjectFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-30 11:43:54 +10:00
Lachlan Roberts e64b390fd6 Issue #6601 - add proper JPMS testing for websocket-core
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-30 11:11:20 +10:00
Joakim Erdfelt bda0c97f62
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-08-26 11:27:23 -05:00
Joakim Erdfelt c5a33e27d2
Issue #5684 - Windows test overhaul (#6581)
Issue #5684 - Window's test overhaul

+ Migrate from @DisabledOnOs(WINDOWS) to assumptions on capabilities instead.
+ Fix other outstanding windows testing issues.
+ Cleanup FileBufferedResponseHandlerTest expectations on Windows.
+ PathWatcher scan interval is variable on windows
+ If unable to start testcase based on assumption,
  the stop shouldn't fail testcase
+ Increase various wait timeouts
+ Make tests less strict due to system speed issues
+ Disable Sni tests due to TLS behaviors differences in Windows
  + Windows TLSv1.3 seems to introduce this difference
  + If we restrict to TLSv1.2 this passes.
  + On Linux TLSv.13 on client side will always return a
  + javax.net.ssl.SSLHandshakeException in those test cases that expect it.
  + However, on Windows, Only the TLSv1.2 implementation will return a javax.net.ssl.SSLHandshakeException,
  + All other TLS versions on Windows will result in a
  + javax.net.ssl.SSLException: Software caused connection abort: recv failed
+ Disable ConcurrentStreamCreationTest
  + Not possible to create all of these streams.
+ Fixing DeploymentTempDirTest
  + Using unique workdir per testcase.
  + Don't expect to delete files / directories between tests
    (not supported on windows due to file locking anyway)
 + Fixing line ending difference on windows
 + InvalidPathException is a 404 Not Found
 + Cannot reuse test directory between runs due to memory mapped files that are still in use from previous run.
 + java.nio.file.FileSystemException: C:\code\jetty.project\jetty-webapp\target\tests\welcome#\index.html: The requested operation cannot be performed on a file with a user-mapped section open.

	at java.base/sun.nio.fs.WindowsException.translateToIOException(WindowsException.java:92)
	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:103)
	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:108)
	at java.base/sun.nio.fs.WindowsFileSystemProvider.newByteChannel(WindowsFileSystemProvider.java:235)
	at java.base/java.nio.file.spi.FileSystemProvider.newOutputStream(FileSystemProvider.java:478)
	at java.base/java.nio.file.Files.newOutputStream(Files.java:220)
	at org.eclipse.jetty.webapp/org.eclipse.jetty.webapp.WebAppDefaultServletTest.prepareServer(WebAppDefaultServletTest.java:84)

 + As is typical on windows, we are often unable to delete a file due to file locking issues.
 + Use a unique resource base between tests.
   This is to avoid file locking behaviors that prevent the
   resource base from being reused too quickly on windows.
 + Prevent test run if symlinks not supported
 + Allowing for Windows slosh char as well in asserts
 + SelectorUtils is File.separator dependent
 + Regex is now FS.separator independent
 + Using SelectorUtils from plexus correctly for include/exclude
 + Turning off mapped files for testing reasons.
 + Fix and re-enable RFC2616NIOHttpsTest
 + Issue #6552 - Fix test failures due to slf4j dep
 + Issue #6552 - upgrade testcontainers
 + Issue #6552 - move to assumption based docker existence
 + Issue #6552 - Fix enforcer rule violation on jna.
  Addresses the following side effect of upgrading testcontainers.

[WARNING] Rule 3: org.apache.maven.plugins.enforcer.RequireUpperBoundDeps failed with message:
Failed while enforcing RequireUpperBoundDeps. The error(s) are [
Require upper bound dependencies error for net.java.dev.jna:jna:5.6.0 paths to dependency are:
+-org.eclipse.jetty:infinispan-remote-query:10.0.7-SNAPSHOT
  +-org.testcontainers:testcontainers:1.16.0
    +-com.github.docker-java:docker-java-transport-zerodep:3.2.11
      +-net.java.dev.jna:jna:5.6.0 (managed) <-- net.java.dev.jna:jna:5.8.0

 + use annotation to disable test when docker not available and needed
 + Disabling FileSessionDistributionTests.stopRestartWebappTestSessionContentSaved on Windows
 + Using TLS basic
 + Programmatic removal of memory mapped behavior during testing
 + Fixing slf4j warning

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-08-26 11:26:46 -05:00
Jan Bartel 7b52e9b5de Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-08-19 12:39:32 +10:00
Olivier Lamy 1acf54ba59
Upgrade h2spec-maven-plugin to 1.0.6 (#6616)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-08-19 09:06:52 +10:00
Simone Bordet 27288cef9c
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-13 17:54:41 +02:00
Simone Bordet 4af93b5e19
Issue #6476 - warn on exec (#6597)
Fixes #6476 - Show message if JVM args are present but new JVM is spawned

* Improved documentation by correctly redacting out `jetty-halt.xml`,
an XML file that is only necessary for rendering the documentation.
* Added WARN message when new JVM is spawned.
* Updated documentation.
* Updated --list-config to report whether a JVM is forked.
* Added test case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-13 17:32:53 +02:00
Ludovic Orban 7e39d5434a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:56:01 +02:00
Ludovic Orban 15bef0c9ed #6327 rework testRequestIdleTimeout and merge http(s) and fcgi test
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Ludovic Orban 0a98a37cb6 #6327 wait for the request to be committed before sending the data
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Ludovic Orban 72505af846 #6327 stop relying on timeouts to abort tested requests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Ludovic Orban 8766bddb50 #6327 improve test
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Ludovic Orban 37eb7909be #6327 enable HttpClientStreamTest.testUploadWithDeferredContentProviderFromInputStream
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Ludovic Orban 2868eea9cc #6327 enable all disabled tests in HttpClientContinueTest
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Ludovic Orban 7867d51c91 #6327 replace Await helper with awaitility
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Ludovic Orban 5dc856196e #6327 extract HttpOutput._apiState value from toString
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Ludovic Orban 26d144d708 #6327 enable AsyncIOServletTest.testAsyncWriteClosed
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-12 10:47:24 +02:00
Olivier Lamy ed667cc736
disabled those tests as third parties app are not jakarta ready (#6589)
* disabled those tests as third parties app are not jakarta ready

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-08-10 15:09:28 +10:00
Olivier Lamy 40e6ab2be4 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-08-06 12:09:11 +10:00
Olivier Lamy c7f0c5a4ca
Issue #6373 testing modules, starting with session storage (#6529)
* Issue #6373 testing modules, starting with session storage

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-08-06 12:07:09 +10:00
Simone Bordet 832b7a0be0
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-05 10:18:39 +02:00
Simone Bordet 49a08450c2
Fixes #6043 - Reimplement UnixSocket support based on Java 16. (#6522)
Fixes #6043 - Reimplement UnixSocket support based on Java 16.

* Introduced new module "jetty-server-unixdomain".
It uses reflection to access the Java 16 Unix-Domain classes to keep compatibility with the other modules and the build.
* Added Jetty module with only HTTP/1.1 support for now (requires review of the modules to reuse them with various connectors).
* Updated documentation to mention UnixDomainServerConnector.
* Updated client libraries to support Unix-Domain.
* Updated PROXY protocol implementation to support Unix-Domain.
* Replaced unix.socket.tmp with better named jetty.unixdomain.dir property.
Defaulted jetty.unixdomain.dir property to system property user.home under Windows.
Simplified code that runs Unix-Domain tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-05 10:04:37 +02:00
Joakim Erdfelt 7f325dfc6e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-30 13:47:55 -05:00
Joakim Erdfelt 3868360555
Issue #6544 - More updates based on review and merge
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-30 07:29:59 -05:00
Joakim Erdfelt 4d35dd736d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6544-gziphandler-excludedMimeTypes 2021-07-30 07:25:18 -05:00
Joakim Erdfelt 72fc018cc5
Issue #6544 - Updates based on review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-30 07:25:03 -05:00
Joakim Erdfelt 14962805ec
Import cleanup 2021-07-28 05:56:33 -05:00
Joakim Erdfelt 26b4a1143e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-28 05:50:15 -05:00
Joakim Erdfelt 1bdb69dc07
Issue #6544 - Fixing broken `jetty.gzip.excludedMimeTypeList` property support
+ Adding GzipHandler tests
+ Adding Gzip module tests
+ Updating jetty-gzip.xml for
  includedMimeTypesList and
  excludedMimeTypesList behavior
+ Adding GzipHandler support for
  setIncludedMimeTypesList(String) and
  setExcludedMimeTypesList(String

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-27 11:36:56 -05:00
Joakim Erdfelt fdc210f382
Remove unused imports
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-27 08:03:00 -05:00
Olivier Lamy 08ace84dca Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-07-25 21:24:49 +10:00
Olivier Lamy 41481669af
use bom for junit with upgrade to 5.7.2 and testcontainer dependencies (#6532)
* use bom for junit and testcontainer dependencies

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

* remove some duplicate and redundant dependencies declaration as we now have the bom

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-07-25 21:23:57 +10:00
Olivier Lamy 8038ebd69c fix import
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-07-22 16:59:01 +10:00
Olivier Lamy 9a7d9fb931 fix version
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-07-22 16:47:49 +10:00
Olivier Lamy 0e17ee75c8 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-07-22 16:39:05 +10:00