Commit Graph

556 Commits

Author SHA1 Message Date
Joakim Erdfelt aff36c1c0c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-08-16 06:59:33 -05:00
Joakim Erdfelt 3157256ff9
Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0 (#8467)
* Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0
* use new artifactId slf4j-reload4j

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-16 06:58:48 -05:00
Simone Bordet f4056d6132
Fixed DemoModulesTests to use <env>-demos.mod (plural) instead of <env>-demo.mod.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 19:09:45 +02:00
Simone Bordet 6f0f8854de
Merged branch 'jetty-12.0.x' into 'jetty-12.0.x-module-renaming'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 17:31:01 +02:00
Olivier Lamy 44a37746e6
Jetty 12 : reactivate `jetty-ee9-demo-embedded` and `jetty-ee9-demo-proxy-webapp` and add more (#8419)
* ee8 demos to use ee9 demos resources
* add jetty-ee8-demo-jaas-webapp
* add jetty-ee8-demo-jndi-webapp jetty-ee8-demo-mock-resources
* uhm jetty-ee8-demo-jetty-webapp have some issues
* fix jetty-ee8-demo-jetty-webapp
* fix some jetty-ee9-demo-embedded and add back jetty-ee8-demo-proxy-webapp
* demo-embedded need to have jetty-ee9-demo-jsp-webapp built first
* fixing more demos modules. Activate dist test for demo modules and all env


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-12 17:52:53 +10:00
Simone Bordet 122b095260
Jetty 12 module renaming - jetty-http3.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Simone Bordet 7d264e6024
Jetty 12 module renaming - jetty-http2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Greg Wilkins a19c1ef2ed fix all ee9 demo context paths
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-08-10 17:47:08 +10:00
Greg Wilkins d9b53a6174 fix ee9 demo context paths
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-08-10 17:33:58 +10:00
Olivier Lamy 96a455c157 fix HashLoginService use of Resource
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-05 19:36:50 +10:00
Olivier Lamy d5a0b2bd1e more fixes on Resource
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-05 18:48:08 +10:00
Greg Wilkins 8322899650 reenable ee10 distribution tests
Signed-off-by:  Jan Bartel <janb@webtide.com>
2022-07-08 09:52:20 +10:00
Greg Wilkins 33487b5fd8 reenable ee9 distribution tests
Signed-off-by: Jan Bartel <janb@webtide.com>
2022-07-08 09:51:29 +10:00
Joakim Erdfelt eddff4d2ee
Merge Release 11.0.11 back into `jetty-11.0.x` (#8193)
* Updating to version 11.0.11

* Updating to version 11.0.12-SNAPSHOT
2022-06-22 16:24:57 -05:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194)
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
2022-06-22 16:24:48 -05:00
Joakim Erdfelt a3616cad80
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-21 15:27:24 -05:00
Tamas Cservenak 3fabe540a5
Fix test-distribution classpath re resolver (#8187)
* Fix test-distribution classpath re resolver

As currently it seems mixed versions of resolver artifacts are
present on classpath. Resolver 1.8.0 introduces a binary
breakage.

Anyway, this fixes the thing, as impl was actually coming in
as transitive dep of maven-resolver-provider, that is NOT
the same version as the rest of resolver dependencies.

Relying on transitive while fixing other versions is wrong.

* Update to resolver 1.8.1

And add exclusion to banned dependency, that is used when
running in SISU container.
2022-06-21 15:27:06 -05:00
Joakim Erdfelt 8149350c10
Merge Release 11.0.10 back into `jetty-11.0.x` (#8181)
* Updating to version 11.0.11-SNAPSHOT
2022-06-21 14:45:00 +02:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180)
* Updating to version 10.0.11-SNAPSHOT
2022-06-21 14:41:41 +02:00
Greg Wilkins b9ff406ba1 WIP deploying webapps 2022-05-10 09:15:35 +02:00
Greg Wilkins 04acdb72f0 Jetty-12 Restructure
Copied over non ee10 components from the hackathon branch

Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Ludovic Orban <lorban@webtide.com>
Co-authored-by: Olivier Lamy <olamy@webtide.com>
Co-authored-by: Simone Bordet <sbordet@webtide.com>
2022-05-03 15:50:54 +02:00
Joakim Erdfelt 16420f0181
Set version to `10.0.10-SNAPSHOT` (#7823)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-04-03 20:33:44 +10:00
Joakim Erdfelt f079949a35
Merge Release 10.0.9 (#7821)
* Updating to version 10.0.9

* Updating to version 10.0.10
2022-04-02 08:43:44 -05:00
Joakim Erdfelt 9548ab0cc9 Updating to version 11.0.10-SNAPSHOT 2022-03-30 13:06:46 -05:00
Joakim Erdfelt 243a48a658 Updating to version 11.0.9 2022-03-30 12:43:51 -05:00
Joakim Erdfelt cc0eb6e468
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-30 09:13:38 -05:00
dependabot[bot] 6b25c271b1
Bump jolokia-war from 1.3.3 to 1.7.1 (#6907)
* Bump jolokia-war from 1.3.3 to 1.7.1

Bumps jolokia-war from 1.3.3 to 1.7.1.

---
updated-dependencies:
- dependency-name: org.jolokia:jolokia-war
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

* Adding HashLoginService to jolokia.xml
* Fixing typo in FQCN for Jetty Password utility
* Using logger to print warning, not ServletContext.log() as it causes an NPE.

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-03-29 21:04:35 -05:00
Joakim Erdfelt b419a8956e
Issue #6879 - Remove jminix (#7770)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-03-23 16:02:35 -05:00
Olivier Lamy 39ee9db33e fix build
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-02-18 13:32:55 +10:00
Olivier Lamy 8ad31b9001 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-02-17 16:59:24 +10:00
Lachlan Roberts 2c60549eee Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-7545-OpenIdXML 2022-02-08 16:02:11 +11:00
Lachlan Roberts 58c230e26c Issue #7545 - add distribution test for jetty-openid so that we can test XML
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-02-08 15:28:02 +11:00
Simone Bordet 4e02be57fd
Updating to version 11.0.9-SNAPSHOT 2022-02-07 12:42:04 +01:00
Simone Bordet 79cc9cf90e
Updating to version 11.0.8 2022-02-07 12:10:09 +01:00
Simone Bordet a4fda96f49
Updating to version 10.0.9-SNAPSHOT 2022-02-07 12:02:02 +01:00
Simone Bordet 716c7afd8e
Updating to version 10.0.8 2022-02-07 11:34:12 +01:00
Joakim Erdfelt b24f15f516
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-02-01 13:59:09 -06:00
Joakim Erdfelt 3791f38684
Issue #6017 - fix accidentally broken k+=v property usage (#7510)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-02-01 13:58:41 -06:00
Lachlan Roberts 66a68c9c61 Merge branch 'jetty-11.0.x' of github.com:eclipse/jetty.project into jetty-11.0.x 2022-02-01 15:05:39 +11:00
Lachlan Roberts 0e1ab2f3de Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-02-01 15:05:15 +11:00
Joakim Erdfelt f1ac7e081b
Issue #7494 - remove unsupported modules (#7495)
* Issue #7494 - Remove jolokia module

* Issue #7494 - Remove jminix module (doesn't support jakarta.servlet)

* Issue #7494 - Remove jamon module (doesn't support jakarta.servlet)

* Issue #7494 - Remove hawtio module (doesn't support jakarta.servlet)

* Issue #7494 - Removing version properties for removed modules

* Issue #7494 - Removing test dist tests for removed modules
2022-01-31 20:49:41 -06:00
Lachlan b0e334f14a
Run WebSocket Autobahn test for all Jetty, Javax and Core APIs (#7430)
* Run WebSocket Autobahn test for all Jetty, Javax and Core APIs

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-01-31 15:29:41 +10:00
Joakim Erdfelt be58156c77
Happy New Year 2022 (#7460)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-27 10:42:43 -06:00
Joakim Erdfelt cb127793e5
Happy New Year 2022 (#7459)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-27 10:42:30 -06:00
Simone Bordet 2de20c3520
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 10:00:26 +01:00
Simone Bordet 0236b7ebd8 Issue #6728 - QUIC and HTTP/3
Fixed test by approving licenses in DistributionTests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Simone Bordet 578ae30311 Issue #6728 - QUIC and HTTP/3
Added http3 Jetty module and distribution test.
Implemented simple logic to send the Alt-Svc header in HTTP/2 responses.
Updated JNA dependency to use jna-jpms.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Simone Bordet c030b761f1
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-02 10:13:10 +01:00
Simone Bordet 1ea012afde
Issue #7111 - Add support to deprecate jetty-home modules. (#7125)
* Issue #7111 - Add support to deprecate jetty-home modules.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-02 10:09:05 +01:00
Joakim Erdfelt 955ed14bfe
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-17 10:11:02 -06:00
Joakim Erdfelt ec3d7dbe92
Issue #6017 - Start Property Overrides (#7118)
* Issue #6017 - jetty-start Property override behavior

+ All *.mod based configuration defaults are default
  properties are not forced values and can be overridden.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-11-17 10:10:29 -06:00
Olivier Lamy 97cd015f5e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-11-17 20:01:59 +10:00
Olivier Lamy 4868ed0acd
Issue #7034 infinispan flaky tests on CI, force TCP over UDP for jgroups multicasting as it is too slow with kubernetes (#7122)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-11-17 15:50:22 +10:00
Lachlan Roberts a99b1d90d0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-17 09:52:01 +11:00
Lachlan dd0613193c
Merge pull request #7000 from eclipse/jetty-10.0.x-1087-WellKnown
Issue #1087 - add module for a .well-known handler
2021-11-17 09:51:26 +11:00
Joakim Erdfelt 9537a365dd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-15 13:06:16 -06:00
Olivier Lamy 0ad49fd1fd
Jetty 10.0.x correctly shutdown infinispan between tests (#7066)
* correctly shutdown infinispan after each test class

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-11-09 15:34:47 +10:00
Joakim Erdfelt 60e5c4811f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-10-22 10:53:10 -05:00
dependabot[bot] d4ee8d522a
Bump testcontainers-bom from 1.16.0 to 1.16.1 (#7019)
* Bump testcontainers-bom from 1.16.0 to 1.16.1

Bumps [testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.16.0 to 1.16.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.0...1.16.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

* use mongodb testcontainer module and upgrade a bit mongodb version
* give it more time to start
* use mongo image from test container api for distribution test
* create only once
* use a different wait strategy based on log rather than port as hazelcast try to do some broadcastind
* change wait for strategy

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-22 10:50:45 -05:00
Lachlan Roberts dcc6cc435f Issue #1087 - add documentation and distribution test
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-10-22 16:43:22 +11:00
Joakim Erdfelt b67ffd3d2d Updating to version 11.0.8-SNAPSHOT 2021-10-06 15:16:07 -05:00
Joakim Erdfelt 389a358772 Updating to version 11.0.7 2021-10-06 14:58:52 -05:00
Joakim Erdfelt cfc67f86d2 Updating to version 10.0.8-SNAPSHOT 2021-10-06 14:51:32 -05:00
Joakim Erdfelt da8a4553af Updating to version 10.0.7 2021-10-06 14:32:37 -05:00
Olivier Lamy 4011f1e71e
merge jetty-10.0.x (#6945) 2021-09-30 20:41:49 +10:00
Olivier Lamy 51d44a3401
use dependencyManagement for internal dependencies (#6940)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-30 16:57:19 +10:00
Joakim Erdfelt 85c7250d1a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-22 17:10:49 -05:00
Joakim Erdfelt 5b6c3f145c
More artifact cleanup javax.* to jakarta.*
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-09-22 10:41:30 -05:00
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
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
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
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 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 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
Olivier Lamy 0e17ee75c8 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-07-22 16:39:05 +10:00
Olivier Lamy 6f3a694250
cherry-pick hazelcast remote distribution test from 9.4.x (#6068) (#6516)
* cherry-pick jetty hazelcast remote distribution test from jetty-9.4.x (#6068)

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-07-20 15:38:46 +10:00
Joakim Erdfelt 102caac3fe Updating to version 11.0.7-SNAPSHOT 2021-06-29 11:40:18 -05:00
Joakim Erdfelt 6946943289 Updating to version 11.0.6 2021-06-29 11:15:33 -05:00
Joakim Erdfelt c245a70893 Updating to version 10.0.7-SNAPSHOT 2021-06-29 10:51:22 -05:00
Joakim Erdfelt 37e7731b4b Updating to version 10.0.6 2021-06-29 10:27:56 -05:00
Joakim Erdfelt c1b6e30471
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-23 18:14:25 -05:00
Joakim Erdfelt ca360176b3
Issue #6464 - fix logging capture modules
+ Adding distribution tests for logging module combinations.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-06-23 07:35:38 -05:00
Joakim Erdfelt 89d2ea0192 Updating to version 11.0.6-SNAPSHOT 2021-06-11 10:12:15 -05:00
Joakim Erdfelt 50df216262 Updating to version 11.0.5 2021-06-11 09:52:40 -05:00
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Jan Bartel 3648b3916c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-10 21:27:05 +10:00
Jan Bartel 900c71902c
Issue #6327 Remove DisabledOnJre or test where appropriate (#6386)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-10 21:26:16 +10:00
Joakim Erdfelt 063e8c80d5 Updating to version 11.0.5-SNAPSHOT 2021-06-04 13:53:06 -05:00
Joakim Erdfelt 5bcdeb52ae Updating to version 11.0.4 2021-06-04 13:35:11 -05:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Jan Bartel dabb0a0624 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-01 10:22:19 +10:00
olivier lamy 42153bd57f fix add-opens for cdi tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
Simone Bordet a83bff553c Updated POM versions to 11.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:16:21 +02:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:07:46 +02:00
Simone Bordet a711768384 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-12 10:45:58 +02:00
Simone Bordet 1e3f3a3cbb
Fixes #6049 - Default provider [files] section always executed (#6051)
* Fixes #6049 - Default provider [files] section always executed

Keeping only enabled modules when processing the modules,
so that default provider modules don't get processed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-12 10:41:51 +02:00
Olivier Lamy 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-26 16:15:49 +10:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Jesse McConnell e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Greg Wilkins be9e1d3a57 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-25 07:44:56 +11:00
Greg Wilkins 303e031235
Added before dependents to Modules (#6080)
Added `before` section to a module to control ordering
rename `options` section to `after`

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-24 13:31:36 +01:00
Simone Bordet 897dc49bef Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-05 19:21:47 +01:00
Simone Bordet 217a97b952 Fixes #6037 - Review logging modules for j.u.l.
Fixed mistakes in logging-jul-capture.mod.
Introduced java-util-logging-bridge.properties for the bridge module configuration.
Added [exec] sections to specify the jul config file.
Removed logging-jul-capture.xml, not necessary.
Added tests to verify that the fixed modules work fine.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-05 19:18:19 +01:00
Joakim Erdfelt 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06:00
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 01fb5769f4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-15 14:18:34 -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
Jan Bartel d6d648316a
Issue #5941 Use Glassfish JSTL impl (#5942)
* Issue #5941 Use Glassfish JSTL impl

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-10 22:21:22 +01:00
Simone Bordet e4baac75ad Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-10 11:32:15 +01: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
Jan Bartel 83b047285d Fix checkstyle violations in JettyHomeTester
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-26 15:44:27 +01:00
olivier lamy a2270fe74a Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-26 21:25:24 +10: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 2a37eb8400 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-26 18:26:59 +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 31d5ea58ca Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-25 14:23:23 +01: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 10136235b2
Happy New Year 2021 (Jetty 11 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:22:28 -06: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 bacb4b2555 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 16:23:32 +01: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 931eea40e6 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 11:27:15 +01: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 d5b08ea9f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-11 11:40:10 -06: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 d0572ada58
Merge remote-tracking branch 'origin/release-11.0.0' into jetty-11.0.x 2020-12-09 15:28: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 61aac5abb5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-07 21:15:26 +10: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 30bd8b9fba Updating to version 11.0.1-SNAPSHOT 2020-12-02 15:59:13 -06:00
Joakim Erdfelt 432f896d7a Updating to version 11.0.0 2020-12-02 15:35:56 -06: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 d30d95c26c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-17 09:20:25 -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 3a2095a7b0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-12 10:57:06 +11: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
Lachlan Roberts c43a9e8234 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-03 11:06:04 +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 39acd7146b Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-11-02 10:48:58 +01: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 506da95885
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-28 15:47:51 -05: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 8c5c589b31
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 17:51:50 -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 57a9e5236a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-08 09:01:58 -05:00