Joakim Erdfelt
|
ae21126cad
|
Updating to version 9.4.20-SNAPSHOT
|
2019-06-10 13:40:17 -05:00 |
|
Joakim Erdfelt
|
afcf563148
|
Updating to version 9.4.19.v20190610
|
2019-06-10 11:17:56 -05:00 |
|
Joakim Erdfelt
|
734be56938
|
Updating to version 9.4.19-SNAPSHOT
|
2019-04-29 16:27:23 -05:00 |
|
Joakim Erdfelt
|
e1bc35120a
|
Updating to version 9.4.18.v20190429
|
2019-04-29 15:40:33 -05:00 |
|
Joakim Erdfelt
|
2d2426520b
|
Merge branch `jetty-9.3.x` into `jetty-9.4.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
# 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-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-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/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/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-memcached-session-manager/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.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/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/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-fragment/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-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-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-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-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:26:10 -05: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
|
05bb111580
|
Updating to version 9.4.18-SNAPSHOT
|
2019-04-18 15:59:49 -05:00 |
|
Joakim Erdfelt
|
aa1c656c31
|
Updating to version 9.4.17.v20190418
|
2019-04-18 14:44:28 -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
|
79537a5f51
|
Updating to version 9.4.17-SNAPSHOT
|
2019-04-11 11:00:24 -05:00 |
|
Joakim Erdfelt
|
e0aa4ae4c0
|
Updating to version 9.4.16.v20190411
|
2019-04-11 10:01:26 -05:00 |
|
Joakim Erdfelt
|
2e46dd0a21
|
Merge branch `jetty-9.3.x` into `jetty-9.4.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
|
2019-04-08 13:13:48 -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 |
|
Joakim Erdfelt
|
9cdb59d4d7
|
Updating to version 9.4.16-SNAPSHOT
|
2019-02-15 13:35:15 -05:00 |
|
Joakim Erdfelt
|
eb70b24016
|
Updating to version 9.4.15.v20190215
|
2019-02-15 11:53:00 -05:00 |
|
Joakim Erdfelt
|
29fd18e046
|
Updating to version 9.4.15-SNAPSHOT
|
2018-11-14 16:42:40 -06:00 |
|
Joakim Erdfelt
|
c4550056e7
|
Updating to version 9.4.14.v20181114
|
2018-11-14 15:19:10 -06:00 |
|
Joakim Erdfelt
|
a903017f5f
|
Updating to version 9.4.14-SNAPSHOT
|
2018-11-11 21:06:50 -06:00 |
|
Joakim Erdfelt
|
49123a3313
|
Updating to version 9.4.13.v20181111
|
2018-11-11 20:02:42 -06:00 |
Simone Bordet
|
932f1a7516
|
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
|
2018-10-17 15:49:54 +02: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
|
c249685953
|
merge from 9.3.x
|
2018-09-05 10:27:31 -05: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 |
|
Jesse McConnell
|
dcf6a8fa9f
|
Updating to version 9.4.13-SNAPSHOT
|
2018-08-30 10:48:22 -05:00 |
|
Jesse McConnell
|
2720868475
|
Updating to version 9.4.12.v20180830
|
2018-08-30 08:56:44 -05:00 |
|
Greg Wilkins
|
babdd5d4b7
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2018-08-16 08:44:07 +10: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
|
5ee856c0c1
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2018-08-12 16:59:33 +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
|
321b4b4f7a
|
Updating VERSION.txt
|
2018-08-01 12:26:58 -05:00 |
|
Joakim Erdfelt
|
0b69f00665
|
Updating to version 9.4.12-SNAPSHOT
|
2018-07-11 17:32:16 -05:00 |
|
Joakim Erdfelt
|
260596dd10
|
Updating to version 9.4.12.RC0
|
2018-07-11 16:30:55 -05:00 |
|
Joakim Erdfelt
|
3932b11e64
|
Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x
|
2018-06-07 14:31:24 -05:00 |
|
Joakim Erdfelt
|
bf5697cc14
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2018-06-07 14:31:10 -05:00 |