Jesse McConnell
|
b99623a21d
|
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
|
2014-01-08 16:47:01 -06:00 |
Joakim Erdfelt
|
a12fd9ea03
|
Happy New Year - 2014!
|
2014-01-02 14:50:14 -07:00 |
|
Joakim Erdfelt
|
9172d6115b
|
[maven-release-plugin] prepare for next development iteration
|
2013-11-15 16:58:44 -07:00 |
|
Joakim Erdfelt
|
6feeab6ec3
|
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
|
2013-11-15 16:58:36 -07:00 |
|
Joakim Erdfelt
|
7bbc0ff4df
|
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
|
2013-11-15 16:33:52 -07:00 |
|
Joakim Erdfelt
|
1126e68971
|
[maven-release-plugin] prepare for next development iteration
|
2013-11-15 16:03:28 -07:00 |
|
Joakim Erdfelt
|
d6418c73d4
|
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
|
2013-11-15 16:03:20 -07:00 |
|
Joakim Erdfelt
|
6c372b9440
|
Reverting <version> to 9.1.0-SNAPSHOT
|
2013-11-15 15:36:26 -07:00 |
|
Jesse McConnell
|
b5345caed1
|
[maven-release-plugin] prepare for next development iteration
|
2013-11-14 15:27:52 -06:00 |
|
Jesse McConnell
|
1582aa196d
|
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
|
2013-11-14 15:27:37 -06:00 |
|
Jesse McConnell
|
63f20d4518
|
[maven-release-plugin] prepare for next development iteration
|
2013-11-07 10:42:54 -06:00 |
|
Jesse McConnell
|
dc2fd1b9ce
|
[maven-release-plugin] prepare release jetty-9.1.0.RC2
|
2013-11-07 10:42:41 -06:00 |
|
Jesse McConnell
|
d31ef2e396
|
[maven-release-plugin] prepare for next development iteration
|
2013-10-31 16:36:27 -05:00 |
|
Jesse McConnell
|
c85e7d365c
|
[maven-release-plugin] prepare release jetty-9.1.0.RC1
|
2013-10-31 16:36:16 -05:00 |
|
Jesse McConnell
|
1af0ec2e75
|
[maven-release-plugin] prepare for next development iteration
|
2013-10-24 16:38:04 -05:00 |
|
Jesse McConnell
|
35b67aa459
|
[maven-release-plugin] prepare release jetty-9.1.0.RC1
|
2013-10-24 16:37:53 -05:00 |
|
Jesse McConnell
|
6a3bed9dd0
|
[maven-release-plugin] prepare for next development iteration
|
2013-09-30 21:18:26 -05:00 |
|
Jesse McConnell
|
31585683cf
|
[maven-release-plugin] prepare release jetty-9.1.0.RC0
|
2013-09-30 21:18:14 -05:00 |
|
Joakim Erdfelt
|
5c72f6975a
|
[maven-release-plugin] prepare for next development iteration
|
2013-09-16 11:06:25 -07:00 |
|
Joakim Erdfelt
|
9d26e0b32a
|
[maven-release-plugin] prepare release jetty-9.1.0.M0
|
2013-09-16 11:06:18 -07:00 |
|
Joakim Erdfelt
|
e53029ac8e
|
[maven-release-plugin] rollback the release of jetty-9.1.0.M0
|
2013-09-16 10:41:04 -07:00 |
|
Joakim Erdfelt
|
07abfa0c5d
|
[maven-release-plugin] prepare release jetty-9.1.0.M0
|
2013-09-16 10:25:54 -07:00 |
|
Joakim Erdfelt
|
b353686608
|
Reverting back to SNAPSHOTS
|
2013-09-16 10:00:18 -07:00 |
Greg Wilkins
|
9677f6e863
|
[maven-release-plugin] prepare release jetty-9.1.0.M0
|
2013-09-17 01:03:16 +10:00 |
Jan Bartel
|
a98bbc31e0
|
Make jsp 2.3.2 work for jetty-9.1, bring osgi tests back into the build.
|
2013-09-02 17:14:17 +10:00 |
|
Jan Bartel
|
bd2add0ae9
|
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
|
2013-07-12 13:53:58 +10:00 |
|
Jan Bartel
|
4f6732a7e9
|
Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization.
|
2013-06-21 18:41:35 +10:00 |
|
Greg Wilkins
|
4e4ffaa54c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2013-06-17 16:29:39 +10:00 |
|
Jesse McConnell
|
eddb49941d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-06-12 15:52:36 -05:00 |
|
Greg Wilkins
|
942f8a5c40
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2013-05-28 22:51:31 +10:00 |
|
Jan Bartel
|
5df7ab401d
|
Fix errors from small osgi refactor; comment out some test code
|
2013-05-28 15:10:12 +10:00 |
|
Jan Bartel
|
5c97019be1
|
408923 Need to be able to configure the ThreadPool for the default jetty server in osgi
|
2013-05-24 16:26:13 +10: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 |
|
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
|
07b844bf85
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-11 15:55:04 +10:00 |
|
Jan Bartel
|
6783975707
|
Prune unused code; add more comments; rename classes.
|
2013-04-11 15:14:08 +10:00 |
|
Jan Bartel
|
76df005c64
|
405119 Tidy up comments and code formatting for osgi
|
2013-04-11 10:23:20 +10: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
|
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 |
|
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 |
|
Jesse McConnell
|
a6c48312f6
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-22 07:53:11 -06:00 |
|
Jesse McConnell
|
484162de79
|
[maven-release-plugin] prepare release jetty-9.0.0.RC1
|
2013-02-22 07:52:48 -06:00 |
|
Jesse McConnell
|
48e9e9c36c
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-21 17:44:16 -06:00 |
|
Jesse McConnell
|
ca072f9c82
|
[maven-release-plugin] prepare release jetty-9.0.0.RC1
|
2013-02-21 17:43:59 -06:00 |
|
Jesse McConnell
|
85a9371c2e
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-21 14:37:06 -06:00 |
|
Jesse McConnell
|
2b5abf7ed2
|
[maven-release-plugin] prepare release jetty-9.0.0.RC1
|
2013-02-21 14:36:57 -06:00 |
|
Jesse McConnell
|
95eefd5381
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-21 11:10:53 -06:00 |
|
Jesse McConnell
|
399828d833
|
[maven-release-plugin] prepare release jetty-9.0.0.RC1
|
2013-02-21 11:10:35 -06:00 |
|
Jan Bartel
|
cec5f5e65a
|
Fixing build
|
2013-02-21 20:13:45 +11:00 |
|
Jan Bartel
|
9af4334739
|
committing to save changes but does not yet compile
|
2013-02-20 09:26:30 +11: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
|
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 |
|
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 |
|
Jan Bartel
|
958d0c6949
|
Start incorporating (EDR version) servlet 3.1 spec
|
2012-10-27 17:38:43 +11:00 |
|
Greg Wilkins
|
fac580c374
|
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
VERSION.txt
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
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-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
jetty-annotations/pom.xml
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java
jetty-client/pom.xml
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/Generator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
jetty-jsp/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-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/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-runner/pom.xml
jetty-security/pom.xml
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-server/src/test/resources/jetty-logging.properties
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
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-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/pom.xml
jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/pom.xml
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
jetty-websocket/pom.xml
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
test-jetty-webapp/src/main/webapp/WEB-INF/web.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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2012-10-12 21:19:21 +11: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 |
|
Jesse McConnell
|
a8994178f5
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-10 14:18:11 -05:00 |
|
Jesse McConnell
|
92180a9700
|
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
|
2012-09-10 14:18:01 -05:00 |
|
Jesse McConnell
|
10e4027579
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-10 13:59:34 -05:00 |
|
Jesse McConnell
|
57a6258f96
|
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
|
2012-09-10 13:59:10 -05:00 |
|
Jesse McConnell
|
1ec8b2621b
|
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
|
2012-09-10 13:47:05 -05:00 |
|
Jesse McConnell
|
4180d7e1f5
|
prepare for release
|
2012-09-10 12:59:04 -05:00 |
|
Jesse McConnell
|
d37deeea74
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-03 13:33:18 -05:00 |
|
Jesse McConnell
|
b418b0dd57
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-03 13:33:16 -05:00 |
|
Jesse McConnell
|
41e9b1f6e2
|
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
|
2012-09-03 13:33:10 -05:00 |
|
Jesse McConnell
|
6c0b0af2fe
|
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
|
2012-09-03 13:33:08 -05:00 |
|
Jan Bartel
|
c7b9081a52
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-08-30 16:16:44 +10:00 |
|
Jan Bartel
|
6ab68f0dda
|
387943 Catch CNFE when no jstl jars are installed
|
2012-08-27 18:12:44 +10:00 |
|
Joakim Erdfelt
|
3d1d76d214
|
Merge from jetty-8 to jetty-9 (license header standarization)
|
2012-08-17 13:44:22 -07:00 |
|
Jesse McConnell
|
5de0cee1eb
|
merge from master + license block standardization
|
2012-08-17 14:50:43 -05:00 |
|
Jesse McConnell
|
00ed549898
|
standardize license header blocks
|
2012-08-16 19:11:27 -05:00 |
|
Jan Bartel
|
8e0dc72b23
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/pom.xml
|
2012-07-23 13:24:57 +10:00 |
|
Greg Wilkins
|
b1750c0aae
|
jetty-9 fixed bad merge of poms
|
2012-07-20 15:20:57 +10:00 |