Joakim Erdfelt
|
5de1289ac0
|
Merge branch 'release-9.3.28' into jetty-9.3.x
|
2019-11-07 12:10:00 -06:00 |
|
Joakim Erdfelt
|
0df21b6e86
|
Merge branch 'jetty-9.2.x' into jetty-9.3.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/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-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-cdi/pom.xml
# jetty-client/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-io/pom.xml
# jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jsp/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-monitor/pom.xml
# jetty-nosql/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-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-spdy/pom.xml
# jetty-spdy/spdy-client/pom.xml
# jetty-spdy/spdy-core/pom.xml
# jetty-spdy/spdy-example-webapp/pom.xml
# jetty-spdy/spdy-http-client-transport/pom.xml
# jetty-spdy/spdy-http-common/pom.xml
# jetty-spdy/spdy-http-server/pom.xml
# jetty-spdy/spdy-server/pom.xml
# jetty-spring/pom.xml
# jetty-start/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/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-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/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-hash-sessions/pom.xml
# tests/test-sessions/test-jdbc-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-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-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-webapp-rfc2616/pom.xml
|
2019-11-07 12:09:39 -06:00 |
|
Joakim Erdfelt
|
43d95cd984
|
Updating to version 9.3.29-SNAPSHOT
|
2019-11-05 13:02:10 -06:00 |
|
Joakim Erdfelt
|
d7dd68d6e9
|
Updating to version 9.3.28.v20191105
|
2019-11-05 11:46:40 -06:00 |
|
Joakim Erdfelt
|
b17439c731
|
Updating to version 9.2.30-SNAPSHOT
|
2019-11-05 11:23:21 -06:00 |
|
Joakim Erdfelt
|
36c95fdd43
|
Updating to version 9.2.29.v20191105
|
2019-11-05 10:43:15 -06:00 |
|
Joakim Erdfelt
|
a91fddab6d
|
Merge branch `release-9.3.27` into `jetty-9.3.x`
|
2019-04-29 07:06:28 -05:00 |
|
Joakim Erdfelt
|
1f4ea64ca1
|
Merge branch `jetty-9.2.x` into `jetty-9.3.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/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-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-cdi/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jsp/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-monitor/pom.xml
# jetty-nosql/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-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-spdy/pom.xml
# jetty-spdy/spdy-client/pom.xml
# jetty-spdy/spdy-core/pom.xml
# jetty-spdy/spdy-example-webapp/pom.xml
# jetty-spdy/spdy-http-client-transport/pom.xml
# jetty-spdy/spdy-http-common/pom.xml
# jetty-spdy/spdy-http-server/pom.xml
# jetty-spdy/spdy-server/pom.xml
# jetty-spring/pom.xml
# jetty-start/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/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-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-hash-sessions/pom.xml
# tests/test-sessions/test-jdbc-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-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-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-webapp-rfc2616/pom.xml
|
2019-04-29 07:06:05 -05:00 |
|
Joakim Erdfelt
|
5882d63ba7
|
Updating to version 9.3.28-SNAPSHOT
|
2019-04-18 13:54:17 -05:00 |
|
Joakim Erdfelt
|
d3e249f869
|
Updating to version 9.3.27.v20190418
|
2019-04-18 13:10:03 -05:00 |
|
Joakim Erdfelt
|
2c14d93885
|
Updating to version 9.2.29-SNAPSHOT
|
2019-04-18 12:17:07 -05:00 |
|
Joakim Erdfelt
|
1dffa36fe3
|
Updating to version 9.2.28.v20190418
|
2019-04-18 11:23:17 -05:00 |
|
Joakim Erdfelt
|
608e4f5a98
|
Merge branch `release-9.3.26` into `jetty-9.3.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
|
2019-04-08 13:10:39 -05:00 |
|
Joakim Erdfelt
|
1f6e0107c5
|
Merge branch `jetty-9.2.x` into `jetty-9.3.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/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-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-cdi/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jsp/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-monitor/pom.xml
# jetty-nosql/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-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-spdy/pom.xml
# jetty-spdy/spdy-client/pom.xml
# jetty-spdy/spdy-core/pom.xml
# jetty-spdy/spdy-example-webapp/pom.xml
# jetty-spdy/spdy-http-client-transport/pom.xml
# jetty-spdy/spdy-http-common/pom.xml
# jetty-spdy/spdy-http-server/pom.xml
# jetty-spdy/spdy-server/pom.xml
# jetty-spring/pom.xml
# jetty-start/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/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-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-hash-sessions/pom.xml
# tests/test-sessions/test-jdbc-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-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-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-webapp-rfc2616/pom.xml
|
2019-04-08 13:09:16 -05:00 |
Greg Wilkins
|
0684377c88
|
updated version.txt
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-04-04 16:40:39 +11:00 |
|
Joakim Erdfelt
|
9b19374c5d
|
Updating to version 9.2.28-SNAPSHOT
|
2019-04-03 19:38:05 -05:00 |
|
Joakim Erdfelt
|
84dfe74b97
|
Updating to version 9.2.27.v20190403
|
2019-04-03 19:04:45 -05:00 |
|
Joakim Erdfelt
|
c70034766e
|
Updating to version 9.3.27-SNAPSHOT
|
2019-04-03 18:46:31 -05:00 |
|
Joakim Erdfelt
|
dae476e369
|
Updating to version 9.3.26.v20190403
|
2019-04-03 18:16:32 -05:00 |
|
Joakim Erdfelt
|
2ccde9772b
|
Undoing bad release-9.3.26
|
2019-04-03 18:11:16 -05:00 |
|
Greg Wilkins
|
9f4b3542cb
|
Updating to version 9.3.27-SNAPSHOT
|
2019-04-03 17:32:08 +11:00 |
|
Greg Wilkins
|
7ec6d2fb32
|
Updating to version 9.3.26.v20190403
|
2019-04-03 13:06:51 +11:00 |
Simone Bordet
|
44ac57040a
|
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
|
2018-10-17 12:36:56 +02:00 |
Jesse McConnell
|
863a19bccf
|
Updating to version 9.3.26-SNAPSHOT
|
2018-09-04 17:23:31 -05:00 |
|
Jesse McConnell
|
3ce520221d
|
Updating to version 9.3.25.v20180904
|
2018-09-04 16:08:21 -05:00 |
|
Greg Wilkins
|
2c0557b1ae
|
VERSION.txt cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2018-08-16 08:33:29 +10:00 |
|
Greg Wilkins
|
b3d1c240e1
|
fixed VERSION.txt for 9.3.18
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2018-08-12 16:59:03 +10:00 |
|
Joakim Erdfelt
|
516d93c488
|
Updating to version 9.2.27-SNAPSHOT
|
2018-08-06 11:33:22 -05:00 |
|
Joakim Erdfelt
|
8c637489ae
|
Updating to version 9.2.26.v20180806
|
2018-08-06 10:51:25 -05:00 |
|
Joakim Erdfelt
|
0e6c91b604
|
Updating to version 9.2.26-SNAPSHOT
|
2018-06-06 18:54:58 -05:00 |
|
Joakim Erdfelt
|
4830fd15e9
|
Updating to version 9.2.25.v20180606
|
2018-06-06 16:42:54 -05:00 |
|
Joakim Erdfelt
|
5eefa90e05
|
Updating to version 9.3.25-SNAPSHOT
|
2018-06-05 13:13:07 -05:00 |
|
Joakim Erdfelt
|
84205aa28f
|
Updating to version 9.3.24.v20180605
|
2018-06-05 12:11:03 -05:00 |
|
Joakim Erdfelt
|
e89180698c
|
Improving VERSION.txt
|
2018-06-05 12:08:46 -05:00 |
|
Joakim Erdfelt
|
734af26ccb
|
Updating to version 9.3.25-SNAPSHOT
|
2018-05-21 13:46:46 -05:00 |
|
Joakim Erdfelt
|
e2a533fd3d
|
Updating to version 9.3.24.v20180521
|
2018-05-21 12:52:08 -05:00 |
|
Joakim Erdfelt
|
a05b157c03
|
Updating to version 9.3.24-SNAPSHOT
|
2018-02-28 16:39:30 -06:00 |
|
Joakim Erdfelt
|
0554f8d8b4
|
Updating to version 9.3.23.v20180228
|
2018-02-28 15:45:57 -06:00 |
|
Joakim Erdfelt
|
d7ea895aeb
|
Fixing VERSION.txt order
|
2018-02-28 15:43:53 -06:00 |
|
Joakim Erdfelt
|
12c0a55de0
|
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
|
2018-02-07 15:55:19 -06:00 |
|
Joakim Erdfelt
|
bd01e1877a
|
Updating to version 9.2.25-SNAPSHOT
|
2018-01-05 11:35:42 -06:00 |
|
Joakim Erdfelt
|
a617842695
|
Updating to version 9.2.24.v20180105
|
2018-01-05 10:11:08 -06:00 |
|
Simone Bordet
|
887b57649b
|
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
|
2018-01-05 11:11:11 +01:00 |
|
Joakim Erdfelt
|
2dd970b055
|
Updating to version 9.2.24-SNAPSHOT
|
2017-12-18 10:43:47 -06:00 |
|
Joakim Erdfelt
|
cdbe733684
|
Updating to version 9.2.23.v20171218
|
2017-12-18 09:06:48 -06:00 |
|
Jesse McConnell
|
a72eb0001d
|
Updating to version 9.3.23-SNAPSHOT
|
2017-10-30 15:39:57 -05:00 |
|
Jesse McConnell
|
5fe04f8799
|
set for release
|
2017-10-30 15:05:46 -05:00 |
|
Joakim Erdfelt
|
17e11a7e7d
|
Updating to version 9.3.22-SNAPSHOT
|
2017-09-18 15:04:47 -07:00 |
|
Joakim Erdfelt
|
15bd75f858
|
Updating to version 9.3.21.v20170918
|
2017-09-18 14:24:36 -07:00 |
|
Joakim Erdfelt
|
e838eced95
|
Removing M0 release details
|
2017-09-18 14:20:19 -07:00 |