Commit Graph

764 Commits

Author SHA1 Message Date
Jan Bartel b86344e269 Added new examples of embedding JNDI,annotations and updated realm.properties to match distro 2013-06-07 08:49:28 +10:00
Jan Bartel af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Greg Wilkins 15e0d50b79 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-23 09:50:27 +10: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 b959a742d0 [Bug 404508] enable overlay deployer 2013-05-20 09:20:40 -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 bd153af2e2 Update to temporarily use jsp 2.3 and el 3.0 from maven 2013-05-09 17:17:46 +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
Joakim Erdfelt c41a66bda8 Updating javadoc linking to Java SE 7 2013-05-08 11:27:51 -07: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 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
Joakim Erdfelt 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
Greg Wilkins a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Jan Bartel d34bd7aec7 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-18 12:16:24 +10:00
Jesse McConnell 7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Jesse McConnell 0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell 3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Jan Bartel 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
Jan Bartel 07b844bf85 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-11 15:55:04 +10:00
Greg Wilkins 5728077faf Merge remote-tracking branch 'origin/release-9' 2013-04-11 06:24:01 +10:00
Simone Bordet ff08b1c2e5 Setting the heap size to 1 GiB for tests. 2013-04-09 18:36:09 +02:00
Greg Wilkins b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Jan Bartel 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
Jesse McConnell 3cf2f4a461 [Bug 404029] port jetty-monitor to jetty-9 and activate it 2013-03-25 13:55:19 -05:00
Jan Bartel 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
Greg Wilkins 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
Joakim Erdfelt 8a96cc8c4a Merge branch 'jetty-7' into jetty-8 2013-03-14 16:54:35 -07:00
Joakim Erdfelt 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
Jesse McConnell acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell 0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell 852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Joakim Erdfelt 897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt 7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt 96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Jesse McConnell 778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Joakim Erdfelt 94756a42c3 [maven-release-plugin] prepare for next development iteration 2013-03-01 16:08:32 -07:00
Joakim Erdfelt 96dabe7e62 [maven-release-plugin] prepare release jetty-9.0.0.RC3 2013-03-01 16:08:24 -07:00
Joakim Erdfelt c267c1a9d0 [maven-release-plugin] prepare for next development iteration 2013-03-01 10:26:43 -07:00
Joakim Erdfelt ba15fe04e2 [maven-release-plugin] prepare release jetty-9.0.0.RC3 2013-03-01 10:26:34 -07:00
Joakim Erdfelt e950957950 [maven-release-plugin] prepare for next development iteration 2013-02-24 08:13:34 -07:00
Joakim Erdfelt 459e04d3b2 [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-24 08:13:26 -07:00
Joakim Erdfelt a619abdfe7 Bumping up findbugs plugin to 2.5.2 2013-02-23 16:44:49 -07:00
Jan Bartel cec5f5e65a Fixing build 2013-02-21 20:13:45 +11:00
Joakim Erdfelt ddfec4a504 Minor javadoc plugin edit 2013-02-05 10:00:36 -07:00
Joakim Erdfelt 4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell 2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Joakim Erdfelt a82ed7a954 re-enabling jetty-all aggregate for release process 2013-01-25 11:36:45 -07:00
Jesse McConnell fe33b53f0d Merge branch 'jetty-8' 2013-01-25 11:38:37 -06:00
Jesse McConnell 368d7bbb72 Merge branch 'jetty-7' into jetty-8 2013-01-25 11:35:11 -06:00
Jesse McConnell c00e8d0283 Add analystics to aggregate javadoc profile (so it only targeted on actual release deployment.) 2013-01-25 11:26:25 -06:00
Joakim Erdfelt de0d5acdb9 Bumping up jetty-version-maven-plugin to 1.0.9 2013-01-23 13:59:21 -07:00
Joakim Erdfelt b6d551675b Merge branch 'jetty-7' into jetty-8 2013-01-23 13:58:34 -07:00
Joakim Erdfelt a7aab0b6c6 Bumping up jetty-version-maven-plugin to 1.0.9 2013-01-23 13:56:05 -07:00
Jesse McConnell 9bc937a676 add line back into pom 2013-01-22 08:32:32 -06:00
Joakim Erdfelt a36e31277a Updating javadoc external site references for the new snoracle reality 2013-01-17 16:40:16 -07:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Joakim Erdfelt 2e926b8de8 [maven-release-plugin] prepare for next development iteration 2012-12-26 12:52:42 -07:00
Joakim Erdfelt fe44428a85 [maven-release-plugin] prepare release jetty-9.0.0.M5 2012-12-26 12:52:34 -07:00
Joakim Erdfelt ef472ed01b Merge from master to release-9 2012-12-26 12:28:58 -07:00
Jesse McConnell 80dff24711 switch release profile to eclipse-release which should pick up aggregate on next release 2012-12-26 15:24:32 -03:00
Joakim Erdfelt f9c36c55e0 [maven-release-plugin] prepare for next development iteration 2012-12-21 11:47:06 -07:00
Joakim Erdfelt 78e14912aa [maven-release-plugin] prepare release jetty-9.0.0.M4 2012-12-21 11:46:58 -07:00
Joakim Erdfelt ea2f87f4be Disabling jetty-all 2012-12-21 11:30:06 -07:00
Joakim Erdfelt 43a248aa58 Trying to get jetty-all to be happy 2012-12-21 11:01:40 -07:00
Joakim Erdfelt f5a9849d93 Adding aggregates to main build for release 2012-12-21 10:59:10 -07:00
Joakim Erdfelt 6971a6c600 Reverting Simone's change to remove aggregates as it breaks the release 2012-12-21 10:57:44 -07:00
Joakim Erdfelt 9f85d79d97 Adding back jetty-all for this release 2012-12-21 10:53:07 -07:00
Simone Bordet 2237053819 Moved aggregates out of the main build, only included in the release build. 2012-12-19 16:27:20 +01:00
Simone Bordet c9f4513a89 Reworked HTTP client API, removing usage of Future. 2012-12-19 16:27:20 +01:00
Jesse McConnell eefb0bc8fd remove jetty-setuid from master and use the toolchain setuid in the distribution 2012-12-06 10:06:38 -06:00
Jesse McConnell ec4d926b4b [Bug 395649] add jetty-setuid back into jetty 9 and distribution 2012-12-04 16:52:26 -06:00
Jan Bartel 6bc507c3af 395574 port jetty-runner and StatisticsServlet to jetty-9 2012-12-04 18:22:26 +11:00
Jan Bartel c9db4ca815 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-proxy/pom.xml
	pom.xml
2012-11-30 15:45:36 +11:00
Greg Wilkins 4d823c28bf jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref 2012-11-29 17:41:54 +11:00
Joakim Erdfelt 11cbe274af 395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x 2012-11-28 16:55:13 -07:00
Greg Wilkins b06aefb6c1 jetty-9 removed old modules 2012-11-29 10:10:33 +11:00
Greg Wilkins f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Thomas Becker 273c166b21 Delete java-monitor. 2012-11-21 13:38:31 +01:00
Thomas Becker ac43fd4c63 started to migrate java-monitor to jetty-9, however we decided to drop it. So I'll commit my unfinished status quo and then delete the module 2012-11-21 13:37:57 +01:00
Thomas Becker 9e4ec32e58 remove jetty-plugins module from pom.xml 2012-11-21 12:02:53 +01:00
Greg Wilkins f21b74dcb1 jetty-9 relocated test webapp 2012-11-19 15:57:38 +11:00
Jesse McConnell 7975b25ae8 [Bug 394232] add jetty-ant into jetty9 2012-11-15 13:39:06 -06:00
Joakim Erdfelt 6f0d9e546c Merge from 'master' to 'ws-refactor' 2012-11-13 13:52:54 -07:00
Joakim Erdfelt d229364f9d Fixing jetty-osgi for new websocket artifacts 2012-11-13 12:50:27 -07:00
Jesse McConnell a37f9c813d get aggregate back into release 2012-11-13 10:16:24 -06:00
Simone Bordet f35f32ac48 Eliminated jetty-proxy module.
Moved ConnectHandler to jetty-server and ProxyServlet to jetty-servlets.
2012-11-13 17:11:46 +01:00
Simone Bordet ba40f7897d Completed port of ConnectHandler and ProxyServlet implementations. 2012-11-13 15:35:51 +01:00
Jesse McConnell 97640eeea0 [Bug 394143] add jetty-all aggregate via release profile 2012-11-12 17:13:06 -06:00
Jesse McConnell 952d6b7316 [Bug 394144] add jetty-jaspi 2012-11-12 17:05:50 -06:00
Jesse McConnell f03e11c0f2 make sure dists are not installed by default for now 2012-11-08 14:37:33 -06:00
Jesse McConnell 0a3e559ec6 initial setup for deb generation 2012-11-08 14:15:23 -06:00
Simone Bordet 28fd4cceac Implemented proxy functionalities for both client and server. 2012-11-07 20:13:53 +01:00
Jesse McConnell 0411045449 [maven-release-plugin] prepare for next development iteration 2012-11-05 13:54:10 -06:00
Jesse McConnell 87b67d477b [maven-release-plugin] prepare release jetty-9.0.0.M2 2012-11-05 13:53:54 -06:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jesse McConnell eac9414f01 Merge branch 'jetty-7' into jetty-8 2012-11-05 11:52:18 -06:00
Joakim Erdfelt 7b3a15a403 Fixing license-check plugin scope 2012-11-05 10:39:52 -07:00
Joakim Erdfelt c1f06f9329 Moving license check to default build for top-level only 2012-11-05 10:37:00 -07:00
Jan Bartel 2a2215cf0b Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2012-11-02 16:59:11 +11:00
Jan Bartel 2f735cf5a9 Adding jetty-jaas module to build for jetty-9 2012-11-02 15:43:59 +11:00
Jan Bartel c49563244c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2012-10-30 19:18:20 +11:00
Jan Bartel ec089948fb 392237 Make rfc2616 webapp work in jetty-9 2012-10-29 15:53:51 +11:00
Jan Bartel b8d6b4da8b Making session tests work; incorporating renewing session id keeping old object. 2012-10-27 18:44:35 +11:00
Jan Bartel 1ee6fe4cba Change session renewal to be in line with servlet3.1; make session tests work; fix mongo session manager (scavenging) 2012-10-27 17:38:43 +11:00
Jan Bartel 958d0c6949 Start incorporating (EDR version) servlet 3.1 spec 2012-10-27 17:38:43 +11:00
Jesse McConnell 1271143ad9 wire maven plugins back in 2012-10-18 11:16:15 -05:00
Jesse McConnell 6c2fb983a9 fix modules 2012-10-18 10:56:38 -05:00
Greg Wilkins 7a95722d66 392237 cleaned pom 2012-10-18 14:49:22 +11:00
Greg Wilkins dd6c20e378 392237 moved examples to common folder 2012-10-18 14:29:55 +11:00
Jesse McConnell a046ff085a remove jetty-policy from jetty9 2012-10-17 17:36:53 -05:00
Greg Wilkins 9d0828614f jetty-9 ported rewrite 2012-10-12 23:56:44 +11:00
Greg Wilkins 6c011025b6 jetty-9 added a pretty welcome page 2012-10-12 15:36:32 +11:00
Joakim Erdfelt f2595a7ec3 Bumping up to jetty-test-helper 2.0 with new @Rule TestTracker & AdvancedRunner status messages. 2012-10-10 09:10:51 -07:00
Hugues Malphettes 3efefe37bc Clean-up OSGi test; add spdy OSGi test; fix felix
Upgrade to the latest pax-exam
Support for felix-3.x and 4.x as tested
Fix the spdy MANIFEST.MF generations
Add an integration test for SPDY
Refactor the test code

Squashed commit of the following:

commit bd020ee1214992d8d21a11dc800e04dc5e9b2001
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Sat Oct 6 16:58:43 2012 +0800

    Add spdy integration test for OSGi and clean-up

    Refacor the pax-exam OSGi integration tests
    Add an integration test for spdy.
    Execute the test under 2 versions of felix and 2 versions of equinox.

commit f3151a272ab92560432f3b76f564bf06b19bc22b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Sat Oct 6 16:28:51 2012 +0800

    Fix the generated MANIFEST.MF

    OSGi integration test in the next commit.

commit 3152aa2b5e39cf2d3b81f8400488c0672e922b8d
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Fri Oct 5 16:58:29 2012 +0800

    Fix the startup of the servlet.

    setInitOrder(0) was working in jetty-7 and jetty-8 but not in jetty-9
    anymore. setInitOrder(1) is fine.

commit 8038d314f4f423e8608fd09dd42b840e101a0c13
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:28 2012 +0800

    Upgrade to pax-exam-2.6

commit 7136fa88e2410ac345b6ae0657d882c7e9714c0b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:07 2012 +0800

    Support for felix-3.x and felix-4.x

commit 0bcc6b0d8ed5144150f90f578a90c558419349d1
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:28 2012 +0800

    Upgrade to pax-exam-2.6

commit 2e17466624650df433b6c5f11abafb56539ee740
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:07 2012 +0800

    Support for felix-3.x and felix-4.x
2012-10-06 17:26:14 +08:00
Hugues Malphettes 29c18fc4d5 OSGi manifests generation fixes cleanup 2012-09-25 11:24:16 +08:00
Hugues Malphettes 1cfa277c6c jetty-9 osgi support 2012-09-24 13:04:57 +08:00
Simone Bordet d59e8ddd44 jetty-9: Added -XX:+PrintGCDetails to the Maven Surefire Plugin. 2012-09-21 17:34:21 +02:00
Jesse McConnell 01c9aa93e9 spring dep passed CQ, module included 2012-09-21 07:26:01 -05:00
Greg Wilkins 15804e76e2 jetty-9 use latest test helper 2012-09-21 08:43:21 +10:00
Joakim Erdfelt 864384bd85 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-20 12:05:01 -07:00
Joakim Erdfelt f275a045c3 Fixing 'enforce-orbit-deps' enforcer rules to actually work + allow provided scope 2012-09-20 12:04:41 -07:00
Jesse McConnell 1301bca9f5 set parent to released version 2012-09-20 14:01:47 -05:00
Jesse McConnell 26af53752e Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-20 13:56:32 -05:00
Joakim Erdfelt 857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07:00
Jesse McConnell 003c0d16a5 remove bits that can't be released yet 2012-09-20 13:51:32 -05:00
Simone Bordet be865fa191 jetty-9: reverted JUnit to 4.8.1; trying to upgrade it breaks the whole build. 2012-09-20 19:09:33 +02:00
Simone Bordet 7f448c22be jetty-9 - Updated JUnit to 4.10. 2012-09-20 18:27:21 +02:00