f44787075a
417382 - Upgrade to asm 4.1 and refactor annotation parsing
2013-09-17 13:12:54 +10:00
b24928db81
Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi)
2013-09-12 11:55:21 +10:00
be2ecca599
Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi)
2013-09-12 10:06:01 +10:00
dd8b397723
Update to latest jetty-schemas version.
2013-09-02 17:16:45 +10:00
a98bbc31e0
Make jsp 2.3.2 work for jetty-9.1, bring osgi tests back into the build.
2013-09-02 17:14:17 +10:00
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00
307fdced91
Merge branch 'master' into jetty-9.1
2013-08-20 14:02:45 -05:00
a69deacc4c
[Bug 411069] update minimum jdk versions in pom.xml's
2013-08-20 12:40:33 -05:00
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
c93363055c
Merge branch 'master' into jetty-9.1
2013-08-14 14:43:58 -05:00
654b434323
add ci profile for jetty-all
2013-08-14 14:43:39 -05:00
00d160a1c9
Merge branch 'release-9.1' into jetty-9.1
2013-08-14 14:37:19 -05:00
6daf39b10b
Fixing javadoc generation in jetty-all
...
+ Added missing javax artifacts to jetty-all pom
+ Moved javax.websocket versioning to top level pom
2013-08-14 12:14:47 -07:00
657e78aff2
[maven-release-plugin] prepare for next development iteration
2013-08-14 13:28:42 -05:00
590fae2bc4
[maven-release-plugin] prepare release jetty-9.1.0.M0
2013-08-14 13:28:32 -05:00
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
8636c7da45
Merge branch 'master' into jetty-9.1
...
Conflicts:
jetty-maven-plugin/pom.xml
pom.xml
2013-08-05 09:53:48 -07:00
74991f90d6
Cleanup from merge
2013-08-05 09:13:32 -07:00
e2d872fcc7
Merge branch 'jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
pom.xml
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
2013-08-05 08:47:24 -07:00
01786aa0c2
Merge branch 'jetty-7' into jetty-8
2013-08-02 15:11:05 -07:00
2057c4c17b
Upgrading Junit + Hamcrest
2013-08-02 14:25:53 -07:00
20bd1e0f96
[maven-release-plugin] prepare for next development iteration
2013-07-26 11:50:17 -05:00
49c3b2c32a
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:49:58 -05:00
6ed360c480
reset for release
2013-07-26 11:23:57 -05:00
1a5117e9ab
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:18:24 -05:00
650e8e93ae
[maven-release-plugin] prepare for next development iteration
2013-07-26 10:57:33 -05:00
e7e2fce56e
[maven-release-plugin] prepare release jetty-7.6.12.v20130726
2013-07-26 10:57:26 -05:00
98249488d4
set for release
2013-07-26 10:49:24 -05:00
869389e857
set for release
2013-07-26 10:48:53 -05:00
9d571af7b0
Merged branch 'master' into 'jetty-9.1'.
2013-07-26 13:55:05 +02:00
5c7eb9e265
Reverted version to 7.6.12-SNAPSHOT.
2013-07-26 13:36:35 +02:00
c76de0b584
404468 Ported jetty-http-spi to Jetty-9
2013-07-26 11:40:12 +10:00
49045558ef
[maven-release-plugin] prepare for next development iteration
2013-07-25 14:07:12 -05:00
9b888d5c22
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
2013-07-25 14:06:53 -05:00
de2840ca1e
[maven-release-plugin] prepare for next development iteration
2013-07-25 12:52:15 -05:00
3e94867f7f
[maven-release-plugin] prepare release jetty-8.1.12.v20130725
2013-07-25 12:52:07 -05:00
bc679809f8
[maven-release-plugin] prepare for next development iteration
2013-07-25 11:25:58 -05:00
39ec9b8051
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
2013-07-25 11:25:51 -05:00
e0ad2c4ee1
[maven-release-plugin] prepare for next development iteration
2013-07-25 07:52:39 -05:00
99712058ca
[maven-release-plugin] prepare release jetty-8.1.11.v20130725
2013-07-25 07:52:32 -05:00
767dbe6778
[maven-release-plugin] prepare for next development iteration
2013-07-25 07:48:09 -05:00
cfa6076c4f
[maven-release-plugin] prepare release jetty-7.6.11.v20130725
2013-07-25 07:48:02 -05:00
fac202e1ac
Update new jetty-schemas to 3.1.RC0. Update to 3.1 before 9.1 milestone release.
2013-07-12 14:45:56 +10:00
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
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
8927c18840
reset versions for release
2013-06-21 15:28:26 -05:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
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
31082e1f8e
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-06-18 08:37:49 +10:00
d3645ac28c
Testing git setup
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2013-06-17 10:09:13 -07:00
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
762e91efbe
Adding clirr to api-change profile
2013-06-13 16:04:17 -07:00
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
d660cfcff6
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java
2013-06-11 11:17:04 +10:00
d95e316f2c
Upgrading to jetty-test-helper 2.3
2013-06-07 13:33:11 -07:00
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
b86344e269
Added new examples of embedding JNDI,annotations and updated realm.properties to match distro
2013-06-07 08:49:28 +10:00
af02e9b16d
Update to version to 8.1.12-SNAPSHOT after last release
2013-05-30 10:52:39 +10:00
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
725dc261c8
Merge branch 'release-8' into jetty-8
2013-05-22 10:44:14 -05:00
a1a6f0e5f2
Merge branch 'release-7' into jetty-7
2013-05-22 10:39:24 -05:00
742f6a063d
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:16:39 -05:00
bdbd92dbc9
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:10:07 -05:00
b959a742d0
[Bug 404508] enable overlay deployer
2013-05-20 09:20:40 -05:00
0858e69cb1
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:19:34 -05:00
d469b77663
[maven-release-plugin] prepare release jetty-8.1.11.v20130520
2013-05-20 07:19:25 -05:00
497c2f7819
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:15:00 -05:00
b32d0260c9
[maven-release-plugin] prepare release jetty-7.6.11.v20130520
2013-05-20 07:14:52 -05:00
bd153af2e2
Update to temporarily use jsp 2.3 and el 3.0 from maven
2013-05-09 17:17:46 +10:00
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
c41a66bda8
Updating javadoc linking to Java SE 7
2013-05-08 11:27:51 -07:00
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
ef77b854fa
404911 - WebSocketCloseTest fails spuriously
...
+ Renabling test
+ Using EventQueue from jetty-test-helper instead
+ Standarizing HttpResponseHeaderParser into websocket-common so that
remaining bytebuffer logic is maintained in one place.
+ Making BlockingClient also use HttpResponseHeaderParser
2013-04-26 15:37:46 -07:00
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
d34bd7aec7
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-18 12:16:24 +10:00
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
db21b42b4f
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
2013-04-15 17:44:35 +10:00
07b844bf85
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-11 15:55:04 +10:00
5728077faf
Merge remote-tracking branch 'origin/release-9'
2013-04-11 06:24:01 +10:00
ff08b1c2e5
Setting the heap size to 1 GiB for tests.
2013-04-09 18:36:09 +02:00
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
7523c5234c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
3cf2f4a461
[Bug 404029] port jetty-monitor to jetty-9 and activate it
2013-03-25 13:55:19 -05:00
279dff381c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
e8d76ef12c
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
jetty-server/src/main/config/etc/jetty-requestlog.xml
jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00
8a96cc8c4a
Merge branch 'jetty-7' into jetty-8
2013-03-14 16:54:35 -07:00
5084a1430f
Fixing build.
...
+ Bumping jetty-test-helper to 2.0
+ Bumping jetty-version-maven-plugin to 1.0.10
+ Fixing JDK 1.5 build warts
+ Updating Stress use for new "test.stress" property introduced by upgrades
2013-03-14 16:52:52 -07:00
Jan Bartel
Jesse McConnell
Joakim Erdfelt
Simone Bordet
Greg Wilkins
Joakim Erdfelt