Greg Wilkins
|
66980f2449
|
Merge remote-tracking branch 'origin/master' into jetty-http2
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
examples/quickstart/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-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-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/jetty-osgi-npn/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-alpn-tests/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-npn-tests/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-loginservice/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-dispatch-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-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
|
2014-07-25 17:37:53 +10:00 |
Joakim Erdfelt
|
87e18ab06a
|
Updating VERSION.txt top section
|
2014-07-24 11:09:01 -07:00 |
|
Joakim Erdfelt
|
e7aa5edd37
|
Updating VERSION.txt top section
|
2014-07-23 08:50:31 -07:00 |
Simone Bordet
|
adaeeefe32
|
Merged branch 'master' into 'jetty-http2'.
|
2014-06-16 16:08:40 +02:00 |
Jesse McConnell
|
e5910e576e
|
set for dev
|
2014-06-10 08:18:51 -05:00 |
|
Jesse McConnell
|
9cdfaf5196
|
set for release
|
2014-06-09 13:09:32 -05:00 |
|
Greg Wilkins
|
8f4aeeeb8d
|
updated version to 10.0.0-SNAPSHOT
|
2014-06-04 15:08:54 +02:00 |
|
Jesse McConnell
|
175794d12a
|
set for release
|
2014-05-26 10:49:56 -05:00 |
|
Jesse McConnell
|
a21b88cfa0
|
set for dev
|
2014-05-23 11:12:01 -05:00 |
|
Jesse McConnell
|
0bf24e042a
|
set for release
|
2014-05-23 09:30:34 -05:00 |
|
Jesse McConnell
|
b12b125204
|
set for dev
|
2014-05-15 16:05:32 -05:00 |
|
Jesse McConnell
|
4c24fa120f
|
set for release
|
2014-05-15 07:51:26 -05:00 |
|
Jesse McConnell
|
042ce196a5
|
set for release
|
2014-05-08 11:15:31 -05:00 |
|
Jesse McConnell
|
7a2ea8c6dc
|
set for release
|
2014-04-09 09:56:58 -05:00 |
|
Jesse McConnell
|
34a1d3e109
|
set for dev
|
2014-04-02 16:25:26 -05:00 |
|
Jesse McConnell
|
46c1734817
|
Updating VERSION.txt top section
|
2014-04-01 09:01:59 -05:00 |
|
Jesse McConnell
|
c273401742
|
set for dev
|
2014-03-07 09:10:45 -06:00 |
|
Jesse McConnell
|
76429e55e4
|
set for release
|
2014-03-07 09:10:08 -06:00 |
|
Jesse McConnell
|
eb0aea46ce
|
set versions.txt file to new version and fix mistaken developmentVersion
|
2014-02-10 13:48:29 -06:00 |
|
Jesse McConnell
|
86f46c9ee4
|
Updating VERSION.txt top section
|
2014-02-10 10:48:14 -06:00 |
|
Jesse McConnell
|
d3b2072ad3
|
set for dev
|
2014-01-10 09:11:04 -06:00 |
|
Jesse McConnell
|
b4156e4862
|
set for release
|
2014-01-08 13:36:42 -06:00 |
|
Jesse McConnell
|
b55d8fa4c3
|
Updating VERSION.txt top section
|
2013-12-20 14:40:50 -06:00 |
|
Greg Wilkins
|
28f56f994e
|
updated versions
|
2013-11-29 09:26:12 +11:00 |
|
Joakim Erdfelt
|
dcae1860ae
|
Updating VERSION.txt top section
|
2013-11-16 07:20:33 -07:00 |
|
Joakim Erdfelt
|
47e0710faa
|
Updating VERSION.txt top section
|
2013-11-15 15:40:43 -07:00 |
|
Jesse McConnell
|
3a9861dea1
|
set for release
|
2013-11-14 15:02:40 -06:00 |
|
Jesse McConnell
|
45d65ab7c0
|
set for dev
|
2013-11-14 08:58:34 -06:00 |
|
Jesse McConnell
|
6db55c3863
|
set for release
|
2013-10-31 14:56:41 -05:00 |
|
Jesse McConnell
|
c920d0475a
|
set for dev
|
2013-10-24 17:27:42 -05:00 |
|
Jesse McConnell
|
66aa5a077f
|
set for release
|
2013-10-24 16:10:35 -05:00 |
|
Jesse McConnell
|
9e8d07337b
|
Merge branch 'jetty-9.1' into release-9.1
|
2013-10-24 16:09:18 -05:00 |
|
Greg Wilkins
|
defa3a04cf
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
VERSION.txt
aggregates/jetty-all/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-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/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-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/jetty-osgi-npn/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-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-proxy/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-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/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
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-loginservice/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-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-jetty-webapp/src/main/config/demo-base/webapps/test.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
|
2013-10-14 13:10:02 +11:00 |
|
Jesse McConnell
|
785fecb2bb
|
set for release
|
2013-09-30 20:49:56 -05:00 |
|
Jesse McConnell
|
6ec630f044
|
set for release
|
2013-09-30 12:35:22 -05:00 |
|
Jesse McConnell
|
0b3f431d27
|
set version back to 9.0.6-SNAPSHOT
|
2013-09-30 12:33:06 -05:00 |
|
Greg Wilkins
|
f2f8ec54c6
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
aggregates/jetty-all/pom.xml
examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
|
2013-09-23 13:38:43 +10:00 |
|
Jesse McConnell
|
1f1ba9646b
|
set for release
|
2013-09-19 14:30:08 -05:00 |
|
Jesse McConnell
|
b781b00cc2
|
Merge branch 'master' into release-9
|
2013-09-19 14:29:01 -05:00 |
|
Greg Wilkins
|
002de9857e
|
Merge remote-tracking branch 'origin/master' into release-9.1
|
2013-09-19 17:16:08 +10:00 |
|
Greg Wilkins
|
be6f876621
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
VERSION.txt
aggregates/jetty-all/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
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nosql/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-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-proxy/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-server/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/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-jetty-webapp/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-09-19 17:08:40 +10:00 |
|
Greg Wilkins
|
52aba6f1aa
|
updated VERSIONS.txt with 7 relase
|
2013-09-19 17:01:46 +10:00 |
|
Jesse McConnell
|
2b4475b046
|
set for dev
|
2013-09-16 16:08:29 -05:00 |
|
Jesse McConnell
|
a816863c30
|
set for release
|
2013-09-16 12:15:36 -05:00 |
|
Joakim Erdfelt
|
105d02b3fe
|
Updating VERSION.txt top section
|
2013-09-16 10:01:06 -07:00 |
|
Joakim Erdfelt
|
43029a1476
|
Reverting VERSION.txt
|
2013-09-16 09:58:35 -07:00 |
|
Joakim Erdfelt
|
ceb07fdfcf
|
Minor update to VERSION.txt so that release-9 branch can be made
|
2013-09-16 09:24:56 -07:00 |
|
Greg Wilkins
|
dd5277576a
|
Updating VERSION.txt top section
|
2013-09-16 23:57:21 +10:00 |
|
Greg Wilkins
|
5ba684f009
|
reset VERSION to snapshot
|
2013-09-16 23:41:51 +10:00 |
|
Greg Wilkins
|
30bab30d9b
|
Revert "Merge branch 'release-8' into jetty-8"
This reverts commit 463ef68dc3, reversing
changes made to de544ddfbf.
|
2013-09-16 23:28:59 +10:00 |