Greg Wilkins
|
5011993ddf
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/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-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/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-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/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-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/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-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2014-09-10 14:38:18 +10:00 |
Jesse McConnell
|
88b19abf52
|
[maven-release-plugin] prepare for next development iteration
|
2014-09-05 09:19:30 -05:00 |
|
Jesse McConnell
|
9bfeb2221f
|
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
|
2014-09-05 09:19:23 -05:00 |
Jan Bartel
|
7c882d76c5
|
Make annotations and JNDI wortk with OSGi
|
2014-09-05 18:35:15 +10:00 |
|
Jan Bartel
|
7199c6ceca
|
Switch to apache-jsp for jetty-osgi
|
2014-09-05 18:35:15 +10:00 |
|
Greg Wilkins
|
b47f9ef605
|
cleaned up OSGi manifest creation
|
2014-08-15 19:35:49 +10:00 |
Joakim Erdfelt
|
cb42ef2167
|
[maven-release-plugin] prepare for next development iteration
|
2014-07-23 11:18:01 -07:00 |
|
Joakim Erdfelt
|
dc62cb5ac7
|
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
|
2014-07-23 11:17:55 -07:00 |
Simone Bordet
|
334db9fe72
|
Updated version to 9.3.0-SNAPSHOT.
|
2014-06-16 21:33:03 +02:00 |
|
Jesse McConnell
|
c3ee0711ca
|
[maven-release-plugin] prepare for next development iteration
|
2014-06-09 13:37:54 -05:00 |
|
Jesse McConnell
|
06b494eeac
|
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
|
2014-06-09 13:37:49 -05:00 |
|
Greg Wilkins
|
8f4aeeeb8d
|
updated version to 10.0.0-SNAPSHOT
|
2014-06-04 15:08:54 +02:00 |
|
Jesse McConnell
|
2e859e4ae2
|
[maven-release-plugin] prepare for next development iteration
|
2014-05-26 12:04:15 -05:00 |
|
Jesse McConnell
|
71ad2114c5
|
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
|
2014-05-26 12:04:08 -05:00 |
|
Jesse McConnell
|
d59dbe936b
|
[maven-release-plugin] prepare for next development iteration
|
2014-05-23 09:59:19 -05:00 |
|
Jesse McConnell
|
edc7646a4c
|
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
|
2014-05-23 09:59:13 -05:00 |
|
Jesse McConnell
|
6a3cab2a2f
|
[maven-release-plugin] prepare for next development iteration
|
2014-05-15 14:44:37 -05:00 |
|
Jesse McConnell
|
eec01cbff4
|
[maven-release-plugin] prepare release jetty-9.2.0.RC0
|
2014-05-15 14:44:28 -05:00 |
|
Jesse McConnell
|
4d2fdee7fc
|
[maven-release-plugin] prepare for next development iteration
|
2014-05-08 11:44:34 -05:00 |
|
Jesse McConnell
|
4515fe661b
|
[maven-release-plugin] prepare release jetty-9.2.0.M1
|
2014-05-08 11:44:27 -05:00 |
|
Jesse McConnell
|
e1d07f908c
|
[maven-release-plugin] prepare for next development iteration
|
2014-04-09 12:26:35 -05:00 |
|
Jesse McConnell
|
fdae77842c
|
[maven-release-plugin] prepare release jetty-9.2.0.M0
|
2014-04-09 12:26:29 -05:00 |
|
Jesse McConnell
|
f32e8bd3c0
|
[maven-release-plugin] prepare for next development iteration
|
2014-04-09 10:44:51 -05:00 |
|
Jesse McConnell
|
47906076f6
|
[maven-release-plugin] prepare release jetty-9.2.0.M0
|
2014-04-09 10:44:41 -05:00 |
|
Jesse McConnell
|
dbb938ac71
|
[maven-release-plugin] prepare for next development iteration
|
2014-04-02 10:55:29 -05:00 |
|
Jesse McConnell
|
c616ece6c7
|
[maven-release-plugin] prepare release jetty-9.1.4.v20140401
|
2014-04-02 10:55:21 -05:00 |
|
Greg Wilkins
|
c5e1e249e7
|
set version for 9.2.x
|
2014-03-31 11:35:06 +11:00 |
|
Jan Bartel
|
1ffd308bbe
|
Remove duplicate mock classes; updated version of annotation and transaction dependencies
|
2014-03-18 16:13:40 +11:00 |
|
Jesse McConnell
|
0ec0d452e9
|
[maven-release-plugin] prepare for next development iteration
|
2014-03-07 09:10:08 -06:00 |
|
Jesse McConnell
|
1e555567a9
|
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
|
2014-03-07 09:10:08 -06:00 |
|
Jesse McConnell
|
eb0aea46ce
|
set versions.txt file to new version and fix mistaken developmentVersion
|
2014-02-10 13:48:29 -06:00 |
|
Jesse McConnell
|
f3d38dfb15
|
[maven-release-plugin] prepare for next development iteration
|
2014-02-10 11:17:14 -06:00 |
|
Jesse McConnell
|
8f6cbc9111
|
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
|
2014-02-10 11:17:07 -06:00 |
|
Jesse McConnell
|
b82ec6e668
|
[maven-release-plugin] prepare for next development iteration
|
2014-01-08 16:47:09 -06:00 |
|
Jesse McConnell
|
b99623a21d
|
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
|
2014-01-08 16:47:01 -06: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 |