Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,121 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

1814 Commits

Author SHA1 Message Date
Joakim Erdfelt 5f4bd4b626
Merge from jetty-10.0.x to jetty-11.0.x 2023-10-30 14:47:19 -05:00
Joakim Erdfelt ff2012e126
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-10-30 14:44:33 -05:00
Joakim Erdfelt c01baac85c
Updating to version 12.0.4-SNAPSHOT 2023-10-26 22:47:29 -05:00
Joakim Erdfelt a873259fd5
Updating to version 12.0.3 2023-10-26 22:24:43 -05:00
Joakim Erdfelt 1e2b356b80
Updating to version 11.0.19-SNAPSHOT 2023-10-26 21:24:54 -05:00
Joakim Erdfelt 5a9a771a9f
Updating to version 11.0.18 2023-10-26 21:14:03 -05:00
Joakim Erdfelt c50aa2f61b
Updating to version 10.0.19-SNAPSHOT 2023-10-26 21:10:08 -05:00
Joakim Erdfelt 8545fd9bf4
Updating to version 10.0.18 2023-10-26 20:59:27 -05:00
Joakim Erdfelt bd9fdcb49c
Removing flaky test entries from VERSION.txt 2023-10-25 11:16:36 -05:00
Joakim Erdfelt d46217ff5b
Remove test reference from VERSION.txt 2023-10-17 07:33:00 -05:00
Simone Bordet 0bfef5f8c5
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-10-10 17:04:48 +02:00
Simone Bordet ba083b7e41
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-10-10 17:01:30 +02:00
Joakim Erdfelt 95b29d5f09
Updating for CVEs 2023-10-10 07:40:57 -05:00
Joakim Erdfelt 102c24cb2e
Updating for CVEs 2023-10-10 07:39:41 -05:00
Joakim Erdfelt 5cff7930e5
Updating for CVEs 2023-10-10 07:37:58 -05:00
Joakim Erdfelt 6b3f760b80
Updating to version 12.0.3-SNAPSHOT 2023-10-09 21:16:46 -05:00
Joakim Erdfelt b01e3611cf
Updating to version 12.0.2 2023-10-09 20:59:14 -05:00
Joakim Erdfelt c8829f75bf
Updating to version 11.0.18-SNAPSHOT 2023-10-09 13:49:23 -05:00
Joakim Erdfelt 48e7716b94
Updating to version 11.0.17 2023-10-09 13:38:47 -05:00
Joakim Erdfelt 722b97ad6a
Updating to version 10.0.18-SNAPSHOT 2023-10-09 13:32:28 -05:00
Joakim Erdfelt af15f12297
Updating to version 10.0.17 2023-10-09 13:21:53 -05:00
Joakim Erdfelt 1bfe69eeba
Fixing CVE number for CGI servlet deprecation (#10523) 2023-09-15 09:24:20 +02:00
Joakim Erdfelt c381bfac5a
Fixing CVE number for CGI servlet deprecation 2023-09-14 14:26:55 -05:00
Joakim Erdfelt 96d4d45541
Fixing CVE number for CGI servlet deprecation 2023-09-14 14:26:02 -05:00
Simone Bordet 049cf3a334
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-09-14 20:01:13 +02:00
Simone Bordet 1edc8e8bd7
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-09-14 19:40:13 +02:00
Joakim Erdfelt 3c495f37cf
Updating 12.x VERSION.txt entries (#10517) 2023-09-14 19:35:45 +02:00
Joakim Erdfelt 83030f4825
Updating 11.x VERSION.txt entries (#10516) 2023-09-14 19:33:17 +02:00
Joakim Erdfelt 52c9dcaee6
Updating jetty-10.0.x VERSION.txt from changes in jetty-9.4.x (#10518) 
* Updating jetty-10.0.x VERSION.txt from changes in jetty-9.4.x
* Making CVE references consistent
 2023-09-14 19:31:09 +02:00
Joakim Erdfelt b9cd3216f7
Updating 10.x entries (#10515) 2023-09-14 18:40:52 +02:00
Joakim Erdfelt a415da73df
Merge remote-tracking branch 'origin/jetty-11.0.x' into fix/12.0.x/merge-from-11 2023-08-31 16:06:14 -05:00
Joakim Erdfelt 9e87b15966
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-08-31 15:25:15 -05:00
Joakim Erdfelt 1d226403da
Updating to version 12.0.2-SNAPSHOT 2023-08-29 16:55:36 -05:00
Joakim Erdfelt 4768745849
Updating to version 12.0.1 2023-08-29 16:38:20 -05:00
Joakim Erdfelt cb8c4b6ab2
Updating to version 11.0.17-SNAPSHOT 2023-08-25 14:55:08 -05:00
Joakim Erdfelt bedff458c4
Updating to version 11.0.16 2023-08-25 14:43:04 -05:00
Joakim Erdfelt 896dee2466
Updating to version 10.0.17-SNAPSHOT 2023-08-25 14:27:38 -05:00
Joakim Erdfelt a2735a9ae9
Updating to version 10.0.16 2023-08-25 14:10:55 -05:00
gregw f4b97fbfb8 Added missing releases and sorted in date order 2023-08-22 13:00:48 +10:00
Joakim Erdfelt 9c324326c5
Merge `release/12.0.0` back into `jetty-12.0.x` (#10237) 
* Updating to version 12.0.0

* Updating to version 12.0.1-SNAPSHOT
 2023-08-08 00:55:19 +02:00
Joakim Erdfelt 6cefe64a22
Merge release `jetty-12.0.0.beta4` back into `jetty-12.0.x` HEAD (#10206) 2023-08-01 16:55:40 +02:00
Joakim Erdfelt 079f3cb5ca
Updating to version 12.0.0-SNAPSHOT 2023-07-03 16:33:26 -05:00
Joakim Erdfelt 3c948df481
Updating to version 12.0.0.beta3 2023-07-03 16:07:04 -05:00
Joakim Erdfelt 7ebec3b44a
Merge remote-tracking branch 'origin/release/12.0.0.beta1' into jetty-12.0.x 2023-05-03 15:25:11 -05:00
Simone Bordet fffa91d2b9
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-05-03 19:33:56 +02:00
Simone Bordet 5b107353fa
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-05-03 19:26:44 +02:00
Olivier Lamy 6a0752384f
Update VERSION.txt: Jan is now using IntelliJ (#9666) 2023-05-03 19:24:24 +02:00
Joakim Erdfelt 7f7ecb1983
Updating to version 12.0.0-SNAPSHOT 2023-05-02 13:43:47 -05:00
Joakim Erdfelt f98b345a28
Updating to version 12.0.0.beta1 2023-05-02 13:09:18 -05:00
Joakim Erdfelt 43e8c83e24
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-04-19 11:58:39 -05:00
Joakim Erdfelt a0bb5d1ea8
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-04-19 11:56:53 -05:00
Joakim Erdfelt 96d2977942
Merge pull request #9646 from eclipse/release-10.0.15 
Merge Release 10.0.15 back into `jetty-10.0.x`
 2023-04-19 09:28:09 -05:00
Joakim Erdfelt 41b6da7a55
Merge pull request #9647 from eclipse/release-11.0.15 
Merge Release 11.0.15 back into `jetty-11.0.x`
 2023-04-19 09:26:30 -05:00
Joakim Erdfelt cc24c2b1ca
Updating VERSION.txt in `jetty-12.0.x` 2023-04-18 13:45:17 -05:00
Joakim Erdfelt 2fc8979d16
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-04-18 13:44:21 -05:00
Joakim Erdfelt d32c2ee7c2
Updating VERSION.txt in `jetty-11.0.x` 2023-04-18 13:43:57 -05:00
Joakim Erdfelt 21ba7ef11d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-04-18 13:42:52 -05:00
Joakim Erdfelt 5babd20c4f
Cleanup VERSION.txt in `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-04-18 13:35:45 -05:00
Joakim Erdfelt 1efe9afdf8
Updating to version 11.0.16-SNAPSHOT 2023-04-11 13:53:30 -05:00
Joakim Erdfelt 5bc5e562c8
Updating to version 11.0.15 2023-04-11 13:37:23 -05:00
Joakim Erdfelt ca3c1756ad
Updating to version 10.0.16-SNAPSHOT 2023-04-11 13:23:25 -05:00
Joakim Erdfelt 68017dbd00
Updating to version 10.0.15 2023-04-11 12:24:32 -05:00
Olivier Lamy 88329dc8dc
merge back 12.0.0.beta0 release branch (#9484) 
merge back release branch 12.0.0.beta0

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2023-03-10 11:05:11 +10:00
Joakim Erdfelt 0099491435
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-03-08 14:31:45 -06:00
Joakim Erdfelt d1defd0363
Merge remote-tracking branch 'origin/jetty-11.0.x' into release/11.0.14 2023-03-02 04:04:53 -06:00
Joakim Erdfelt 2b12f78409
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-03-01 17:16:55 -06:00
Olivier Lamy 22bb0d0788 Updating to version 11.0.15-SNAPSHOT 2023-03-01 18:56:07 +10:00
Olivier Lamy e62cc0344a Updating to version 10.0.15-SNAPSHOT 2023-03-01 18:55:10 +10:00
Greg Wilkins c55938c3fa Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-17 10:29:34 +11:00
Joakim Erdfelt b1095d6605
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-10 11:44:17 -06:00
Joakim Erdfelt eb6671821b
Updating to version 12.0.0-SNAPSHOT 2022-12-07 16:37:38 -06:00
Joakim Erdfelt eac2683866
Updating to version 12.0.0.alpha3 2022-12-07 16:09:33 -06:00
Joakim Erdfelt 260245c012
Updating to version 11.0.14-SNAPSHOT 2022-12-07 15:04:55 -06:00
Joakim Erdfelt a04bd1ccf8
Updating to version 11.0.13 2022-12-07 14:46:29 -06:00
Joakim Erdfelt 54c4c03244
Updating to version 10.0.14-SNAPSHOT 2022-12-07 14:33:17 -06:00
Joakim Erdfelt 1c2636ea05
Updating to version 10.0.13 2022-12-07 14:12:50 -06:00
Olivier Lamy e63d1d76da
merge back release branch to restore 12.0.0-SNAPSHOT versions (#8596) 
* Updating version jetty-12.0.0.alpha1 in VERSION.txt

* version 12.0.0.alpha1

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

* version back to 12.0.0-SNAPSHOT

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

* merge VERSION .TXT with all release

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

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-09-16 19:50:49 +10:00
Olivier Lamy 6b1611592d
merge back release branch to bump version to 11.0.13-SNAPSHOT (#8594) 
* Updating to version 11.0.12

* Updating to version 11.0.13-SNAPSHOT

* add release jetty-9.4.49.v20220914 and 10.0.12 in VERSION.TXT
 2022-09-16 19:50:26 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593) 
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
 2022-09-16 19:50:12 +10:00
Olivier Lamy 5940507e49
Jetty 12.0.0.alpha0 release (#8483) 
* VERSION.txt update

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-23 21:44:20 +10:00
Joakim Erdfelt 7fb119bb32
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-18 12:50:16 -05:00
Joakim Erdfelt c58e05a6fa
Merge remote-tracking branch 'origin/jetty-11.0.x' into fix/jetty-11.0.x-cve-update 2022-07-08 16:51:10 -05:00
Joakim Erdfelt b4ce2f3a80
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-08 16:50:46 -05:00
Joakim Erdfelt 2e18276ff5
Updating for published CVES (#8274) 
* Updating for published CVES

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-07-08 16:50:04 -05:00
Joakim Erdfelt 6b2af51941
Updating for published CVES 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-07-05 08:29:51 -05: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
Joakim Erdfelt 850dfa8f8a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-22 16:26:11 -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
Joakim Erdfelt 97f37d77a6
Add Jetty 10.0.10 to VERSION.txt 2022-06-21 15:26:16 -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 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 3dbc01cb44
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-04-04 15:36:31 -05: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
Jan Bartel 937cb5df95 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-02-08 14:32:14 +11:00
Simone Bordet 734229dd9e
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-02-07 17:15:19 +01:00
Simone Bordet 67532c85f0
Updated VERSION.txt with 9.4.44 (missing from a previous merge) and 9.4.45 releases. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-02-07 17:08:52 +01:00