875 Commits

Author SHA1 Message Date
Jan Bartel
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
Jan Bartel
dd8b397723 Update to latest jetty-schemas version. 2013-09-02 17:16:45 +10:00
Jan Bartel
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
Jesse McConnell
ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Jesse McConnell
307fdced91 Merge branch 'master' into jetty-9.1 2013-08-20 14:02:45 -05:00
Jesse McConnell
a69deacc4c [Bug 411069] update minimum jdk versions in pom.xml's 2013-08-20 12:40:33 -05:00
Jan Bartel
c80100b4a9 [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03 [maven-release-plugin] rollback the release of jetty-9.0.5.v20130815 2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Jesse McConnell
c93363055c Merge branch 'master' into jetty-9.1 2013-08-14 14:43:58 -05:00
Jesse McConnell
654b434323 add ci profile for jetty-all 2013-08-14 14:43:39 -05:00
Jesse McConnell
00d160a1c9 Merge branch 'release-9.1' into jetty-9.1 2013-08-14 14:37:19 -05:00
Joakim Erdfelt
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
Jesse McConnell
657e78aff2 [maven-release-plugin] prepare for next development iteration 2013-08-14 13:28:42 -05:00
Jesse McConnell
590fae2bc4 [maven-release-plugin] prepare release jetty-9.1.0.M0 2013-08-14 13:28:32 -05:00
Jesse McConnell
4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Joakim Erdfelt
8636c7da45 Merge branch 'master' into jetty-9.1
Conflicts:
	jetty-maven-plugin/pom.xml
	pom.xml
2013-08-05 09:53:48 -07:00
Joakim Erdfelt
74991f90d6 Cleanup from merge 2013-08-05 09:13:32 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
01786aa0c2 Merge branch 'jetty-7' into jetty-8 2013-08-02 15:11:05 -07:00
Joakim Erdfelt
2057c4c17b Upgrading Junit + Hamcrest 2013-08-02 14:25:53 -07:00
Jesse McConnell
20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell
49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell
6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell
1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Jesse McConnell
650e8e93ae [maven-release-plugin] prepare for next development iteration 2013-07-26 10:57:33 -05:00
Jesse McConnell
e7e2fce56e [maven-release-plugin] prepare release jetty-7.6.12.v20130726 2013-07-26 10:57:26 -05:00
Jesse McConnell
98249488d4 set for release 2013-07-26 10:49:24 -05:00
Jesse McConnell
869389e857 set for release 2013-07-26 10:48:53 -05:00
Simone Bordet
9d571af7b0 Merged branch 'master' into 'jetty-9.1'. 2013-07-26 13:55:05 +02:00
Simone Bordet
5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Greg Wilkins
c76de0b584 404468 Ported jetty-http-spi to Jetty-9 2013-07-26 11:40:12 +10:00
Jesse McConnell
49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell
9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05:00
Jesse McConnell
de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell
3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 2013-07-25 12:52:07 -05:00
Jesse McConnell
bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell
39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jesse McConnell
e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell
99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -05:00
Jesse McConnell
767dbe6778 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:48:09 -05:00
Jesse McConnell
cfa6076c4f [maven-release-plugin] prepare release jetty-7.6.11.v20130725 2013-07-25 07:48:02 -05:00
Jan Bartel
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
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
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
8927c18840 reset versions for release 2013-06-21 15:28:26 -05:00