Jesse McConnell
381615f52d
merge from master
2012-03-07 16:44:31 -06:00
Jesse McConnell
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
Jesse McConnell
3f88a6af41
this should force java 7 when trying to release
2012-03-05 16:08:25 -06:00
Simone Bordet
c66bbae8ae
Fully integrated SPDY module.
2012-03-05 20:18:21 +01:00
Simone Bordet
32bf123874
Integrated NPN API module.
2012-03-05 19:02:11 +01:00
Jesse McConnell
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
Jesse McConnell
ac79497dee
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:29:36 -06:00
Jesse McConnell
3705b424c8
[maven-release-plugin] prepare release jetty-8.1.1.v20120215
2012-02-15 14:29:28 -06:00
Jesse McConnell
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
Jesse McConnell
098428dd37
Merge branch 'master' into jetty-8
2012-02-15 13:49:23 -06:00
Joakim Erdfelt
9207423ca0
Fixing JDK5 build abort due to bad javadocs
2012-02-06 10:01:44 -07:00
Jan Bartel
384ce0d77c
Fix version of servlet api to 3.0
2012-02-02 19:17:18 +11:00
Jesse McConnell
0797e8a23d
merge from master
2012-02-01 17:25:11 -06:00
Jesse McConnell
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
Joakim Erdfelt
228ff32ab0
Cleaning up jetty-jsp dependencies to only arrive via jetty-jsp
2012-02-01 08:59:00 -07:00
Joakim Erdfelt
fd80ef3488
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-31 15:23:10 -07:00
Joakim Erdfelt
fdaad62b63
Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
...
+ Removed old deps in javax.*, geronimo, and asm in favor of
new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
Jesse McConnell
28d3241c76
add jetty-jsp
2012-01-31 16:05:50 -06:00
Joakim Erdfelt
c4cf25f51b
Raising new orbit deps to top level dependencyManagement, and wiring up jetty-osgi with new deps
2012-01-31 14:00:47 -07:00
Joakim Erdfelt
b7e9d701d5
Bug 369349 - space in filename fix broke integration tests
...
+ fixing argument escaping so that it works with test-integration and
jetty-osgi
2012-01-30 15:35:31 -07:00
Jesse McConnell
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
Jesse McConnell
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
Jesse McConnell
ec731e691d
[maven-release-plugin] prepare for next development iteration
2012-01-20 12:28:31 -06:00
Jesse McConnell
6004fd4553
[maven-release-plugin] prepare release jetty-8.1.0.RC5
2012-01-20 12:28:24 -06:00
Jesse McConnell
16833ca8c9
[maven-release-plugin] prepare for next development iteration
2012-01-20 10:50:24 -06:00
Jesse McConnell
dd80d7e868
[maven-release-plugin] prepare release jetty-7.6.0.RC5
2012-01-20 10:50:14 -06:00
Jesse McConnell
8725172017
[maven-release-plugin] prepare for next development iteration
2012-01-13 09:45:25 -06:00
Jesse McConnell
a2349abbcc
[maven-release-plugin] prepare release jetty-8.1.0.RC4
2012-01-13 09:45:18 -06:00
Jesse McConnell
45cf0552fc
[maven-release-plugin] prepare for next development iteration
2012-01-13 08:37:25 -06:00
Jesse McConnell
ec589eed33
[maven-release-plugin] prepare release jetty-7.6.0.RC4
2012-01-13 08:37:19 -06:00
Joakim Erdfelt
51e3af89b8
[maven-release-plugin] prepare for next development iteration
2012-01-05 09:49:38 -07:00
Joakim Erdfelt
10d751fed8
[maven-release-plugin] prepare release jetty-7.6.0.RC3
2012-01-05 09:49:31 -07:00
Jesse McConnell
6fb729ea0d
[maven-release-plugin] prepare for next development iteration
2011-12-22 13:55:28 -06:00
Jesse McConnell
ac42188458
[maven-release-plugin] prepare release jetty-8.1.0.RC2
2011-12-22 13:55:23 -06:00
Greg Wilkins
b36425b7aa
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
Jesse McConnell
8981176dda
remove snapshot repo to see if that resolves issue with p2 snapshot build
2011-12-21 14:12:25 -06:00
Jan Bartel
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00