Joakim Erdfelt
|
48e5157731
|
Merge branch 'jetty-9.2.x'
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-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-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
|
2015-01-21 11:00:54 -07:00 |
Jesse McConnell
|
aa22842c20
|
[maven-release-plugin] prepare for next development iteration
|
2015-01-16 17:48:29 -06:00 |
|
Jesse McConnell
|
8c58a9abc4
|
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
|
2015-01-16 17:48:23 -06:00 |
|
Joakim Erdfelt
|
aea4713d27
|
Minor test class cleanup while testing some annotation scanning behavior reported
|
2015-01-16 15:18:01 -07:00 |
|
Jesse McConnell
|
81bb8411d1
|
[maven-release-plugin] prepare for next development iteration
|
2015-01-16 12:06:36 -06:00 |
|
Jesse McConnell
|
7865f88b81
|
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
|
2015-01-16 12:06:30 -06:00 |
|
Jesse McConnell
|
db991355a2
|
[maven-release-plugin] prepare for next development iteration
|
2015-01-16 10:41:45 -06:00 |
|
Jesse McConnell
|
6930abb8d3
|
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
|
2015-01-16 10:41:39 -06:00 |
|
Jesse McConnell
|
9225b124a4
|
[maven-release-plugin] prepare for next development iteration
|
2015-01-16 08:21:35 -06:00 |
|
Jesse McConnell
|
ebd563e64d
|
[maven-release-plugin] prepare release 9.2.7.v20140116
|
2015-01-16 08:21:29 -06:00 |
|
Joakim Erdfelt
|
a3201a3c81
|
Happy New Year 2015
|
2015-01-07 17:06:59 -07:00 |
|
Joakim Erdfelt
|
6a0668b7a1
|
Happy New Year 2015
|
2015-01-07 17:03:30 -07:00 |
Simone Bordet
|
379f9f6c43
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2015-01-06 17:30:43 +01:00 |
Jan Bartel
|
381227cd9d
|
456486 Jar containing ServiceContainerInitializer impl not found in TCCL in osgi
|
2015-01-01 17:25:10 +01:00 |
|
Jan Bartel
|
bc22ba72dc
|
[maven-release-plugin] prepare for next development iteration
|
2014-12-05 16:45:12 +01:00 |
|
Jan Bartel
|
1cc075cf98
|
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
|
2014-12-05 16:45:01 +01:00 |
|
Jesse McConnell
|
127b48c932
|
[maven-release-plugin] prepare for next development iteration
|
2014-12-03 09:00:57 -06:00 |
|
Jesse McConnell
|
028f4b9610
|
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
|
2014-12-03 09:00:46 -06:00 |
|
Jesse McConnell
|
1263d1f3c8
|
[maven-release-plugin] prepare for next development iteration
|
2014-12-03 08:26:47 -06:00 |
|
Jesse McConnell
|
5c7f706496
|
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
|
2014-12-03 08:26:35 -06:00 |
|
Jesse McConnell
|
09846e324d
|
[maven-release-plugin] prepare for next development iteration
|
2014-11-12 17:13:19 -06:00 |
|
Jesse McConnell
|
97d2bd95a6
|
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
|
2014-11-12 17:13:14 -06:00 |
|
Jesse McConnell
|
5d0595cabd
|
[maven-release-plugin] prepare for next development iteration
|
2014-11-03 13:46:58 -06:00 |
|
Jesse McConnell
|
772ff0bfd4
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
|
2014-11-03 13:46:52 -06:00 |
|
Jesse McConnell
|
1c4a08b35b
|
[maven-release-plugin] prepare for next development iteration
|
2014-10-31 09:58:16 -05:00 |
|
Jesse McConnell
|
a4ff7bf841
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
|
2014-10-31 09:58:10 -05:00 |
|
Jesse McConnell
|
e1b73a64eb
|
[maven-release-plugin] prepare for next development iteration
|
2014-10-30 11:28:41 -05:00 |
|
Jesse McConnell
|
5770cc1179
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
|
2014-10-30 11:28:35 -05:00 |
|
Jesse McConnell
|
58eb6740ec
|
[maven-release-plugin] prepare for next development iteration
|
2014-10-28 14:20:30 -05:00 |
|
Jesse McConnell
|
19a44846cf
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
|
2014-10-28 14:20:24 -05:00 |
|
Jan Bartel
|
7d5c8f2a96
|
Merge remote-tracking branch 'origin/jetty-9.2.x'
|
2014-10-24 12:51:01 +11:00 |
|
Jan Bartel
|
1ab6d7398c
|
447979 Refactor to make MetaData responsible for progressively ordering web-inf jars
|
2014-10-24 12:48:15 +11:00 |
|
Joakim Erdfelt
|
9249ebb6ef
|
Using 9.2.4-SNAPSHOT for branch
|
2014-09-11 06:10:44 -07:00 |
|
Jesse McConnell
|
9bfeb2221f
|
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
|
2014-09-05 09:19:23 -05:00 |
Greg Wilkins
|
edcb56ae6b
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2014-08-29 12:41:52 +10:00 |
|
Jan Bartel
|
21d590a74a
|
442759 Allow specific ServletContainerInitializers to be excluded
|
2014-08-28 16:52:26 +10:00 |
|
Greg Wilkins
|
1c71040eca
|
moved config plugin to profile
|
2014-08-15 19:53:52 +10:00 |
|
Greg Wilkins
|
b47f9ef605
|
cleaned up OSGi manifest creation
|
2014-08-15 19:35:49 +10:00 |
|
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 |
|
Jan Bartel
|
f8bf40107a
|
436862 Update jetty-osgi to asm-5 and spifly-1.0.1
|
2014-07-25 15:32:41 +10:00 |
|
Joakim Erdfelt
|
cb42ef2167
|
[maven-release-plugin] prepare for next development iteration
|
2014-07-23 11:18:01 -07:00 |
|
Joakim Erdfelt
|
dc62cb5ac7
|
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
|
2014-07-23 11:17:55 -07:00 |
|
Greg Wilkins
|
fa3d7d0f7e
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
|
2014-07-23 16:53:13 +10:00 |
|
Greg Wilkins
|
3a6879d3e8
|
expanded tabs in indents
|
2014-07-23 16:49:05 +10:00 |
|
Greg Wilkins
|
853e020210
|
Merge remote-tracking branch 'origin/master' into jetty-http2
|
2014-07-16 15:31:48 +10:00 |
|
Simone Bordet
|
745f757552
|
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
|
2014-07-15 18:49:14 +02:00 |
|
Greg Wilkins
|
5e281dd449
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
|
2014-07-10 14:43:39 +10:00 |
|
Greg Wilkins
|
55ca09a00e
|
438190 findbug improvements
|
2014-07-10 14:41:32 +10:00 |
|
Simone Bordet
|
334db9fe72
|
Updated version to 9.3.0-SNAPSHOT.
|
2014-06-16 21:33:03 +02:00 |
|
Jesse McConnell
|
c3ee0711ca
|
[maven-release-plugin] prepare for next development iteration
|
2014-06-09 13:37:54 -05:00 |