Commit Graph

1660 Commits

Author SHA1 Message Date
Joakim Erdfelt 315f45d623
Adding 9.4.38 release to VERSION.txt
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-15 12:02:05 -05:00
gregw e0095cc95a updated CVE
Signed-off-by: gregw <gregw@webtide.com>
2021-02-27 09:28:10 +01:00
gregw 02d7cd5cf5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-27 09:27:14 +01:00
gregw c6712cf592 updated CVE
Signed-off-by: gregw <gregw@webtide.com>
2021-02-27 09:25:50 +01:00
gregw 18422d6b42 updated CVE
Signed-off-by: gregw <gregw@webtide.com>
2021-02-27 09:24:28 +01:00
Joakim Erdfelt 7df67f3a3c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-25 15:52:29 -06:00
Chris Walker ff8cf93efd
Update Version.txt with CVEs (#6014)
Adds CVEs to Version.txt
2021-02-25 14:56:11 -06:00
Joakim Erdfelt 9c4100af0f
Merge remote-tracking branch 'origin/release-11.0.1' into jetty-11.0.x 2021-02-22 11:19:16 -06:00
Joakim Erdfelt da735fec3d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-22 11:19:07 -06:00
Joakim Erdfelt 9effce7558
Merge remote-tracking branch 'origin/release-10.0.1' into jetty-10.0.x 2021-02-22 11:17:22 -06:00
Joakim Erdfelt 08b4487363
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-22 11:16:53 -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 ea2a76ed3b Updating to version 9.4.38-SNAPSHOT 2021-02-19 09:44:28 -06:00
Joakim Erdfelt 27afab2bd3 Updating to version 9.4.37.v20210219 2021-02-19 09:03:57 -06:00
gregw 781f589c7c Added history to VERSION.txt
http://web.archive.org/web/19980125013900/http://www.mortbay.com/
2021-01-21 10:12:36 +01:00
Joakim Erdfelt 070fef64ff
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-19 10:41:49 -06:00
Joakim Erdfelt 7d167e17fa
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-19 10:41:29 -06: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
Joakim Erdfelt 5ead7e3a67
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-09 15:31:12 -06: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
Ludovic Orban 9982462a72 merge branch jetty-10.0.x into jetty-11.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-30 18:56:05 +01:00
gregw 20f6dc1ace Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 17:33:21 +01:00
gregw b4e2ad0df7 added CVE
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 14:23:45 +01:00
Joakim Erdfelt bd5b612508
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-25 15:58:39 -06:00
Joakim Erdfelt 08ab80a3ad
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-25 15:58:16 -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 30e9cef71d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-04 10:30:02 -06:00
Joakim Erdfelt 6c657ea431
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-04 10:27:47 -06: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 75b4954531
Merge remote-tracking branch 'origin/release-11.0.0.beta3' into jetty-11.0.x 2020-10-22 12:51:47 -05:00
Joakim Erdfelt da82d2873a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-22 12:51:01 -05:00
Joakim Erdfelt 4bacb458f3
Merge remote-tracking branch 'origin/release-10.0.0.beta3' into jetty-10.0.x 2020-10-22 12:50:08 -05:00
Joakim Erdfelt 557eeede53
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-22 12:48:47 -05:00
Joakim Erdfelt 13b2f1134d Updating to version 11.0.0-SNAPSHOT 2020-10-21 16:26:56 -05:00
Joakim Erdfelt 27cf80e738 Updating to version 11.0.0.beta3 2020-10-21 16:06:13 -05:00
Joakim Erdfelt f3a2a8ca76 Updating to version 10.0.0-SNAPSHOT 2020-10-21 16:02:05 -05:00
Joakim Erdfelt 35f68bc891 Updating to version 10.0.0.beta3 2020-10-21 15:39:57 -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 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 64163d7595
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-02 15:52:20 -05:00
Joakim Erdfelt de52576b6e Updating to version 10.0.0-SNAPSHOT 2020-10-02 14:37:06 -05:00
Joakim Erdfelt 338ada6076 Updating to version 10.0.0.beta2 2020-10-02 14:08:42 -05:00
Joakim Erdfelt 9def95f57f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-02 05:43:05 -05:00
Joakim Erdfelt 40664784f3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-02 05:42:41 -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
olivier lamy 690cdde4ad Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-11 19:40:37 +08:00
olivier lamy e26126264a Updating to version 11.0.0-SNAPSHOT 2020-08-11 16:48:06 +08:00
olivier lamy 6b2b429ba5 Updating to version 11.0.0.beta1 2020-08-11 16:48:06 +08:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Joakim Erdfelt e1427ea2ee
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
# Conflicts:
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2020-07-31 11:04:45 -05:00
Joakim Erdfelt aa3bd243b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-30 09:08:10 -05:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
olivier lamy eefe3d202b revert fail release
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy bc098e5bee fix VERSION.txt
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 06:51:43 +10:00
olivier lamy 822c1a6e0e fix VERSION.txt
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 06:49:46 +10:00
olivier lamy 6ff39cf848 Updating to version 11.0.0-SNAPSHOT 2020-07-10 06:25:08 +10:00
olivier lamy 4c250b0f93 Updating to version 11.0.0.beta1 2020-07-10 06:25:07 +10:00
Simone Bordet a5a2ae6f45 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-07-09 13:32:47 +02:00
olivier lamy 06737ce800 skip jetty-11.0.0.beta0
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-09 20:48:34 +10:00
olivier lamy 9fa6a5794c Updating to version 11.0.0-SNAPSHOT 2020-07-09 16:24:52 +10:00
olivier lamy 5353ec98e0 Updating to version 11.0.0.beta0 2020-07-09 14:32:48 +10:00
olivier lamy 578768da21 add jetty-11.0.0-SNAPSHOT
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-09 14:26:01 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
olivier lamy b95abd6f4e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-06-13 20:46:06 +10:00
Joakim Erdfelt 6795f3915f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-12 12:04:50 -05:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
olivier lamy dddc4a58e4 Updating to version 11.0.0-alpha0 2020-05-30 13:27:25 +10:00
olivier lamy a83c1a95d0 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-05-27 18:21:58 +10:00
Greg Wilkins b8c7a9509a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-05-27 10:11:51 +02:00
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00
Jan Bartel b15cfeda91 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-04-16 15:20:43 +02:00
Joakim Erdfelt b6489ccae0
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-04-13 17:10:59 -05:00
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
olivier lamy 546566da5c restore VERSION.TXT
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-31 14:54:59 +10:00
Lachlan Roberts 5309b4b225 Issue #4568 - update to use jakarta.servlet 5.0.0
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-31 14:54:59 +10:00
Joakim Erdfelt b7ab2794fd
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	VERSION.txt
#	aggregates/jetty-all-compact3/pom.xml
#	aggregates/jetty-all/pom.xml
#	apache-jsp/pom.xml
#	apache-jstl/pom.xml
#	build-resources/pom.xml
#	examples/async-rest/async-rest-jar/pom.xml
#	examples/async-rest/async-rest-webapp/pom.xml
#	examples/async-rest/pom.xml
#	examples/embedded/pom.xml
#	examples/pom.xml
#	jetty-alpn/jetty-alpn-client/pom.xml
#	jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
#	jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
#	jetty-alpn/jetty-alpn-java-client/pom.xml
#	jetty-alpn/jetty-alpn-java-server/pom.xml
#	jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
#	jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
#	jetty-alpn/jetty-alpn-server/pom.xml
#	jetty-alpn/pom.xml
#	jetty-annotations/pom.xml
#	jetty-ant/pom.xml
#	jetty-bom/pom.xml
#	jetty-cdi/pom.xml
#	jetty-client/pom.xml
#	jetty-continuation/pom.xml
#	jetty-deploy/pom.xml
#	jetty-distribution/pom.xml
#	jetty-documentation/pom.xml
#	jetty-fcgi/fcgi-client/pom.xml
#	jetty-fcgi/fcgi-server/pom.xml
#	jetty-fcgi/pom.xml
#	jetty-gcloud/jetty-gcloud-session-manager/pom.xml
#	jetty-gcloud/pom.xml
#	jetty-hazelcast/pom.xml
#	jetty-home/pom.xml
#	jetty-home/src/main/resources/etc/jetty-setuid.xml
#	jetty-http-spi/pom.xml
#	jetty-http/pom.xml
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-common/pom.xml
#	jetty-http2/http2-hpack/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-http2/pom.xml
#	jetty-infinispan/infinispan-common/pom.xml
#	jetty-infinispan/infinispan-embedded-query/pom.xml
#	jetty-infinispan/infinispan-embedded/pom.xml
#	jetty-infinispan/infinispan-remote-query/pom.xml
#	jetty-infinispan/infinispan-remote/pom.xml
#	jetty-infinispan/pom.xml
#	jetty-io/pom.xml
#	jetty-jaas/pom.xml
#	jetty-jaspi/pom.xml
#	jetty-jmh/pom.xml
#	jetty-jmx/pom.xml
#	jetty-jndi/pom.xml
#	jetty-jspc-maven-plugin/pom.xml
#	jetty-maven-plugin/pom.xml
#	jetty-memcached/jetty-memcached-sessions/pom.xml
#	jetty-memcached/pom.xml
#	jetty-nosql/pom.xml
#	jetty-openid/pom.xml
#	jetty-osgi/jetty-osgi-alpn/pom.xml
#	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
#	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
#	jetty-osgi/jetty-osgi-boot/pom.xml
#	jetty-osgi/jetty-osgi-httpservice/pom.xml
#	jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi-context/pom.xml
#	jetty-osgi/test-jetty-osgi-fragment/pom.xml
#	jetty-osgi/test-jetty-osgi-server/pom.xml
#	jetty-osgi/test-jetty-osgi-webapp/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-plus/pom.xml
#	jetty-proxy/pom.xml
#	jetty-quickstart/pom.xml
#	jetty-rewrite/pom.xml
#	jetty-runner/pom.xml
#	jetty-security/pom.xml
#	jetty-server/pom.xml
#	jetty-servlet/pom.xml
#	jetty-servlets/pom.xml
#	jetty-spring/pom.xml
#	jetty-start/pom.xml
#	jetty-unixsocket/pom.xml
#	jetty-util-ajax/pom.xml
#	jetty-util/pom.xml
#	jetty-webapp/pom.xml
#	jetty-websocket/javax-websocket-client-impl/pom.xml
#	jetty-websocket/javax-websocket-server-impl/pom.xml
#	jetty-websocket/jetty-websocket-tests/pom.xml
#	jetty-websocket/pom.xml
#	jetty-websocket/websocket-api/pom.xml
#	jetty-websocket/websocket-client/pom.xml
#	jetty-websocket/websocket-common/pom.xml
#	jetty-websocket/websocket-server/pom.xml
#	jetty-websocket/websocket-servlet/pom.xml
#	jetty-xml/pom.xml
#	pom.xml
#	tests/pom.xml
#	tests/test-continuation/pom.xml
#	tests/test-distribution/pom.xml
#	tests/test-http-client-transport/pom.xml
#	tests/test-integration/pom.xml
#	tests/test-jmx/jmx-webapp-it/pom.xml
#	tests/test-jmx/jmx-webapp/pom.xml
#	tests/test-jmx/pom.xml
#	tests/test-loginservice/pom.xml
#	tests/test-quickstart/pom.xml
#	tests/test-sessions/pom.xml
#	tests/test-sessions/test-file-sessions/pom.xml
#	tests/test-sessions/test-gcloud-sessions/pom.xml
#	tests/test-sessions/test-hazelcast-sessions/pom.xml
#	tests/test-sessions/test-infinispan-sessions/pom.xml
#	tests/test-sessions/test-jdbc-sessions/pom.xml
#	tests/test-sessions/test-memcached-sessions/pom.xml
#	tests/test-sessions/test-mongodb-sessions/pom.xml
#	tests/test-sessions/test-sessions-common/pom.xml
#	tests/test-webapps/pom.xml
#	tests/test-webapps/test-cdi-common-webapp/pom.xml
#	tests/test-webapps/test-felix-webapp/pom.xml
#	tests/test-webapps/test-http2-webapp/pom.xml
#	tests/test-webapps/test-jaas-webapp/pom.xml
#	tests/test-webapps/test-jetty-webapp/pom.xml
#	tests/test-webapps/test-jndi-webapp/pom.xml
#	tests/test-webapps/test-mock-resources/pom.xml
#	tests/test-webapps/test-owb-cdi-webapp/pom.xml
#	tests/test-webapps/test-proxy-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/pom.xml
#	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
#	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
#	tests/test-webapps/test-simple-webapp/pom.xml
#	tests/test-webapps/test-webapp-rfc2616/pom.xml
#	tests/test-webapps/test-weld-cdi-webapp/pom.xml
2020-02-28 09:29:30 -06:00
Joakim Erdfelt 8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00
Joakim Erdfelt a304fd9f35 Updating to version 9.4.27.v20200227 2020-02-27 12:21:57 -06:00
Joakim Erdfelt 56fc476d55 Updating to version 9.4.27-SNAPSHOT 2020-01-17 07:00:10 -06:00
Joakim Erdfelt 7b38981d25 Updating to version 9.4.26.v20200117 2020-01-17 06:21:47 -06:00
Joakim Erdfelt 2342b73fc1
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-03 14:36:16 -06:00