795 Commits

Author SHA1 Message Date
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
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
Joakim Erdfelt
3e500a6f48 Adding alpn.version to other compatible java 7 updates 2014-03-25 11:25:16 -07:00
Joakim Erdfelt
fab377335f 419801 - Upgrade to asm5 for jdk8
+ Upgrading to version 5.0.1
2014-03-25 08:59:23 -07:00
Simone Bordet
3692ac17d4 Merged branch 'master' into 'jetty-9-alpn'. 2014-03-20 16:34:44 +01:00
Simone Bordet
b994db698c Refactored NPN code for the soon-to-arrive ALPN code.
Moved NPN tests to new module spdy-npn-tests, that now is the only module
requiring the -Xbootclasspath configuration for the Maven Surefire Plugin.
2014-03-20 16:22:43 +01:00
Simone Bordet
48bd41ab83 Updated ALPN API version to 1.0.0. 2014-03-19 12:57:50 +11:00
Simone Bordet
dba8555825 Initial support for JDK 8 builds.
Added ALPN version and moved jetty-osgi module to a profile, only
built when using JDK 7.
2014-03-19 12:57:50 +11:00
Simone Bordet
b3b669166f Implemented ALPNServerConnection and refactored common code with NPN. 2014-03-19 12:57:50 +11:00
Greg Wilkins
a85b855921 Revert ALPN and java 8 changes to move to another branch
Reverts e9ecd8c,2f22a10,addc49f,f4e4b09,cf1c245
Disabled unit test from commit 47e7583
2014-03-19 12:54:04 +11:00
Simone Bordet
e9ecd8c966 Updated ALPN API version to 1.0.0. 2014-03-19 00:12:37 +01:00
Simone Bordet
addc49f391 Initial support for JDK 8 builds.
Added ALPN version and moved jetty-osgi module to a profile, only
built when using JDK 7.
2014-03-18 23:59:18 +01:00
Simone Bordet
cf1c2451d6 Implemented ALPNServerConnection and refactored common code with NPN. 2014-03-18 23:59:18 +01:00
Greg Wilkins
119718d86f added jetty-quickstart module 2014-03-19 09:56:19 +11:00
Simone Bordet
24b9270499 Removed dependency from junit-dep, now only using junit. 2014-03-14 11:02:14 +01:00
Greg Wilkins
acbe13a210 430341 - add apache jsp and jstl optional modules 2014-03-14 16:54:03 +11:00
Greg Wilkins
d76c786803 430273 Cancel async timeout breaks volatile link to avoid race with slow expire 2014-03-14 10:27:32 +11:00
Simone Bordet
ad1a231dad Integrated FastCGI module into main Jetty repository. 2014-03-13 16:21:34 +01: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
Simone Bordet
e2805b5b1b Using jetty-test-helper version 2.7. 2014-02-06 16:47:57 +01:00
Jesse McConnell
d2ab0ed506 Bug 426250 jetty-all should be deployed on release 2014-01-22 16:57:36 -06:00
Jan Bartel
1e2e3fc7f2 425837 Upgrade to jstl 1.2.2 2014-01-17 14:36:08 +11:00
Simone Bordet
e4cac732cf Updated build profiles to JDK 7u51, along with NPN modules. 2014-01-14 22:51:18 +01: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
333ac73d5e Cleaning up some New Years leftovers 2014-01-03 08:18:24 -07:00
Joakim Erdfelt
a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Joakim Erdfelt
5941e9db83 Fixing various warnings / imports 2013-12-12 14:46:40 -07:00
Joakim Erdfelt
5bb1631c68 Removing conflicting javax.websocket:javax.websocket-client-api artifact 2013-12-11 17:00:28 -07:00
Joakim Erdfelt
8bbaf64250 Updating to jetty-project:21-SNAPSHOT 2013-12-11 17:00:28 -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