Commit Graph

539 Commits

Author SHA1 Message Date
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 3dbfec084a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-23 16:03:38 -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
ianrifkin 9da5c21ea3
Issue #7182 having running() delete the state file where it previously only deleted the pid file. (#7184)
* Issue #7182 changing approach from deleting the state file consistently to simply grep'ing for last line in JETTY_STATE file

Signed-off-by: Ian Rifkin <ianrifkin@ianrifkin.com>
2022-03-23 13:25:34 -05: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 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
Joakim Erdfelt 372c1d1d3f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-01-05 12:27:32 -06:00
Joakim Erdfelt 13956b27e2
Issue #7297 - Removing log4j 1.x (#7353)
* Issue #7297 - Removing log4j 1.x

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

* Issue #7297 - Deprecating log4j 1.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-05 12:26:05 -06:00
Joakim Erdfelt 45fc93aec1
Issue #7354 - Do not add demo jars to jetty-home (#7355)
* Issue #7354 - Do not add demo jars to jetty-home

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

* Issue #7254 - Do not add lib/ext directory to jetty-home

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-05 10:33:26 -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 7811f40c67 Issue #6728 - QUIC and HTTP/3
Split the http3 module, introducing the jna and quiche modules with their versions and licenses.
Updated project to reference the new groupId of the quiche binaries.

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
Jan Bartel 508f289680 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-17 14:23:19 +11:00
Jan Bartel aa5da31938
Issue #7103 Clean up distro landing page (#7104)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-11-17 14:10:57 +11:00
Joakim Erdfelt df4ddc759f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-10-22 10:15:29 -05:00
Joakim Erdfelt c89866682c
Issue #7008 - fix jetty.sh - avoid duplicates
+ Do not include JETTY_SYS_PROPS in JAVA_OPTIONS
  to avoid duplicates that show up in RUN_ARGS.
+ Only use JETTY_SYS_PROPS in RUN_CMD.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-10-18 09:51:17 -05:00
Joakim Erdfelt cdba235db6
Issue #7008 - fix jetty.sh
+ Minor fix to remove extra LF output in RUN_ARGS
+ Using start-stop-daemon options properly

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-10-18 09:39:37 -05: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 a63005a907
Changes from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-09-22 14:39:38 -05:00
Joakim Erdfelt 8dd62838f7
Initial cleanup / reorg of dependencies
+ All plugins and dependencies are alphabetized now
+ All plugins and dependency versions have properties now

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-09-22 09:54:52 -05:00
Olivier Lamy bac04b9c8f no needed here as it is aleady in top dptMngt
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-22 09:26:25 +10:00
Joakim Erdfelt d9ce837041
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x_modfiles_filtering 2021-09-21 13:10:45 -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
Olivier Lamy a342776c71 Issue #3514 interpolation of versions from pom in mod files
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-21 09:19:45 +10: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 23de1da509
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-08-31 09:53:49 -05:00
Joakim Erdfelt f129770f4e
Bump slf4j to 2.0.0-alpha5 (#6684)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-08-31 09:53:15 -05:00
Joakim Erdfelt 38549d641d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-08-24 16:49:39 -05:00
Joakim Erdfelt efb09607f1
Bump slf4j to 2.0.0-alpha4
Also logback to 1.3.0-alpha9

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-08-18 05:44:51 -05:00
Frode Carlsen 4448bc0632
Issue #6406 - port jetty-jaspi to use Jakarta Authentication 2.x (#6412)
* Issue #6406 - port jetty-jaspi to use Jakarta Authentication 2.x, removed test dependency on old Geronomi-jaspi

Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 17:28:28 +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
Greg Wilkins 2b0161e743
Fix #6476 Use dry run in jetty.sh (#6598)
* Fix #6597 Use dry run in jetty.sh

Use a --dry-run in jetty.sh to pre-expand the java arguments and thus avoid having two JVMs running in the case of exec.

Also made a small change to allow script to check the current directory for JETTY_BASE, as that allows testing and runs in the same style as direct calls to start.jar

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-13 17:37:51 +02: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 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
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 155b5319d1 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-03 11:27:30 +10:00
Jan Bartel d4a8c38b87
Issue #6347 Fix session-store-gcloud,logging-jcl-capture,logging-log4j1-capture (#6349)
* Issue #6347 Fix session-store-gcloud,logging-jcl-capture,logging-log4j1-capture

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-03 11:26:47 +10: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
Jan Bartel b3f4a57c82
Issue #6112 Jetty logging leaking to webapp (#6336)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-01 10:15:49 +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
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
Joakim Erdfelt 4e41d8d3e9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-10 06:24:53 -06:00
Olivier Lamy 06ea681032 fix some mod files: some url using http to https, use maven central if possible, upgrade log4j2 to 2.14.0 (#6048)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-10 19:17:21 +10: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 47a90beab5
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-03 14:47:48 -06:00
Joakim Erdfelt 613e0ecd54
Issue #6021 - PoC for resolvePath within XmlConfiguration
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-02 14:40:36 -06: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 da63fcfe82
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-15 12:26:30 -06:00
Joakim Erdfelt d6572823b9
Issue #5966 - Remove /webapps from jetty-home
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-11 08:04:29 -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
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
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
Simone Bordet c7fa690d90 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-18 10:18:31 +01:00
Simone Bordet f52521ba75 Fixes #5882 - Simplify ALPN modules.
Deleted alpn-<version>.mod files, replaced by a single alpn-java.mod.
This new module _provides_ "alpn-impl" by default, and so does conscrypt.mod.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-15 16:51:26 +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 ecbd5626b8 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 11:08:25 +01:00
Lachlan Roberts c3e8e8d395 Rename jar to jetty-keystore, remove main from KeystoreGenerator.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 16:42:25 +11:00
Lachlan Roberts c2b9d92a2f Issue #1673 - generate keystore when using test-keystore module
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-06 18:07:42 +11:00
olivier lamy efe4f5e5ea Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-11 12:11:53 +10:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735)
* enable spotbugs in CI

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

record issues

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

use warning new generation

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

activate errorprone

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

fix Jenkinsfile

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

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

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

junit should allow empty results

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

maven console can be use only once...

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

one liner

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

recordissues only once

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

force id

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

aggregate results

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

configure a name for aggregated reports

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

mo more -T3 no need anymore of remote session test profile

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

I want to see what failing tests look like with new report.

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

skip spotbugs for jetty-jmh

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

get rid of findbugs as we now have spotbugs

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

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

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

make pmd quiet for CI

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

remove -fae flag and do not display transfer progress

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

try junitParser() to see what it does

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

junit parser is a bad idea...

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

increase timeout

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

no -T2 for javadoc

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

fix skip spotbugs and pmd verbose

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

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 11:47:26 +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 cc9b41cf17
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 14:53:52 -06:00
gregw 1768bd898f Fix #5739 Remove distribution from doco
Mostly mechanical fixes
2020-12-02 09:16:29 +01:00
Lachlan Roberts cf9a807d67 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 12:04:23 +11:00
Lachlan 121d898517
Move websocket-util classes into websocket-core (#5705)
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util

* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-02 11:10:15 +11: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 e7fb20207f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-20 14:57:43 -06:00
Joakim Erdfelt 390fa83d8e
Remove dead /jetty-spring/ module
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-20 12:12:20 -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 bd553d98e5 fixing badly formatted XML comments
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:51:35 +11:00
Lachlan Roberts 80a824854b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2 2020-11-09 15:17:22 +11:00
Joakim Erdfelt 71ad5447a4
Merge remote-tracking branch 'origin/release-9.4.34' into jetty-9.4.x 2020-11-04 10:24:21 -06:00
Joakim Erdfelt 4fd75a02ab
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-03 13:59:52 -06:00
Joakim Erdfelt eb5927ef8c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-03 13:57:17 -06:00
Joakim Erdfelt 18049e9dec
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-03 13:57:03 -06:00
Joakim Erdfelt 40bde46b13
Bump maven-antrun-plugin from 1.8 to 3.0.0
+ and update configuration/task to configuration/target

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-03 08:46:27 -06:00
Lachlan Roberts 64655f7b7e Issue #5320 - allow websocket client jars to be provided by server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-03 17:16:27 +11: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 7bf4a007ce
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-21 15:34:43 -05:00
Joakim Erdfelt 640dc1effd
Fixing permissions and uid/gid on tarball.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-21 15:25:47 -05: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 39b3cbd685
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-19 12:53:04 -05:00
Joakim Erdfelt fe61356f6a
Updating file/dir modes per review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-19 11:53:16 -05:00
Joakim Erdfelt b2f2fb9fea
Fix archived assemblies (tar.gz and zip) to have fixed modes.
+ Not taking the modes from whatever defaults the filesystem
  that ran the build is currently on.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-14 13:25:56 -05:00
Joakim Erdfelt c223ee37ab Updating to version 11.0.0-SNAPSHOT 2020-10-02 16:38:23 -05:00
Joakim Erdfelt 9ce21ec22b Updating to version 11.0.0.beta2 2020-10-02 16:20:55 -05: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
Joakim Erdfelt f7fca28c50
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-30 08:48:22 -05:00
Joakim Erdfelt 8c45ba6b2b
Fixing typo
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-30 08:45:29 -05:00
Joakim Erdfelt c682f95639
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 11:44:04 -05:00