Simone Bordet
20f57fcd14
Fixed version for the maven-eclipse-plugin.
2017-01-23 21:45:43 +01:00
Jesse McConnell
a2aa2679e3
Merge branch 'jetty-9.4.x'
2017-01-23 09:46:46 -06:00
Jesse McConnell
f2be9f2255
add scp to site plugin so we can deploy docs after release
2017-01-23 09:46:29 -06:00
Jesse McConnell
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
Jesse McConnell
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
Jesse McConnell
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
Jesse McConnell
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
Jesse McConnell
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
Jesse McConnell
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
Simone Bordet
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd
, reversing
changes made to 4565c186d7
.
2017-01-19 18:26:43 +01:00
Simone Bordet
dc1658fad3
Revert "resolve merge and update license headers"
...
This reverts commit 3c53b3a32f
.
2017-01-19 18:26:10 +01:00
Jesse McConnell
3c53b3a32f
resolve merge and update license headers
2017-01-19 09:38:22 -06:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Jan Bartel
a2cde42a68
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-19 14:55:54 +11:00
Jan Bartel
7fd8036f93
Issue #1271
...
Update to org.mortbay.jasper 8.5.9.1
2017-01-19 14:52:51 +11:00
Simone Bordet
0d8d754772
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 18:55:08 +01:00
Simone Bordet
a7938910b7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 18:54:47 +01:00
Simone Bordet
53281d3202
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-18 18:52:20 +01:00
Simone Bordet
79202d1cc6
Updated ALPN version for JDK 8u121.
2017-01-18 18:30:30 +01:00
Simone Bordet
a49841f308
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 17:28:36 +01:00
Simone Bordet
6222ccba14
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 17:28:18 +01:00
Simone Bordet
f97396b131
Fixes #1275 - Get rid of Mockito.
...
Converted the 2 tests that were using Mockito and removed from the POMs.
2017-01-18 17:09:57 +01:00
Jan Bartel
608a33bbad
Revert "Issue #1271"
...
This reverts commit 9a7920a0fb
.
2017-01-19 00:22:42 +11:00
Jan Bartel
c6fa0cdd69
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-18 17:28:21 +11:00
Jan Bartel
9a7920a0fb
Issue #1271
2017-01-18 15:38:30 +11:00
Simone Bordet
76ba287f6c
Fixed JUnit JavaDocs URL.
2017-01-16 19:09:26 +01:00
Simone Bordet
5607b2a57a
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-13 22:57:00 +01:00
Simone Bordet
08c52461ec
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-13 22:56:23 +01:00
Simone Bordet
d83bb06bd6
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Restored module jetty-documentation for all profiles.
2017-01-13 22:48:00 +01:00
Simone Bordet
2a416bbc6b
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Fixed the compact3 profile and other small fixes.
2017-01-12 19:59:11 +01:00
Simone Bordet
b7b3dfdc77
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-12 17:53:09 +01:00
Simone Bordet
e539d0b1fd
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-12 17:52:45 +01:00
Simone Bordet
11d669092a
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Joakim Erdfelt
243c24338f
Merge branch 'jetty-9.4.x'
2016-12-20 15:38:51 -07:00
Joakim Erdfelt
64f714689e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-20 15:38:36 -07:00
Joakim Erdfelt
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
Joakim Erdfelt
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
Joakim Erdfelt
4bfb312a8c
Updating jetty-version-maven-plugin
2016-12-20 12:28:48 -07:00
Simone Bordet
d3ce624d9a
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-17 18:38:52 +01:00
Simone Bordet
02ccbefb8a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-17 18:38:16 +01:00
Joakim Erdfelt
266cac25f8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-12-16 16:34:17 -07:00
Joakim Erdfelt
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
Joakim Erdfelt
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
Joakim Erdfelt
6d681ce999
Using jetty-version plugin 2.3
2016-12-16 15:38:11 -07:00
Jesse McConnell
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
Jesse McConnell
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
Joakim Erdfelt
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
Joakim Erdfelt
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
Joakim Erdfelt
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
Jan Bartel
90e4d162c8
Issue #907
2016-10-27 16:15:44 +11:00
Greg Wilkins
714d29db76
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-26 20:39:29 +11:00
Greg Wilkins
7f7021315d
fixed bad revert
2016-10-26 20:39:04 +11:00
Greg Wilkins
f4e6162b98
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-26 20:32:18 +11:00
Greg Wilkins
812272c658
Revert "Adding jdk9 profile"
...
This reverts commit 1151964d74
.
2016-10-26 20:31:42 +11:00
Simone Bordet
8421a9b200
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-10-26 11:13:03 +02:00
Simone Bordet
338e924a5d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-10-26 11:10:19 +02:00
Simone Bordet
4cc5178944
Updated ALPN version for JDK 8u111 and 8u112.
2016-10-26 11:03:43 +02:00
Greg Wilkins
53853df3bb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-26 11:20:50 +11:00
Joakim Erdfelt
1151964d74
Adding jdk9 profile
2016-10-25 15:15:46 -07:00
Joakim Erdfelt
458aebbd01
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-20 15:11:40 -07:00
Joakim Erdfelt
76992139f8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-10-20 15:11:25 -07:00
Joakim Erdfelt
3bfc914889
More attempts at jacoco exclusions
2016-10-20 14:14:50 -07:00
Joakim Erdfelt
2d650512bf
Skipping jacoco collection on build/test/support/integration modules
2016-10-20 12:48:32 -07:00
Joakim Erdfelt
b8127399d7
Tweaking jacoco includes/excludes in pom.xml
2016-10-20 11:28:26 -07:00
Joakim Erdfelt
6ded652dae
Tweaking jacoco includes/excludes
2016-10-20 09:31:00 -07:00
Joakim Erdfelt
fccffdb526
Merge branch 'release-9.3.13' into jetty-9.3.x
2016-10-20 09:25:57 -07:00
Joakim Erdfelt
36d75d4c4f
Merge branch 'jetty-9.4.x'
2016-10-19 10:59:28 -07:00
Joakim Erdfelt
0651b3fa20
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-19 10:59:09 -07:00
Joakim Erdfelt
52e81a5ef8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-10-19 10:56:49 -07:00
Joakim Erdfelt
91e5fb2ce5
Adding jacoco report generation and publishing
2016-10-19 08:51:45 -07:00
Joakim Erdfelt
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
Joakim Erdfelt
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
Joakim Erdfelt
6c3c24e7dd
Updating jetty-version-maven-plugin declaration
2016-10-14 10:34:18 -07:00
Joakim Erdfelt
82942cb3a4
Merge branch 'jetty-9.4.x' into issue-207
2016-10-12 11:36:28 -07:00
Jesse McConnell
3d69ce327e
Merge branch 'jetty-9.4.x'
2016-09-30 19:07:23 +00:00
Jesse McConnell
3a34e4d21b
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-09-30 19:06:51 +00:00
Jesse McConnell
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
Jesse McConnell
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
Jan Bartel
b44b9d2540
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-09-16 11:38:01 +10:00
Joakim Erdfelt
878f0e90a0
Updating jetty-version-maven-plugin version
2016-09-15 11:32:13 -07:00
Joakim Erdfelt
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
Joakim Erdfelt
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
Joakim Erdfelt
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
Joakim Erdfelt
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
Joakim Erdfelt
0df8a766b7
Revert "Moving jetty-documentation to release profile"
...
This reverts commit a9afa20ca3
.
2016-08-19 15:04:03 -07:00
Joakim Erdfelt
a9afa20ca3
Moving jetty-documentation to release profile
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
39f1d7332c
467246 - Support javax.websocket version 1.1
...
+ WIP
2016-08-19 15:03:32 -07:00
Jesse McConnell
9b6af31dce
merge from 9.4.x after M1 release
2016-08-16 08:18:27 -05:00
Jesse McConnell
984dd7ed3c
[maven-release-plugin] prepare for next development iteration
2016-08-15 23:04:15 +00:00
Jesse McConnell
e38e6b5a7f
[maven-release-plugin] prepare release jetty-9.4.0.M1
2016-08-15 23:04:10 +00:00
Jesse McConnell
eb2cadf7fe
Merge branch 'jetty-9.4.x'
2016-08-15 13:41:46 -05:00
Jesse McConnell
d5960d9900
scrape out remaining monitor references
2016-08-15 13:36:50 -05:00
Jan Bartel
176ee5774c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-08-12 11:32:08 +10:00
Jan Bartel
518c1f2575
Issue #837
...
Update to apache jsp 8.5.4
2016-08-12 11:00:56 +10:00
Jesse McConnell
a711fac443
Merge branch 'jetty-9.4.x'
2016-08-10 16:56:45 -05:00
Jesse McConnell
7301edefde
drop jetty-monitor from build
2016-08-10 16:56:24 -05:00
Jan Bartel
5232b933a4
Issue #746 Update osgi manifests to servlet 4.0
2016-08-04 14:20:43 +10:00
Joakim Erdfelt
225460fea3
Bumping up dependency-plugin version
2016-07-29 09:53:54 -07:00
Joakim Erdfelt
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
Joakim Erdfelt
7701c1e163
Merge branch 'jetty-9.4.x'
2016-07-26 13:30:44 -07:00
Joakim Erdfelt
b78f05f7bd
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-26 13:15:44 -07:00
Joakim Erdfelt
4b9b7b746e
Removing duplicate dependency-plugin reference
2016-07-26 13:11:26 -07:00
Joakim Erdfelt
514e0b6e72
Merge branch 'jetty-9.4.x'
2016-07-26 11:41:24 -07:00
Joakim Erdfelt
8b6f4fcb5e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-26 11:41:04 -07:00
Joakim Erdfelt
3b907b274c
Upgrading version of maven-dependency-plugin
2016-07-26 10:40:29 -07:00
Joakim Erdfelt
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
Joakim Erdfelt
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
Joakim Erdfelt
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
Simone Bordet
f068780749
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-20 13:19:15 +02:00
Simone Bordet
11d0569a75
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-20 13:18:26 +02:00
Simone Bordet
c09251fbaf
Updated ALPN version for JDK 8u101 and 8u102.
2016-07-20 13:17:31 +02:00
Simone Bordet
0d74c3ec2c
Updated ALPN version for JDK 8u101 and 8u102.
2016-07-20 13:05:43 +02:00
Greg Wilkins
53c07a5a83
Servlet 4.0 getMappings rough implementation #746
2016-07-20 13:58:19 +10:00
Greg Wilkins
2ee64a8d56
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-07 11:49:00 +10:00
Greg Wilkins
8675c17d92
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-07 11:46:38 +10:00
Joakim Erdfelt
8a12915dac
Fixing surefire random run definition
2016-07-06 11:26:54 -07:00
Jesse McConnell
2dd4843e44
merge from 9.4.x
2016-06-22 15:28:17 -05:00
Jesse McConnell
399c5beb04
merge from 9.3.x
2016-06-22 15:23:51 -05:00
Jesse McConnell
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
Jesse McConnell
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
Jesse McConnell
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
Jesse McConnell
34e92ec59e
update jetty version plugin
2016-06-21 08:18:05 -05:00
Joakim Erdfelt
abdbd177c1
Wrong version plugin (oops)
2016-06-20 09:12:05 -07:00
Joakim Erdfelt
7b1d807e49
Updating version plugin
2016-06-20 09:10:27 -07:00
Jan Bartel
2bb060ae32
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-15 18:21:08 +10:00
Jan Bartel
5093df33dc
Issue #505
...
Updated to asm 5.1.
2016-06-15 18:20:32 +10:00
Jesse McConnell
1bccf090b5
Merge branch 'jetty-9.4.x'
2016-06-13 11:51:09 -05:00
Jesse McConnell
64ed45389b
Issue 589 creation of jetty-home and leveraging it in jetty-distribution
2016-06-07 15:42:10 -05:00
Simone Bordet
473c8f0c09
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-07 10:24:15 +02:00
Simone Bordet
73fe6715de
Issue #306 - Merge jetty-parent into jetty-project.
...
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02:00
Simone Bordet
2d1d3fe6e9
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-06 21:39:31 +02:00
Simone Bordet
a8f25b550f
Fixes #487 - JDK 9 build compatibility.
...
Fixes #306 - Merge jetty-parent into jetty-project.
- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
Jan Bartel
7dc283cc0c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-05-27 16:45:04 +10:00
Jan Bartel
d6689ce803
Add memcached option for session data caching
2016-05-27 16:43:46 +10:00
Jesse McConnell
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
Jesse McConnell
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
Jesse McConnell
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
Joakim Erdfelt
9c5beaad4f
Merge branch 'jetty-9.4.x'
2016-05-03 11:36:42 -07:00
Joakim Erdfelt
86bf31aad7
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-03 11:36:25 -07:00
Jesse McConnell
8fd446040b
documentation build in default reactor
2016-05-03 07:29:17 -05:00
Jesse McConnell
6a07c7fd3a
Merge branch 'jetty-9.4.x'
2016-04-29 14:32:26 -05:00
Jesse McConnell
48ff4ad07c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-04-29 14:27:56 -05:00
Joakim Erdfelt
c09f31a51d
Bumping up master to version 10.0.0-SNAPSHOT
2016-04-29 11:47:15 -07:00
Jesse McConnell
bc5ab11417
wire documentation into build
2016-04-29 11:29:23 -05:00
Joakim Erdfelt
a1eab9d9a4
Fixing version
2016-04-26 16:16:32 -07:00
Joakim Erdfelt
8cc041bb04
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-04-25 12:00:45 -07:00
Joakim Erdfelt
66a70adb98
Merge branch 'release-9.2.16' into jetty-9.2.x
2016-04-25 11:34:07 -07:00
Simone Bordet
64a8d8819f
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-20 14:29:38 +02:00
Simone Bordet
89efdb3e09
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-04-20 14:29:11 +02:00
Simone Bordet
c90f60bd9c
Updated ALPN version for JDK 8u91 and 8u92.
2016-04-20 14:26:17 +02:00
Simone Bordet
b3fa4abaa0
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-14 23:45:48 +02:00
Joakim Erdfelt
2fa7d3fa37
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-04-14 14:36:02 -07:00
Joakim Erdfelt
939505c342
Updating to version 9.2.17-SNAPSHOT
2016-04-14 14:03:21 -07:00
Joakim Erdfelt
778fac638d
Updating to version 9.2.16.v20160414
2016-04-14 13:21:34 -07:00
Joakim Erdfelt
47bbd9364d
Revert "Updating to version 9.2.16.v20160414"
...
This reverts commit 29ae63855b
.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt
29ae63855b
Updating to version 9.2.16.v20160414
2016-04-14 13:17:21 -07:00
Joakim Erdfelt
b402524401
Bumping up jetty-version-maven-plugin rev
2016-04-14 12:11:07 -07:00
Joakim Erdfelt
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
Joakim Erdfelt
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
Jesse McConnell
d8a6bed74a
set proper scm info
2016-04-07 10:43:12 -05:00
Simone Bordet
5aef3ba3e4
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-04 15:41:04 +02:00
Simone Bordet
c1997b40a5
Updated ALPN to OpenJDK 8u77.
2016-04-04 15:38:53 +02:00
Simone Bordet
3e6bc4d17a
Updated ALPN version for JDK 8u77.
2016-04-04 10:58:09 +02:00
Jan Bartel
77a6514063
Issue #469 Update to Apache Jasper 8.0.33
2016-03-31 18:43:50 +11:00
Jan Bartel
60bccc178e
Issue #469 update to apache jasper 8.0.33
2016-03-31 18:41:03 +11:00
Jan Bartel
185ca3baa1
Issue #469 Update to Apache Jasper 8.0.33
2016-03-31 18:22:49 +11:00
Joakim Erdfelt
4ca7673c3f
api-change profile now works with master
...
+ Adding script to collect all clirr:clirr into single html report
2016-03-24 15:56:32 -07:00
Joakim Erdfelt
6853aa5080
Marking 9.3.8 as clirr comparison
2016-03-23 20:41:19 -07:00
Jan Bartel
8eb240c2be
Issue #371 update apache jsp to 8.0.27
2016-03-15 12:41:26 +11:00
Joakim Erdfelt
c68d3b1d8d
Updating to version 9.3.9-SNAPSHOT
2016-03-14 09:07:52 -07:00
Joakim Erdfelt
1f3b3f31f4
Updating to version 9.3.8.v20160314
2016-03-14 08:30:20 -07:00
Simone Bordet
02190278f1
Merged branch 'jetty-9.3.x' into 'master'.
2016-03-11 22:49:49 +01:00
Joakim Erdfelt
01aded0eaa
Bumping up version jetty-version-maven-plugin to 1.1
2016-03-11 08:41:37 -07:00
Joakim Erdfelt
da6be3ed7a
Fixing javadoc
2016-03-07 10:24:57 -07:00
Greg Wilkins
17d1beeec8
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-15 12:34:15 +01:00
Greg Wilkins
98607e2abf
487158 Switched SCM URIs to github
2016-02-15 12:26:42 +01:00
Joakim Erdfelt
f98dde5e5b
Updating to version 9.2.16-SNAPSHOT
2016-02-10 15:36:41 -07:00
Joakim Erdfelt
9b6890d3c1
Updating to version 9.2.15.v20160210
2016-02-10 14:49:12 -07:00
Simone Bordet
281313440b
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-08 15:57:40 +01:00
Simone Bordet
1ed327ecce
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-08 15:56:53 +01:00
Simone Bordet
e853632c22
Updated ALPN version for JDK 8u73 and 8u74.
2016-02-08 15:52:03 +01:00
Simone Bordet
56c0bc768c
Merged branch 'jetty9.3.x' into 'master'.
2016-01-21 17:52:37 +01:00
Simone Bordet
7703784cab
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-01-21 17:32:14 +01:00
Simone Bordet
35bc923f50
Updated ALPN version for JDK 8u71 and 8u72.
2016-01-21 17:25:48 +01:00
Joakim Erdfelt
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
Joakim Erdfelt
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
Joakim Erdfelt
b7f9c9aca9
Updating to version 9.3.7-SNAPSHOT
2016-01-13 08:21:01 -07:00
Joakim Erdfelt
21ca3f6690
Updating to version 9.3.7.RC1
2016-01-13 07:30:24 -07:00
Joakim Erdfelt
c62b42ffb3
485199 - Remove copyright blurb from pom.xml files
2016-01-08 11:28:57 -07:00
Jan Bartel
b47990189c
484616 Outdated version of javaee_web_services_client_1_2.xsd
2016-01-06 13:35:32 +11:00
Jan Bartel
d760926554
484616 Outdated version of javaee_web_services_client_1_2.xsd
2016-01-06 13:34:46 +11:00
Simone Bordet
6128bd6d45
Merged branch 'jetty-9.3.x' into 'master'.
2016-01-05 11:50:52 +01:00
Simone Bordet
f519aa28fb
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-01-05 11:40:57 +01:00
Simone Bordet
50100ca86d
Fixed copyright blurbs.
2016-01-05 11:30:38 +01:00
Joakim Erdfelt
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
Joakim Erdfelt
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
Joakim Erdfelt
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
Joakim Erdfelt
ec8f8d3e4f
Updating to version 9.2.15-SNAPSHOT
2015-11-06 11:06:48 -07:00
Joakim Erdfelt
ecba378f5c
Updating to version 9.2.14.v20151106
2015-11-06 10:32:14 -07:00
Greg Wilkins
7843b7348e
480827 Implemented Unix Domain Socket Connector
...
Squashed commit of the following:
commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0db
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 6 10:44:00 2015 +1100
Merge branch 'master' into unix-socket
commit ed2550b50f978e1984e19fbda642baf450dbe6a1
Merge: 88d7b35 de137ab
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 18:41:25 2015 +1100
Merge branch 'master' into unix-socket
commit 88d7b35f885de2da7dec836e6e4ae2b522d517f0
Merge: 7d4155f 3e2658a
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 17:38:27 2015 +1100
Merge branch 'master' into unix-socket
commit 7d4155fe4a407d493683b66709bc638879b0b422
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 17:24:48 2015 +1100
Unix socket configuration
commit 2737b19f73ad153c20e1762874558a5d62849f90
Merge: cd0cc2e 92cc44c
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Nov 4 15:13:40 2015 +1100
Merge branch 'master' into unix-socket
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java
commit cd0cc2ef36a558d948bf26aff4f9e3519da2f823
Merge: 639753b 303f98e
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Nov 2 12:21:19 2015 +1100
Merge branch 'master' into unix-socket
commit 639753b5ed37778d7231acfe9d52039aed66351e
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 15:42:58 2015 +1100
local connectors report NOIP address
commit 6d38c4195f145b99f775a06d546960b119094b0c
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 12:11:13 2015 +1100
Gentler ssl close test
commit 40b46b66a738c9187f859d522a0165bb09b113c8
Merge: b7eb082 fa53b11
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 11:09:42 2015 +1100
Merge branch 'master' into unix-socket
commit b7eb082be44864c058b6f01b10364013596d3650
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 08:34:30 2015 +1100
SecureRequestCustomizer for UnixSockets
commit edbb3c080200b4c6aa2836eff6c81bf31a73a8c1
Merge: 90e8cc0 de7ac72
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 19:47:05 2015 +1100
Merge branch 'master' into unix-socket
commit 90e8cc060ff6dc4b249818db38334ffa543f002f
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 19:31:50 2015 +1100
use proxy connection
commit b1772ef5dcac9ddf9bb5ecda1cda6d038ca21755
Merge: e95a932 9fe7332
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 16:46:29 2015 +1100
Merge branch 'master' into unix-socket
commit e95a932bda5a96bf98ada4fb47664790af2aa0a2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Oct 28 15:58:25 2015 +1100
fixed config
commit f8963b2ed6b6b4b96f1d9403194c9d50ab1f12fd
Merge: 9c56b53 8b27484
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Oct 28 15:34:28 2015 +1100
Merge branch 'master' into unix-socket
commit 9c56b53cbec20d98e5cb05cf8d1f668fe84b95e0
Merge: 298a311 39768f8
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Oct 26 13:04:34 2015 +1100
Merge branch 'master' into unix-socket
commit 298a311af952ad3ef5d1c7635deabf47bddaa1c6
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 15:24:19 2015 +1100
Async accepting
commit 8266753d124c04ec8bca8aa02be1ef3d826d6769
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 14:45:35 2015 +1100
set acceptors
commit 6a56c5b9e19063fcb95cdc1228adf723c0d41362
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 11:44:54 2015 +1100
licence
commit d80e5748e6c4327bae57de2af01983990dd2afe0
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 11:24:14 2015 +1100
unixsocket work in progress adding modules
commit cf0c1153d9966cc7182ba29411527b4341c34da6
Merge: 645b671 c39bfa2
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 08:52:01 2015 +1100
Merge branch 'master' into unix-socket
commit 645b6712d37282c26011a95c8c98e45c249b2e5f
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 08:49:52 2015 +1100
IP headers
commit 67b210b9ea81af68ce3848a114bbbd1b80a8ca52
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 23:48:57 2015 +1100
working with haproxy
commit e4fce9cf5d896a9a29a7c6280fcaa0336dfcc0f2
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 18:25:09 2015 +1100
unixsocket working
commit 6f013788cad44e6641cd89720c5e7f3652cdc257
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 15:39:55 2015 +1100
work in progress
2015-11-06 11:17:46 +11:00
Simone Bordet
700975fe41
Merged branch 'jetty-9.3.x' into 'master'.
2015-11-05 12:17:30 +01:00
Simone Bordet
50e565bac0
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-11-05 12:14:28 +01:00
Simone Bordet
b4cf2921c8
Updated ALPN version for JDK 8u65 and 8u66.
2015-11-05 12:05:08 +01:00
Jan Bartel
b3b48924d5
Update build profile for jdk1.8.0.66
2015-11-02 12:42:22 +11:00
Jan Bartel
8b27484ea2
Update build profile for jdk1.8.0.66
2015-10-28 13:50:34 +11:00
Joakim Erdfelt
87cc795e88
Bumping up surefire plugin version
...
+ This should address the CI build JVM hang bug if we have a
bad/failing testcase (like the recent jetty-proxy issues)
+ See bug https://issues.apache.org/jira/browse/SUREFIRE-524
2015-10-23 11:31:06 -07:00
Jan Bartel
43a28a5080
480272 Update to newer jdt ecj version
2015-10-21 15:26:26 +11:00
Jan Bartel
781a380fbd
480272 Update to newer jdt ecj version
2015-10-21 15:25:24 +11:00
Joakim Erdfelt
4dfd68b315
Merge branch 'jetty-9.3.x'
...
Conflicts:
aggregates/jetty-all-compact3/pom.xml
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-cdi/cdi-core/pom.xml
jetty-cdi/cdi-full-servlet/pom.xml
jetty-cdi/cdi-servlet/pom.xml
jetty-cdi/cdi-websocket/pom.xml
jetty-cdi/pom.xml
jetty-cdi/test-cdi-webapp/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-http2/http2-alpn-tests/pom.xml
jetty-http2/http2-client/pom.xml
jetty-http2/http2-common/pom.xml
jetty-http2/http2-hpack/pom.xml
jetty-http2/http2-http-client-transport/pom.xml
jetty-http2/http2-server/pom.xml
jetty-http2/pom.xml
jetty-infinispan/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/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/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-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-http-client-transport/pom.xml
tests/test-integration/pom.xml
tests/test-jmx/jmx-webapp-it/pom.xml
tests/test-jmx/jmx-webapp/pom.xml
tests/test-jmx/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-infinispan-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-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
2015-10-13 08:53:35 -07:00
Joakim Erdfelt
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
Joakim Erdfelt
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
Jan Bartel
73de40921c
Merge branch 'jetty-9.3.x' into gcloud-session-manager
2015-10-13 08:35:50 +11:00
Joakim Erdfelt
06593a546c
Using 8.0.27 release
2015-10-12 13:15:19 -07:00
Joakim Erdfelt
dcc3ad3f22
Bumping up apache-jsp to 8.0.27-SNAPSHOT
2015-10-09 10:14:49 -07:00
Joakim Erdfelt
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
Joakim Erdfelt
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
Joakim Erdfelt
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
Jan Bartel
022f8e66f6
Merge branch 'master' into gcloud-session-manager
2015-10-07 12:13:00 +11:00
Jan Bartel
7f82124d54
478862 Update to jstl 1.2.5
2015-10-06 19:30:37 +11:00
Jan Bartel
2f4f639735
First draft of session manager using gcloud datastore.
2015-10-01 09:41:07 +10:00
Simone Bordet
da3699dc55
Merged branch 'jetty-9.2.x' into 'master'.
2015-09-21 16:32:58 +02:00
Simone Bordet
77fdfb8754
Updated ALPN version for JDK 8u60.
2015-09-21 16:19:48 +02:00
Jan Bartel
03a601f2b2
477385 Make jetty osgi manifests only resolve jetty packages against a single distro version
2015-09-16 19:13:47 +10:00
Joakim Erdfelt
7957ed06ef
jetty-test-helper to 3.1, removing snapshot repo references
2015-09-09 16:01:57 -07:00
Jesse McConnell
6409366499
[maven-release-plugin] prepare for next development iteration
2015-08-27 10:11:29 -05:00
Jesse McConnell
3086adc965
[maven-release-plugin] prepare release jetty-9.3.3.v20150827
2015-08-27 10:11:21 -05:00
Jesse McConnell
f8734f23ce
[maven-release-plugin] prepare for next development iteration
2015-08-25 14:10:01 -05:00
Jesse McConnell
e9edf4c24b
[maven-release-plugin] prepare release jetty-9.3.3.v20150825
2015-08-25 14:09:54 -05:00
Jesse McConnell
7a2f4df2c9
set for release
2015-08-25 11:57:52 -05:00
Greg Wilkins
d780839bec
474634 - AsyncListener.onError() handling.
...
Added HttpConfiguration.maxErrorDispatches to detect error loops
Fixed ManyWays... unit test to handle error dispatch.
2015-08-14 10:06:57 +10:00
Joakim Erdfelt
a3684f7fb8
[maven-release-plugin] prepare for next development iteration
2015-07-30 09:47:57 -07:00
Joakim Erdfelt
798fc8118b
[maven-release-plugin] prepare release jetty-9.2.13.v20150730
2015-07-30 09:47:48 -07:00
Joakim Erdfelt
4b3879845d
[maven-release-plugin] prepare for next development iteration
2015-07-30 07:02:10 -07:00
Joakim Erdfelt
6b7e9ac4b0
[maven-release-plugin] prepare release jetty-9.3.2.v20150730
2015-07-30 07:02:02 -07:00
Simone Bordet
aa75bcf078
Updated ALPN versions for JDK 8u51.
2015-07-28 16:23:08 +02:00
Simone Bordet
dea406d2b3
Updated ALPN versions for JDK 8u51.
2015-07-27 11:04:27 +02:00
Joakim Erdfelt
3f85fbbbd2
Unit testing upgrades
...
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
jetty-test-helper)
2015-07-23 12:44:43 -07:00
Joakim Erdfelt
b954a2dad5
Unit testing upgrades
...
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
jetty-test-helper)
2015-07-23 12:16:50 -07:00
Jesse McConnell
9b790c38ce
[maven-release-plugin] prepare for next development iteration
2015-07-14 11:42:34 -05:00
Jesse McConnell
b35d32f2b8
[maven-release-plugin] prepare release jetty-9.3.1.v20150714
2015-07-14 11:42:28 -05:00
Jesse McConnell
7204707902
[maven-release-plugin] prepare for next development iteration
2015-07-09 12:14:38 -05:00
Jesse McConnell
3b1533673e
[maven-release-plugin] prepare release jetty-9.2.12.v20150709
2015-07-09 12:14:30 -05:00
Jan Bartel
5ac1c0a3b7
471623 Update to apache jsp 8.0.23
...
Use 8.0.23.M1 for jetty version of apache jsp 8.0.23
2015-07-03 15:47:05 +10:00
Joakim Erdfelt
438e1543dc
Bumping up surefire plugin to 2.18.1
2015-06-29 10:02:40 -07:00
Joakim Erdfelt
f630a8416b
Consolidating maven-javadoc-plugin configuration
...
+ all <configuration> is now in top level pom
as a <pluginManagement> entry for all sub-modules
2015-06-26 08:09:23 -07:00
Jan Bartel
8a64c50f24
Update to pmd plugin 3.4 and plugin-plugin 3.4 and jetty-build-support 1.4
2015-06-25 18:20:11 +10:00
Joakim Erdfelt
ecdcc2e7c0
Adding maven plugin tags to javadoc:aggregate build
2015-06-15 16:33:29 -07:00
Jesse McConnell
60e45a940e
[maven-release-plugin] prepare for next development iteration
2015-06-15 15:34:11 -05:00
Jesse McConnell
d3dec8d513
[maven-release-plugin] prepare release jetty-9.2.12.M0
2015-06-15 15:34:03 -05:00
Joakim Erdfelt
cf6c4a914e
Updating version to 9.3.1-SNAPSHOT
2015-06-15 10:25:49 -07:00
Joakim Erdfelt
1a9da9f9e4
Updating versions to 9.3.0.v20150612
2015-06-12 09:34:24 -07:00
Joakim Erdfelt
c6ac82f50b
Merge branch 'master' into release-9.3
2015-06-12 09:30:46 -07:00
Simone Bordet
574373b806
Removed JDK 7 ALPN files and build profiles.
2015-06-12 18:27:01 +02:00
Joakim Erdfelt
496b4dfc83
[maven-release-plugin] prepare for next development iteration
2015-06-11 15:08:36 -07:00
Joakim Erdfelt
f53c5d8fac
[maven-release-plugin] prepare release jetty-9.3.0.v20150611
2015-06-11 15:08:29 -07:00
Jesse McConnell
bfe6c2638e
[maven-release-plugin] prepare for next development iteration
2015-05-29 09:06:42 -05:00
Jesse McConnell
71e0f4d8ce
[maven-release-plugin] prepare release jetty-9.2.11.v20150529
2015-05-29 09:06:36 -05:00
Jesse McConnell
a7087cbfbf
[maven-release-plugin] prepare for next development iteration
2015-05-28 10:06:51 -05:00
Jesse McConnell
913c63e597
[maven-release-plugin] prepare release jetty-9.2.11.v20150528
2015-05-28 10:03:44 -05:00
Greg Wilkins
cc40282a7d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-osgi/jetty-osgi-alpn/pom.xml
pom.xml
2015-05-22 21:06:03 +10:00
Simone Bordet
43780f6c78
Updated ALPN API to 1.1.2.v20150522.
2015-05-22 10:24:32 +02:00
Greg Wilkins
c5e4abd792
467281 Remove Java 1.7 support from Jetty 9.3
2015-05-14 09:31:50 +10:00
Joakim Erdfelt
e9b67afc24
Fixing formatting
2015-05-13 11:18:13 -07:00
Joakim Erdfelt
763966a9b4
Using released jetty-parent-25
2015-05-13 11:17:25 -07:00
Greg Wilkins
435bed0c37
fixed import into eclipse IDE
2015-05-13 23:13:16 +10:00
Simone Bordet
79a841da4b
Merged branch 'jetty-9.2.x' into 'master'.
2015-05-08 10:55:10 +02:00
Simone Bordet
f580cf72ac
Updated ALPN API to 1.1.1.v20150508.
2015-05-08 10:52:54 +02:00
Simone Bordet
b26552cbb5
Merged branch 'jetty-9.2.x' into 'master'.
2015-04-15 19:21:11 +02:00
Simone Bordet
6fa863d6be
Updated ALPN and NPN versions for JDK 7u79, 7u80 and 8u45.
2015-04-15 19:09:46 +02:00
Joakim Erdfelt
dc2221a152
Build under Java 1.8
...
+ Enforcer setup to JDK 1.8+
+ Java7 profiles removed (for now)
+ Main compile phase source/test is 1.7
+ Test compile phase source/test is 1.8
2015-04-10 13:21:12 -07:00
Jan Bartel
7375ba2cc3
Alpha impl for infinispan session manager.
...
Conflicts:
tests/test-sessions/pom.xml
Conflicts:
tests/test-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java
2015-04-02 12:20:12 +11:00
Jan Bartel
a1bf23233e
Update to org.eclipse.jetty.parent 24
2015-03-27 16:18:58 +11:00
Jesse McConnell
da4f95f3d3
[maven-release-plugin] prepare for next development iteration
2015-03-25 09:08:27 -05:00
Jesse McConnell
e92fd438fd
[maven-release-plugin] prepare release jetty-9.2.11.M0
2015-03-25 09:08:21 -05:00
Simone Bordet
161317a5ef
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-23 22:32:40 +01:00
Simone Bordet
85999058e0
Updated ALPN version for JDK 8u40.
2015-03-23 22:14:02 +01:00
Jan Bartel
7c53dfe5a4
459734 Update to apache jsp 8.0.20
2015-03-19 17:19:05 +11:00
Jesse McConnell
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
Jesse McConnell
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
Simone Bordet
3162ccc299
Fixed dependency on old test helper classes.
2015-03-02 17:00:52 +01:00
Simone Bordet
3cf2a5409d
Updated toolchain's test helper to 2.9.
2015-03-02 16:37:37 +01:00
Jesse McConnell
1659d83978
[maven-release-plugin] prepare for next development iteration
2015-02-24 10:38:33 -06:00
Jesse McConnell
dc0c3f4c52
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
2015-02-24 10:38:28 -06:00
Jan Bartel
d85662bd6e
459681 Remove Glassfish JSP in favor of Apache JSP
2015-02-18 19:25:20 +11:00
Jesse McConnell
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
Jesse McConnell
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
Jan Bartel
e21d078d2b
Update date on osgi bundle copyright message.
2015-02-12 10:33:20 +11:00
Greg Wilkins
2162455b72
Removed SPDY and NPN
...
Because jetty 9.3 is targetted for HTTP2, we have removed support for SPDY and NPN.
2015-02-11 14:20:06 +11:00
Simone Bordet
1ccd0d0dba
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-30 12:08:27 +01:00
Simone Bordet
4c751e10e1
Updated ALPN and NPN versions.
...
NPN to version 1.1.10.v20150130 for OpenJDK 7u75 and 7u76.
ALPN to version 7.1.3.v20150130 for OpenJDK 7u75 and 7u76,
and to version 8.1.3.v20150130 for OpenJDK 8u31.
2015-01-30 11:55:28 +01:00
Jesse McConnell
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
Jesse McConnell
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
Jesse McConnell
8748abbfa1
tweake
2015-01-16 16:34:21 -06:00
Jesse McConnell
425a14de18
set for release
2015-01-16 16:32:19 -06:00
Jesse McConnell
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
Jesse McConnell
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
Jesse McConnell
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
Jesse McConnell
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
Jesse McConnell
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
Jesse McConnell
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06:00
Joakim Erdfelt
73110f5ba0
Merge branch 'jetty-9.2.x'
2015-01-09 10:00:57 -07:00
Joakim Erdfelt
d8186af7ac
Bumping up maven-deploy-plugin to v2.8.2 with retry configuration
2015-01-09 10:00:39 -07:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Simone Bordet
e8c88cfd9c
Merged branch 'jetty-9.2.x' into 'master'.
2014-12-22 21:32:09 +01:00
Jan Bartel
eb06d7cf5f
454983 Source bundles should not be singleton
2014-12-12 13:40:33 +01:00
Joakim Erdfelt
71af18f4b7
454952 - Allow Jetty to run in Java 8 compact 3 profile
...
+ Simplifying setup, removing entire-project wide compiler setting
+ Setting up jetty-all-compact3 aggregate for the compilation instead
+ Marking various classes that are never going to be safe to use in
compact3 as excluded
2014-12-11 16:15:12 -07:00
Joakim Erdfelt
f96f3489e3
454952 - Allow Jetty to run in Java 8 compact 3 profile
...
+ Forcing <target> of 8 to satisfy javac error
2014-12-11 15:14:29 -07:00
Joakim Erdfelt
2b196a9ae1
454952 - Allow Jetty to run in Java 8 compact 3 profile
...
+ Step 1, enable a profile that will use the Java 8 "compact 3" profile
during compilation time.
2014-12-11 15:12:59 -07:00
Jan Bartel
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
Jan Bartel
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
Jesse McConnell
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
Jesse McConnell
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
Jesse McConnell
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
Jesse McConnell
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
Simone Bordet
b573848a45
Merged branch 'jetty-9.2.x' into 'master'.
2014-12-02 12:15:13 +01:00
Simone Bordet
948450d724
Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202.
2014-12-02 12:12:20 +01:00
Jesse McConnell
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
Jesse McConnell
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
Jesse McConnell
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
Jesse McConnell
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
Jesse McConnell
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
Jesse McConnell
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
Jesse McConnell
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
Jesse McConnell
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
Joakim Erdfelt
8a72a153a1
Merge branch 'jetty-9.2.x'
2014-10-28 12:32:55 -07:00
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
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
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
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
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