Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,619 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

472 Commits

Author SHA1 Message Date
Greg Wilkins ea5bedf072
Jetty 12.0.x deployment (#8208) 
Deploy webapps for different environments from the same webapps directory.
The maximal environment known to the AppProviders is used as the default environment.
An explicit environment can be set in a properties file for an application, which is also used for property substitution in any context xml file.
 2022-06-30 09:51:19 +10:00
Jan Bartel 5c267ce7ed
Jetty 12.0.x eex jettymavenplugin (#8200) 
* Fix ee9/10 jetty maven plugin and refactor it tests
 2022-06-29 17:18:18 +10:00
Joakim Erdfelt 1999b39808
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-26 12:04:51 -05:00
Olivier Lamy 83f6b80afb remove ee10 websocket as well 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-06-23 13:31:34 +10:00
Olivier Lamy cb7bb5f334 cleanup not anymore needed content in the pom 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-06-23 13:27:31 +10:00
Joakim Erdfelt 4deb215311
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-22 16:27:12 -05:00
François Armand 2dfbea1bc4
Fixes #8152: restore reading JAVA_OPTIONS in script.sh (#8153) 
Co-authored-by: Francois @fanf42 Armand <francois.armand@normation.com>
 2022-06-22 16:26:58 -05: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
Jan Bartel c734008155 Fix eeX jetty-homes generation. 2022-06-22 18:45:33 +10:00
Jan Bartel 9893c81abf
Jetty 12.0.x update jakarta api versions (#8192) 
* update to latest jakarta official releases
 2022-06-22 10:32:54 +10: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
Olivier Lamy 6c4f3b37e7
rename ee9-demo to jetty-ee9-demo (#8178) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-06-20 14:48:22 +10:00
Jan Bartel eccbfce6dd Rename infinspan-xxx to jetty-infinispan-xxx 2022-06-16 16:31:42 +10:00
Jan Bartel 6139b37fb6 Fix path of ee10-root in .mod file 2022-06-06 09:17:43 +10:00
Greg Wilkins a5c438fd29
Rename demo-eeX to eeX-demo (#8097) 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-06-06 08:58:09 +10:00
Jan Bartel 4fde2b7769 Merge remote-tracking branch 'origin/jetty-12.0.x-more-modules-enabled' into jetty-12.0.x 2022-05-31 10:40:04 +10:00
Jan Bartel 43c662a3ac Fix more ee10 modules. 2022-05-30 18:50:23 +10:00
Lachlan Roberts 9b3b531a4d Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-05-30 12:56:50 +10:00
Joakim Erdfelt e19233c1e3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-26 09:18:27 -05:00
Joakim Erdfelt 3fe0d5e12f
Fix #7754 - Allow JETTY_SYS_PROPS to be configured by /etc/default/ (#7819) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-05-26 09:18:10 -05:00
Jan Bartel a5bb51785d WIP rename ee10 demo modules; fix modules 2022-05-25 19:07:18 +10:00
Jan Bartel c096cc07ba Build more demo webapps; fix errors in module files. 2022-05-16 13:37:34 +02:00
Olivier Lamy 852e5850dc fix typo 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-05-09 20:42:47 +10:00
Olivier Lamy de1c74cdb9 servlet api as well 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-05-09 20:42:47 +10:00
Greg Wilkins 3f6f725cce disable jetty-home 
enabled a few more ee9 modules, but not enough
enabled integrations
 2022-05-04 19:29:56 +02:00
Olivier Lamy cb2aa6add8
copy deps for jetty-home (#7955) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-05-04 21:54:52 +10: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 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