Jan Bartel
|
86f7e76c4d
|
Merge of jetty-7 into jetty-8
Conflicts:
VERSION.txt
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-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-nested/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/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
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-07-11 12:05:58 +10:00 |
|
Jesse McConnell
|
39674f8a8e
|
[maven-release-plugin] prepare for next development iteration
|
2011-07-07 18:43:56 -05:00 |
|
Jesse McConnell
|
5aa94f502e
|
[maven-release-plugin] prepare release jetty-7.4.4.v20110707
|
2011-07-07 18:43:50 -05:00 |
|
Greg Wilkins
|
17e907c2fb
|
git diff 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
|
2011-07-07 18:18:24 +10:00 |
|
Jesse McConnell
|
6ed9d4c394
|
update scm.url
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
|
2011-07-06 13:33:16 -05:00 |
|
Jesse McConnell
|
42c129a78f
|
set new parent version and update scm info
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
|
2011-07-06 13:20:44 -05:00 |
|
Jesse McConnell
|
6190961f31
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 11:12:45 +00:00 |
|
Jesse McConnell
|
db9f79eaff
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110701
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 11:12:33 +00:00 |
|
Greg Wilkins
|
baabacfe95
|
reverted to 7.4.4-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 02:22:56 +00:00 |
|
Jesse McConnell
|
b9fffcb9a0
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 00:54:20 +00:00 |
|
Jesse McConnell
|
ea23a83bb3
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 00:54:07 +00:00 |
|
Jesse McConnell
|
b1ca45e709
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-30 19:49:20 +00:00 |
|
Jesse McConnell
|
5f5cb8ea53
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-30 19:39:23 +00:00 |
|
Jesse McConnell
|
ba34537bc4
|
update jetty-test-helper to 1.6
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3383 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-10 13:16:10 +00:00 |
|
Jesse McConnell
|
54e885d967
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3289 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 12:20:58 +00:00 |
|
Jesse McConnell
|
e35f16bae5
|
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3287 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 12:14:37 +00:00 |
|
Jesse McConnell
|
64cbf74b09
|
reset poms for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3286 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 11:59:36 +00:00 |
|
Greg Wilkins
|
92c1a7bc5d
|
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3277 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 08:51:01 +00:00 |
|
Joakim Erdfelt
|
e68c6ce9fb
|
Using released version of jetty-test-helper
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3266 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-25 23:05:31 +00:00 |
|
Joakim Erdfelt
|
d77ac8acb4
|
Using new jetty-test-helper 1.5-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3265 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-25 23:05:29 +00:00 |
|
Jesse McConnell
|
297d4cb49b
|
resolve some mvn warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3215 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-19 14:32:49 +00:00 |
|
Hugues Malphettes
|
5b7811ca76
|
This directive for the Export-Package does make the osgi test pass again.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3196 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-18 01:52:37 +00:00 |
|
Jesse McConnell
|
51f6df9871
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3184 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:57:00 +00:00 |
|
Jesse McConnell
|
28e63af76b
|
[maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:56:45 +00:00 |
|
Jesse McConnell
|
0793141d2c
|
[maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:39:59 +00:00 |
|
Jesse McConnell
|
be9da35ef4
|
set for test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:39:17 +00:00 |
|
Jesse McConnell
|
f4daeaedef
|
busting build to test release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3178 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:33:05 +00:00 |
|
Hugues Malphettes
|
275a0da64d
|
Change the instructions for the maven-bundle-plugin to try to make it work for the new version 2.3.4. The osgi test is not passing yet though.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3166 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 14:26:30 +00:00 |
|
Jesse McConnell
|
898470696c
|
updating to parent-17-snapshot and various changes to work with updated maven plugins
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 13:41:15 +00:00 |
|
Greg Wilkins
|
f8dc394adb
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-13 04:48:47 +00:00 |
|
Greg Wilkins
|
6e0649ab3f
|
[maven-release-plugin] prepare release jetty-7.4.1.v20110513
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-13 04:48:21 +00:00 |
|
Jesse McConnell
|
314a59192d
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 19:57:07 +00:00 |
|
Jesse McConnell
|
fadbd0bdc5
|
[maven-release-plugin] prepare release jetty-7.4.1.v20110512
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 19:56:53 +00:00 |
|
Greg Wilkins
|
5d0f1b88f4
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 09:02:46 +00:00 |
|
Greg Wilkins
|
83b6c19cca
|
[maven-release-plugin] prepare release jetty-7.4.1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 09:02:19 +00:00 |
|
Greg Wilkins
|
936b80dd46
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-14 02:22:30 +00:00 |
|
Greg Wilkins
|
a01a1edd70
|
[maven-release-plugin] prepare release jetty-7.4.0.v20110414
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-14 02:22:04 +00:00 |
|
Greg Wilkins
|
b43b2607ad
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2992 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-07 01:24:34 +00:00 |
|
Greg Wilkins
|
b6d04cc349
|
[maven-release-plugin] prepare release jetty-7.4.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2990 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-07 01:24:08 +00:00 |
|
Greg Wilkins
|
9a415c93f4
|
341992 Overlayed context deployer
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2983 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-06 09:30:00 +00:00 |
|
Michael Gorovoy
|
ac4777e2e3
|
Set the version of jetty-test-helper to 1.3
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2979 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-05 19:43:41 +00:00 |
|
Greg Wilkins
|
7702baf312
|
use 1.3-SNAPSHOT test helper
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2973 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-05 01:13:26 +00:00 |
|
Michael Gorovoy
|
fa6ef11ad6
|
Set the version of jetty-test-policy artifact to 1.2
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2968 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-04 20:37:19 +00:00 |
|
Greg Wilkins
|
2ca6b4521b
|
341736 Split jetty-nested out of war module
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2959 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-04 05:19:17 +00:00 |
|
Greg Wilkins
|
50541649ca
|
Get ready for 7.4 release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2952 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-01 03:42:09 +00:00 |
|
Greg Wilkins
|
f7a0d7d134
|
JETTY-1354 Added jetty-nested
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2941 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-31 07:30:08 +00:00 |
|
Greg Wilkins
|
c2bc7a5ddd
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2864 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-07 05:42:13 +00:00 |
|
Greg Wilkins
|
1d5a6de9c7
|
[maven-release-plugin] prepare release jetty-7.3.1.v20110307
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2862 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-07 05:41:43 +00:00 |
|
Greg Wilkins
|
db438ca86f
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2854 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-04 03:58:46 +00:00 |
|
Greg Wilkins
|
70bd1c2085
|
[maven-release-plugin] prepare release jetty-7.3.1.v20110304
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2852 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-04 03:58:19 +00:00 |
|