2e7d84dec8
Update to new parent pom that lets us import into indigo and m2eclipse
2011-09-09 15:42:01 -05:00
675464e82d
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-09-08 12:46:56 -05:00
03c0192cdb
Making image files from src/main/javadoc actually show up in javadoc:aggregate and -javadoc.jar files
2011-09-08 10:29:27 -07:00
d5304b2cbc
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:20:15 -05:00
c33548d38a
[maven-release-plugin] prepare release jetty-8.0.1.v20110908
2011-09-08 12:19:24 -05:00
ebdb89dc23
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:00:16 -05:00
932245a114
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
2011-09-08 12:00:10 -05:00
721c8ab682
updating version.txt and resetting pom version to 8.0.1-SNAPSHOT
2011-09-08 11:54:53 -05:00
37d0f53b0a
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
2011-09-08 11:40:37 -05:00
4e47d6a7fa
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:16:58 -05:00
d77a12962b
[maven-release-plugin] prepare release jetty-8.0.1.v20110907
2011-09-07 18:16:50 -05:00
6b614a54f0
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:12:16 -05:00
ce55c8c601
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 18:12:09 -05:00
1744b5bce1
reset from release
2011-09-07 11:09:46 -05:00
ae86ad6d4e
[maven-release-plugin] prepare for next development iteration
2011-09-07 10:03:16 -05:00
86383afbd2
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 10:03:10 -05:00
40dcb10ed8
[maven-release-plugin] prepare for next development iteration
2011-09-01 12:24:32 -05:00
db14b194fa
[maven-release-plugin] prepare release jetty-8.0.0.v20110901
2011-09-01 12:24:24 -05:00
a728021edf
[maven-release-plugin] prepare for next development iteration
2011-09-01 11:17:05 -05:00
882308f781
[maven-release-plugin] prepare release jetty-7.5.0.c20110901
2011-09-01 11:16:58 -05:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
57e9045635
[maven-release-plugin] prepare for next development iteration
2011-08-31 14:17:32 -05:00
317491a4d7
[maven-release-plugin] prepare release jetty-7.5.0.v20110901
2011-08-31 14:17:25 -05:00
d6da533ca5
Moved jetty-distribution to main modules list
2011-08-30 19:35:24 -04:00
7663a83616
[maven-release-plugin] rollback the release of jetty-7.5.0.RC2
2011-08-30 12:52:45 -07:00
4c5c954d23
[maven-release-plugin] prepare release jetty-7.5.0.RC2
2011-08-30 12:47:42 -07:00
9adbd0b5eb
Bumping up version of jetty-version-maven-plugin to use new :attach-version-text goal
2011-08-30 12:20:01 -07:00
79fb254151
Using released build-support release
2011-08-28 09:52:10 -07:00
51c5911e15
Making PMD AvoieAnonymousLogging rule be enforced for this branch
2011-08-24 09:52:07 -07:00
5ef33386b7
Using released jetty-version-maven-plugin
2011-08-22 15:17:31 -07:00
74b4d6bc2c
Merging changes
2011-08-19 12:15:37 -07:00
4698cc05c5
Making :update-version profile instead
2011-08-19 12:13:54 -07:00
82b3267dcc
revert the paree-version tweak
2011-08-19 14:13:25 -05:00
9d73866c43
attach VERSION.txt as artifact an setup so parse-version is only called
...
at root level
2011-08-19 14:11:28 -05:00
b34ccc5915
Making VERSION.txt automatically update itself in the jetty-distribution tarball
2011-08-19 10:52:48 -07:00
e5a3cb9cef
[maven-release-plugin] prepare for next development iteration
2011-08-19 22:17:46 +10:00
f0b4ffffda
[maven-release-plugin] prepare release jetty-7.5.0.RC1
2011-08-19 22:17:33 +10:00
0a88090586
Revert "Moving jetty-version-maven-plugin to profile due to NPE on some people's machines"
...
This reverts commit 683d78aa18
2011-08-18 14:35:12 -07:00
683d78aa18
Moving jetty-version-maven-plugin to profile due to NPE on some people's machines
2011-08-18 14:23:56 -07:00
87b76672eb
Updating to released jetty-version-maven-plugin
2011-08-18 13:41:56 -07:00
52243514d6
Adding jetty-version-maven-plugin to build (on branch)
2011-08-16 15:31:37 -07:00
fa7364ac1b
276670 SLF4J loggers show correct location information
2011-08-16 16:25:51 -04:00
4700979200
[maven-release-plugin] prepare for next development iteration
2011-08-16 09:26:56 -05:00
3ae78dfbb2
[maven-release-plugin] prepare release jetty-8.0.0.RC0
2011-08-16 09:26:48 -05:00
4d7ba354e1
[maven-release-plugin] prepare for next development iteration
2011-08-15 14:18:53 -05:00
2175bae0a0
[maven-release-plugin] prepare release jetty-7.5.0.RC0
2011-08-15 14:18:42 -05:00
050cb83b35
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
7aade2d726
resolve test issues with jetty-websocket stemming from the
...
boundschecking being enabled in the surefire plugin. tests would pass
in eclipse because the bounds checking was turned off and the usage of
the ByteArrayBuffer in WebSocketClient to wrap a string would create an
immutable buffer...and when flush() is called if this property is true
an exception is thrown breaking the unit tests. so I am commenting out
the property that triggers this for greg to sort out the correct usage
with regards to that test.
2011-08-02 16:48:03 -05:00
02a66a00fb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
pom.xml
2011-08-01 14:39:39 +10:00
2ead7a83fe
[Bug 351516] support nosql sessions
2011-07-26 15:00:49 -05:00
93cc111a02
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
0cc914c4bb
352684 Implemented spinning thread analyzer
2011-07-20 19:30:44 -04:00
70d7d3c9a5
reverted version
2011-07-18 09:15:31 +10:00
a26ddd5933
created performance version
2011-07-14 15:38:25 +10:00
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
39674f8a8e
[maven-release-plugin] prepare for next development iteration
2011-07-07 18:43:56 -05:00
5aa94f502e
[maven-release-plugin] prepare release jetty-7.4.4.v20110707
2011-07-07 18:43:50 -05:00
17e907c2fb
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10:00
6ed9d4c394
update scm.url
...
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2011-07-06 13:33:16 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jesse McConnell
Joakim Erdfelt
Jan Bartel
Michael Gorovoy
Greg Wilkins
Greg Wilkins
Joakim Erdfelt
Hugues Malphettes