832 Commits

Author SHA1 Message Date
Jesse McConnell
58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05: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
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
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
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
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
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
Jan Bartel
89d189ad3a Update to org.mortbay.apache.jsp 8.0.9.M1 2014-08-13 15:30:40 +10:00
Jan Bartel
aedfb662b6 441649 - Update to jsp and el Apache Jasper 8.0.9 2014-08-13 11:01:05 +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
Simone Bordet
a7e87c5eed Updated NPN and ALPN to JDK 7u65 and 8u11. 2014-07-17 11:48:19 +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
424e421439 Added JDK 7u60 files and configuration for NPN and ALPN. 2014-06-11 18:45:45 +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
Joakim Erdfelt
cfe99742d9 Due to JettyAwareLogger, the Slf4j minimum requirement is version 1.6 2014-06-03 15:34:21 -07:00
Joakim Erdfelt
4c4d712d65 Surefire config for java.io.tmpdir is now ${project.build.directory} 2014-06-03 09:40:04 -07: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
Simone Bordet
7bc0363b30 Updated profiles for JDK 7u55 and JDK 8u05 with the right NPN and ALPN versions. 2014-04-17 13:56:10 +02:00
Simone Bordet
60f2200184 Merged branch 'jetty-9.1.x' into 'master'. 2014-04-16 11:10:18 +02:00
Simone Bordet
40c82a99ab Added profile in the main pom.xml to build with JDK 7u55.
Added new NPN module files for  JDK 7u55, referencing the new NPN version required by JDK 7u55.
2014-04-16 11:06:50 +02:00
Greg Wilkins
0e458c80f4 reverted version to SNAPSHOT 2014-04-10 16:37:25 +10:00
Jesse McConnell
c616ece6c7 [maven-release-plugin] prepare release jetty-9.1.4.v20140401 2014-04-02 10:55:21 -05:00
Joakim Erdfelt
077887141f Updating alpn and npn modules to protonego 2014-04-01 13:09:49 -07:00
Joakim Erdfelt
28d9df1dbb Refactoring alpn stuff into jetty-alpn-server and jetty-alpn-client 2014-03-31 14:18:37 -07:00
Greg Wilkins
a1d20956b1 deferred apache and quickstart until 9.2 2014-03-31 14:01:39 +11:00
Greg Wilkins
c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Joakim Erdfelt
1444ffadb8 Reverting <modules> in parent pom in favor of spdy and osgi specifics 2014-03-26 14:06:23 -07:00
Joakim Erdfelt
4f051fecf3 More work to make alpn & npn builds sane 2014-03-25 15:47:15 -07:00