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 |
Jesse McConnell
|
1d86da8f68
|
[maven-release-plugin] prepare for next development iteration
|
2011-10-24 14:52:54 -05:00 |
|
Jesse McConnell
|
5f349ecc92
|
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
|
2011-10-24 14:52:48 -05:00 |
|
Jesse McConnell
|
261bb4a71f
|
update jetty version maven plugin version
|
2011-10-24 13:55:02 -05:00 |
|
Greg Wilkins
|
5140a95144
|
refactored HttpConnection name
|
2011-10-20 15:12:19 +11:00 |
|
Jesse McConnell
|
7d10182034
|
[maven-release-plugin] prepare for next development iteration
|
2011-10-11 08:47:07 -05:00 |
|
Jesse McConnell
|
b6ac542604
|
[maven-release-plugin] prepare release jetty-7.5.3.v20111011
|
2011-10-11 08:47:00 -05:00 |
|
Jesse McConnell
|
3ff03b0731
|
[Bug 348978] migrate jetty-http-spi
|
2011-10-07 11:37:33 -05:00 |
|
Jesse McConnell
|
0c55c774d4
|
[maven-release-plugin] prepare for next development iteration
|
2011-10-06 17:25:38 -05:00 |
|
Jesse McConnell
|
4d822759de
|
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
|
2011-10-06 17:25:32 -05:00 |
|
Jesse McConnell
|
b58006b4a4
|
[maven-release-plugin] prepare for next development iteration
|
2011-10-06 09:43:37 -05:00 |
|
Jesse McConnell
|
7eca345e8d
|
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
|
2011-10-06 09:43:31 -05:00 |
|
Jesse McConnell
|
decb4c7e8c
|
update update-version profile
|
2011-10-06 09:20:57 -05:00 |
|
Jesse McConnell
|
8a077ff38e
|
add versions to reporting plugins, they don't seem to inherit from plugin management
|
2011-10-06 08:24:58 -05:00 |
|
Jesse McConnell
|
b179883dfe
|
blank commit testing serverside repack for webmaster
|
2011-09-30 15:41:03 -05:00 |
|
Jesse McConnell
|
8c1307e1c3
|
blank change
|
2011-09-30 09:56:13 -05:00 |
Thomas Becker
|
37845a1a4f
|
357687: Add ShutdownHandler + UnitTest
|
2011-09-30 07:58:39 -05:00 |
|
Jesse McConnell
|
90af3cc359
|
update jetty-version-maven-plugin version
|
2011-09-26 20:57:58 -05:00 |
|
Jesse McConnell
|
bc86f5d154
|
update parent version
|
2011-09-20 14:08:30 -05:00 |
|
Jesse McConnell
|
3091739b70
|
remove plugin versions we get from parent and remove groupId
|
2011-09-20 11:47:17 -05:00 |
|
Jesse McConnell
|
2e7d84dec8
|
Update to new parent pom that lets us import into indigo and m2eclipse
|
2011-09-09 15:42:01 -05:00 |
|
Jesse McConnell
|
675464e82d
|
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
|
2011-09-08 12:46:56 -05:00 |
Joakim Erdfelt
|
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 |
|
Jesse McConnell
|
ebdb89dc23
|
[maven-release-plugin] prepare for next development iteration
|
2011-09-08 12:00:16 -05:00 |
|
Jesse McConnell
|
932245a114
|
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
|
2011-09-08 12:00:10 -05:00 |
|
Jesse McConnell
|
37d0f53b0a
|
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
|
2011-09-08 11:40:37 -05:00 |
|
Jesse McConnell
|
6b614a54f0
|
[maven-release-plugin] prepare for next development iteration
|
2011-09-07 18:12:16 -05:00 |
|
Jesse McConnell
|
ce55c8c601
|
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
|
2011-09-07 18:12:09 -05:00 |
|
Jesse McConnell
|
1744b5bce1
|
reset from release
|
2011-09-07 11:09:46 -05:00 |
|
Jesse McConnell
|
ae86ad6d4e
|
[maven-release-plugin] prepare for next development iteration
|
2011-09-07 10:03:16 -05:00 |
|
Jesse McConnell
|
86383afbd2
|
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
|
2011-09-07 10:03:10 -05:00 |
|
Jesse McConnell
|
a728021edf
|
[maven-release-plugin] prepare for next development iteration
|
2011-09-01 11:17:05 -05:00 |
|
Jesse McConnell
|
882308f781
|
[maven-release-plugin] prepare release jetty-7.5.0.c20110901
|
2011-09-01 11:16:58 -05:00 |
|
Jesse McConnell
|
57e9045635
|
[maven-release-plugin] prepare for next development iteration
|
2011-08-31 14:17:32 -05:00 |
|
Jesse McConnell
|
317491a4d7
|
[maven-release-plugin] prepare release jetty-7.5.0.v20110901
|
2011-08-31 14:17:25 -05:00 |
Michael Gorovoy
|
d6da533ca5
|
Moved jetty-distribution to main modules list
|
2011-08-30 19:35:24 -04:00 |
|
Joakim Erdfelt
|
7663a83616
|
[maven-release-plugin] rollback the release of jetty-7.5.0.RC2
|
2011-08-30 12:52:45 -07:00 |
|
Joakim Erdfelt
|
4c5c954d23
|
[maven-release-plugin] prepare release jetty-7.5.0.RC2
|
2011-08-30 12:47:42 -07:00 |
|
Joakim Erdfelt
|
9adbd0b5eb
|
Bumping up version of jetty-version-maven-plugin to use new :attach-version-text goal
|
2011-08-30 12:20:01 -07:00 |
|
Joakim Erdfelt
|
79fb254151
|
Using released build-support release
|
2011-08-28 09:52:10 -07:00 |
|
Joakim Erdfelt
|
51c5911e15
|
Making PMD AvoieAnonymousLogging rule be enforced for this branch
|
2011-08-24 09:52:07 -07:00 |
|
Joakim Erdfelt
|
5ef33386b7
|
Using released jetty-version-maven-plugin
|
2011-08-22 15:17:31 -07:00 |
|
Joakim Erdfelt
|
74b4d6bc2c
|
Merging changes
|
2011-08-19 12:15:37 -07:00 |
|
Joakim Erdfelt
|
4698cc05c5
|
Making :update-version profile instead
|
2011-08-19 12:13:54 -07:00 |
|
Jesse McConnell
|
82b3267dcc
|
revert the paree-version tweak
|
2011-08-19 14:13:25 -05:00 |
|
Jesse McConnell
|
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 |
|
Joakim Erdfelt
|
b34ccc5915
|
Making VERSION.txt automatically update itself in the jetty-distribution tarball
|
2011-08-19 10:52:48 -07:00 |
|
Greg Wilkins
|
e5a3cb9cef
|
[maven-release-plugin] prepare for next development iteration
|
2011-08-19 22:17:46 +10:00 |
|
Greg Wilkins
|
f0b4ffffda
|
[maven-release-plugin] prepare release jetty-7.5.0.RC1
|
2011-08-19 22:17:33 +10:00 |
|
Joakim Erdfelt
|
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 |