Joakim Erdfelt
|
8a72a153a1
|
Merge branch 'jetty-9.2.x'
|
2014-10-28 12:32:55 -07:00 |
|
Joakim Erdfelt
|
607a560ebd
|
Merge branch 'jetty-9.2.x' into cdi-testing
|
2014-10-28 09:36:34 -07:00 |
Simone Bordet
|
7cdcd69f44
|
Reverted version to 9.2.4-SNAPSHOT.
|
2014-10-28 11:52:00 +01:00 |
Jesse McConnell
|
3b745f06df
|
[maven-release-plugin] prepare for next development iteration
|
2014-10-27 16:16:24 -05:00 |
|
Jesse McConnell
|
4f0d78c91b
|
[maven-release-plugin] prepare release jetty-9.2.4.v20141027
|
2014-10-27 16:16:18 -05:00 |
|
Joakim Erdfelt
|
6ff43a0af1
|
Merge branch 'jetty-9.2.x' into cdi-testing
|
2014-10-27 13:42:30 -07:00 |
|
Simone Bordet
|
6268421dd0
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2014-10-16 18:05:12 +02:00 |
|
Simone Bordet
|
0a46378e6e
|
Updated NPN and ALPN files and configuration for JDK 7u71, 7u72 and 8u25.
|
2014-10-16 17:15:15 +02:00 |
|
Simone Bordet
|
6f42d21ed5
|
446063 - ALPN Fail SSL Handshake if no supported Application Protocols.
|
2014-10-16 15:31:24 +02:00 |
|
Simone Bordet
|
890d7a8d1f
|
Merged branch 'jetty-9.2.x' into 'master'.
|
2014-10-13 22:01:20 +02:00 |
|
Simone Bordet
|
9796457dfc
|
446672 - NPN Specification issue in the case no protocols are selected.
|
2014-10-13 21:27:11 +02:00 |
|
Joakim Erdfelt
|
f4a0754a76
|
Another attempt at the cdi / weld integration
|
2014-10-09 16:33:12 -07:00 |
|
Joakim Erdfelt
|
9249ebb6ef
|
Using 9.2.4-SNAPSHOT for branch
|
2014-09-11 06:10:44 -07:00 |
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
|
d9f285f5f5
|
Update versions of apache-jsp and servlet-api for osgi
|
2014-09-05 20:19:45 +10:00 |
|
Jan Bartel
|
7199c6ceca
|
Switch to apache-jsp for jetty-osgi
|
2014-09-05 18:35:15 +10:00 |
|
Greg Wilkins
|
adb56b3d90
|
Merge remote-tracking branch 'origin/master' into jetty-http2
|
2014-08-27 12:53:54 +10:00 |
|
Jan Bartel
|
b49fefd626
|
Update to 8.0.9.M2 version of org.mortbay.apache.jasper.
|
2014-08-27 11:17:43 +10:00 |
|
Simone Bordet
|
a1ea9af3f9
|
Merged branch 'master' into 'jetty-http2'.
|
2014-08-21 12:20:08 +02:00 |
|
Simone Bordet
|
6e58e3b00e
|
Properly updated NPN and ALPN files and configuration for JDK 7u65
and 8u20.
|
2014-08-21 12:19:23 +02:00 |
|
Greg Wilkins
|
bd8bcd62e9
|
updated npn alpn for java 1.7.0_76
|
2014-08-21 10:44:48 +10:00 |
|
Greg Wilkins
|
984c7fdd85
|
various updates
|
2014-08-20 17:54:01 +10:00 |
|
Greg Wilkins
|
1c71040eca
|
moved config plugin to profile
|
2014-08-15 19:53:52 +10:00 |
|
Greg Wilkins
|
b47f9ef605
|
cleaned up OSGi manifest creation
|
2014-08-15 19:35:49 +10:00 |
|
Greg Wilkins
|
98b654ba20
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-distribution/pom.xml
|
2014-08-14 08:38:25 +10:00 |
|
Jan Bartel
|
89d189ad3a
|
Update to org.mortbay.apache.jsp 8.0.9.M1
|
2014-08-13 15:30:40 +10:00 |
|
Greg Wilkins
|
b983fab972
|
Merge remote-tracking branch 'origin/master' into jetty-http2
|
2014-08-13 13:44:06 +10:00 |
|
Jan Bartel
|
aedfb662b6
|
441649 - Update to jsp and el Apache Jasper 8.0.9
|
2014-08-13 11:01:05 +10:00 |
|
Greg Wilkins
|
66980f2449
|
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
examples/quickstart/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-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-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-dispatch-webapp/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-07-25 17:37:53 +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 |
|
Joakim Erdfelt
|
f63ec00028
|
Bumping up release plugin version
|
2014-07-23 09:33:10 -07:00 |
|
Greg Wilkins
|
a537fefd6b
|
Merge remote-tracking branch 'origin/master' into jetty-http2
|
2014-07-18 15:28:54 +10:00 |
|
Simone Bordet
|
a7e87c5eed
|
Updated NPN and ALPN to JDK 7u65 and 8u11.
|
2014-07-17 11:48:19 +02:00 |
|
Simone Bordet
|
2608af8f0d
|
Merged branch 'origin/master' into 'jetty-http2'.
|
2014-06-26 11:54:50 +02:00 |
|
Joakim Erdfelt
|
728127dbb8
|
Marking surefie runMode to hopefully trigger more order dependent test failures
|
2014-06-25 15:29:18 -07:00 |
|
Simone Bordet
|
334db9fe72
|
Updated version to 9.3.0-SNAPSHOT.
|
2014-06-16 21:33:03 +02:00 |
|
Simone Bordet
|
adaeeefe32
|
Merged branch 'master' into 'jetty-http2'.
|
2014-06-16 16:08:40 +02:00 |
|
Simone Bordet
|
7613385578
|
Moved NPN[Client|Server]Connection[Factory] classes to their own
modules, akin for the ALPN classes, and refactored all code that was
referencing them.
|
2014-06-16 12:46:26 +02:00 |
|
Simone Bordet
|
424e421439
|
Added JDK 7u60 files and configuration for NPN and ALPN.
|
2014-06-11 18:45:45 +02:00 |
|
Simone Bordet
|
330d8f9ea9
|
Added JDK 7u60 files for NPN and ALPN.
|
2014-06-11 18:44:54 +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 |
|
Jesse McConnell
|
10b6c574ae
|
Merge branch 'master' into release-9
|
2014-06-09 13:07:22 -05:00 |
|
Simone Bordet
|
c1247ff677
|
Reorganized HTTP2 modules.
|
2014-06-09 14:01:16 +02:00 |
|
Greg Wilkins
|
bb4d42f139
|
Merge remote-tracking branch 'origin' into jetty-http2
|
2014-06-04 15:09:19 +02:00 |
|
Greg Wilkins
|
8f4aeeeb8d
|
updated version to 10.0.0-SNAPSHOT
|
2014-06-04 15:08:54 +02:00 |
|
Joakim Erdfelt
|
cfe99742d9
|
Due to JettyAwareLogger, the Slf4j minimum requirement is version 1.6
|
2014-06-03 15:34:21 -07:00 |