393 Commits

Author SHA1 Message Date
Jesse McConnell
b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell
246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -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
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
Jan Bartel
959a4a2743 Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-02 10:39:17 +11:00
Jan Bartel
5c0c8c7e73 371168 Update ClientCrossContextSessionTest 2012-03-01 17:43:38 +11: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
Jan Bartel
629c6c470a Ensure construction of fresh MongoSessionIdManager 2012-02-10 16:01:17 +11:00
Jan Bartel
41049826bb Fix misspelling of module name 2012-02-10 14:49:07 +11:00
Jan Bartel
4a180eef3b Move mongodb tests from jetty-nosql module to common test module. Activate during build with -Dmongodb.enabled=true 2012-02-10 14:19:13 +11:00
Jan Bartel
7aff671bae Tidy up session tests, add more comments. 2012-02-10 12:28:44 +11:00
Jesse McConnell
d13599a1d1 add assertion that a new session is in fact new 2012-02-09 12:42:18 -06:00
Jesse McConnell
6b079ae3d8 merge from master 2012-02-01 17:25:08 -06: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
Thomas Becker
40963a884e Revert "Making --dry-run work with paths that have spaces"
This reverts commit 3df95d45c27c924c1f0e76c4c16a3f796ddf2470.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2012-01-30 09:17:53 -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
c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -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
Greg Wilkins
067e3f17cb avoid NPE with jdk 7u4ea8 changed behaviour of SslContext init 2012-01-23 16:58:29 +11:00
Joakim Erdfelt
3df95d45c2 Making --dry-run work with paths that have spaces 2012-01-20 11:27:38 -07:00
Jesse McConnell
7cb15929f7 Merge branch 'master' into jetty-8 2012-01-17 13:37:28 -06:00
Jesse McConnell
90184ab3c3 Latest merge from master 2012-01-17 13:36:44 -06:00
Joakim Erdfelt
fc3d2f0599 Setting TRACE tests to @Ignore pending review of changes for realmless security constraints that have rendered the TRACE tests invalid for integration testing of the default configuration 2012-01-17 12:16:55 -07:00
Greg Wilkins
d4a23c2a65 368633 fixed configure.dtd resource mappings 2012-01-16 13:58:44 +11:00
Greg Wilkins
b8e0258faf Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
2012-01-12 11:01:03 +11:00
Jesse McConnell
0dcb3bec9a remove duplicate dependency plugin usage 2012-01-11 11:04:59 -06:00
Jesse McConnell
49b3239aa6 clear up the last of the maven warnings I see 2012-01-10 13:45:39 -06:00
Greg Wilkins
de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
2011-11-30 16:27:30 +11:00
Greg Wilkins
631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins
9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Jan Bartel
127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins
7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00