Commit Graph

1696 Commits

Author SHA1 Message Date
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
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 937145e510
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-10-13 06:33:24 -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
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
Lachlan Roberts 61bcc6068e Update VERSION.txt with CVE-2021-34429.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-07-29 15:07:43 +10:00
Lachlan Roberts a584423373 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-14 16:39:39 +10:00
Lachlan 8f80c59946
Merge pull request #6507 from eclipse/jetty-10.0.x-6277-updateVersionTxt
Issue #6277 - update VERSION.txt with SessionListener CVE number
2021-07-14 10:57:30 +10:00
Joakim Erdfelt 81d19aa88e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-08 12:16:06 -05:00
Ludovic Orban 9288e89684 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-07-08 15:54:20 +02:00
Lachlan Roberts 762608f658 Issue #6277 - update VERSION.txt with CVE number
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-07-08 17:19:15 +10:00
Joakim Erdfelt 8ef9e0a24f
Update VERSION.txt (from releases in jetty-9.4.x)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-07 10:55:49 -05:00
Joakim Erdfelt 102caac3fe Updating to version 11.0.7-SNAPSHOT 2021-06-29 11:40:18 -05:00