Jan Bartel
|
bd2add0ae9
|
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
|
2013-07-12 13:53:58 +10:00 |
Greg Wilkins
|
965918d8f2
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-07-04 17:28:57 +10:00 |
|
Greg Wilkins
|
c33db24d94
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
|
2013-07-04 15:00:47 +10:00 |
Joakim Erdfelt
|
78b5f7df1f
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-25 08:29:26 -07:00 |
|
Joakim Erdfelt
|
5f2c937fcb
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
|
2013-06-25 08:29:18 -07:00 |
Jesse McConnell
|
298b46a96f
|
set for re-reelease
|
2013-06-21 15:35:58 -05:00 |
|
Jesse McConnell
|
8927c18840
|
reset versions for release
|
2013-06-21 15:28:26 -05:00 |
|
Jesse McConnell
|
57bfda2a08
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-21 09:49:25 -05:00 |
|
Jesse McConnell
|
c1082ad4d4
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
|
2013-06-21 09:49:15 -05:00 |
|
Jan Bartel
|
4f6732a7e9
|
Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization.
|
2013-06-21 18:41:35 +10:00 |
|
Joakim Erdfelt
|
f8c457f75e
|
Merge branch 'jetty-9.1' into javawebsocket-jsr
|
2013-06-19 15:07:15 -07:00 |
|
Joakim Erdfelt
|
2da8c9c306
|
Merge branch 'master' into javawebsocket-jsr
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
|
2013-06-17 10:54:10 -07:00 |
|
Greg Wilkins
|
4e4ffaa54c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2013-06-17 16:29:39 +10:00 |
|
Jan Bartel
|
2ea7843d86
|
Merge remote-tracking branch 'origin/jetty-8'
|
2013-06-17 14:39:17 +10:00 |
|
Jan Bartel
|
1908fff38f
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-06-17 14:11:46 +10:00 |
|
Jan Bartel
|
59889bc149
|
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
|
2013-06-17 13:17:14 +10:00 |
|
Jan Bartel
|
232eb4491a
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
|
2013-06-17 13:13:59 +10:00 |
Thomas Becker
|
391b0ee426
|
ChatServletTest fix test
|
2013-06-13 17:36:29 +02:00 |
|
Jesse McConnell
|
a582b42d45
|
add logging properties for testing
|
2013-06-13 10:31:23 -05:00 |
|
Thomas Becker
|
df17ef8b3a
|
408709 refactor test-webapp's chat application. Now there's only a single request for user login and initial chat message.
|
2013-06-13 16:58:57 +02:00 |
|
Jesse McConnell
|
eddb49941d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-06-12 15:52:36 -05:00 |
|
Greg Wilkins
|
f8e0764fa5
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-06-11 14:07:46 +10:00 |
|
Greg Wilkins
|
06d3fbe5aa
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
|
2013-06-11 14:07:00 +10:00 |
|
Greg Wilkins
|
3de2ba33f1
|
fixed merge
|
2013-06-11 10:52:15 +10:00 |
|
Greg Wilkins
|
5d17bdcc27
|
fixed double dispatch in continuation tests
|
2013-06-11 10:50:15 +10:00 |
|
Greg Wilkins
|
d2794584e1
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
|
2013-06-07 15:48:22 +10:00 |
|
Joakim Erdfelt
|
a4d4d81580
|
Merge branch 'master' into javawebsocket-jsr
|
2013-06-04 13:23:15 -07:00 |
|
Joakim Erdfelt
|
3db9299369
|
Merge branch 'jetty-7' into jetty-8
|
2013-06-04 11:24:44 -07:00 |
|
Joakim Erdfelt
|
4b458792c9
|
JDK5 build fix with Resource caching and path lookups
|
2013-06-04 10:42:32 -07:00 |
|
Jan Bartel
|
6cbffcb332
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/DirectNIOBuffer.java
|
2013-06-04 10:39:05 +10:00 |
|
Jan Bartel
|
f65fc71288
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-06-04 10:37:16 +10:00 |
|
Jan Bartel
|
26c1e5bdbc
|
407342 ReloadedSessionMissingClassTest uses class compiled with jdk7
|
2013-06-04 10:34:52 +10:00 |
|
Jan Bartel
|
af02e9b16d
|
Update to version to 8.1.12-SNAPSHOT after last release
|
2013-05-30 10:52:39 +10:00 |
|
Joakim Erdfelt
|
598ecd7d7f
|
Merge branch 'master' into javawebsocket-jsr
|
2013-05-22 09:25:06 -07:00 |
|
Jesse McConnell
|
725dc261c8
|
Merge branch 'release-8' into jetty-8
|
2013-05-22 10:44:14 -05:00 |
|
Jesse McConnell
|
a1a6f0e5f2
|
Merge branch 'release-7' into jetty-7
|
2013-05-22 10:39:24 -05:00 |
|
Jesse McConnell
|
742f6a063d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-05-21 13:16:39 -05:00 |
|
Jesse McConnell
|
bdbd92dbc9
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-05-21 13:10:07 -05:00 |
|
Jesse McConnell
|
0858e69cb1
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-20 07:19:34 -05:00 |
|
Jesse McConnell
|
d469b77663
|
[maven-release-plugin] prepare release jetty-8.1.11.v20130520
|
2013-05-20 07:19:25 -05:00 |
|
Jesse McConnell
|
497c2f7819
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-20 07:15:00 -05:00 |
|
Jesse McConnell
|
b32d0260c9
|
[maven-release-plugin] prepare release jetty-7.6.11.v20130520
|
2013-05-20 07:14:52 -05:00 |
|
Jan Bartel
|
cf71e9559b
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-05-17 17:19:54 +10:00 |
|
Jan Bartel
|
b6d1158c22
|
408167 JDBCSessionManager don't mark session as dirty if same attribute value set
|
2013-05-17 17:18:54 +10:00 |
|
Joakim Erdfelt
|
9f82849900
|
Merge from [master] to [javawebsocket-jsr]
|
2013-05-09 12:10:57 -07:00 |
|
Jan Bartel
|
9b57f9e29a
|
Fix test-spec test for new annotation added.
|
2013-05-09 12:18:53 +10:00 |
|
Jan Bartel
|
2fb23e705c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
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/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-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-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-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-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-spec-webapp/src/main/java/com/acme/AnnotationTest.java
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-05-09 11:29:45 +10:00 |
|
Jesse McConnell
|
3d600ed95e
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-06 18:13:04 -05:00 |
|
Jesse McConnell
|
d832f3dc7e
|
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
|
2013-05-06 18:12:55 -05:00 |
|
Jan Bartel
|
143b387727
|
Improve styles for test webapps
|
2013-05-06 19:13:41 +10:00 |