Commit Graph

243 Commits

Author SHA1 Message Date
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 1cfa277c6c jetty-9 osgi support 2012-09-24 13:04:57 +08:00
Greg Wilkins b1750c0aae jetty-9 fixed bad merge of poms 2012-07-20 15:20:57 +10:00
Jesse McConnell 136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell 1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell 205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Jesse McConnell 30e8e40ef2 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:41:45 -05:00
Jesse McConnell 667cf9a643 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 15:41:38 -05:00
Jesse McConnell e45a89694a [maven-release-plugin] prepare for next development iteration 2012-05-24 09:30:58 -05:00
Jesse McConnell 36fc6fe890 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 09:30:52 -05:00
Jesse McConnell c7a9adaa32 reset for release 2012-05-24 08:33:44 -05:00
Jesse McConnell ea176f0586 [maven-release-plugin] prepare for next development iteration 2012-05-22 15:14:05 -05:00
Jesse McConnell 3fdda881d8 [maven-release-plugin] prepare release jetty-8.1.4.v20120522 2012-05-22 15:13:56 -05:00
Jesse McConnell d292c67b7d [maven-release-plugin] prepare for next development iteration 2012-04-16 09:37:37 -05:00
Jesse McConnell eabdb734ef [maven-release-plugin] prepare release jetty-8.1.3.v20120416 2012-04-16 09:37:31 -05:00
Jesse McConnell b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00
Jesse McConnell 2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Simone Bordet 72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet 85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Jesse McConnell 3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell 308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell 5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
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
Jan Bartel 5b98ee4e1d Fix manifest versions. 2012-03-09 15:38:44 +11: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 2e61650264 merge from master and adjust osgi bits 2012-03-08 20:32:20 -06:00
Jan Bartel 9f3834038c Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-07 12:15:33 +11:00
Jan Bartel 3e13a26ccd Removing unnecessary stuff from poms and adding jetty-plus dep 2012-03-07 12:14:55 +11: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
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 6b079ae3d8 merge from master 2012-02-01 17:25:08 -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
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