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
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
Simone Bordet
a684c028b5
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Specified Maven Assembly Plugin version only in root POM.
2017-01-13 22:50:08 +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
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
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
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
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
2d650512bf
Skipping jacoco collection on build/test/support/integration modules
2016-10-20 12:48:32 -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
Greg Wilkins
da4177c6d4
fixed quickstart test
2016-10-13 17:42:13 +11: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
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
Jan Bartel
e895508e8e
Issue #746 Update osgi manifests to servlet 4.0
2016-08-04 15:03:51 +10:00
Jan Bartel
5232b933a4
Issue #746 Update osgi manifests to servlet 4.0
2016-08-04 14:20:43 +10: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
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
c6172c9f2e
Merge branch 'jetty-9.4.x'
2016-06-09 14:18:52 -05:00
Greg Wilkins
383e81db38
Fix #627 Use start.d or start.ini not both
...
Updated start module to look for start.d and use it if it exists
Error or warning of both start.d and start.ini exist
updated jetty-distribution to use one or the other
2016-06-09 16:45:24 +10: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
Jesse McConnell
569a8d14b9
merge up from 9.3.x release
2016-05-19 10:08:51 -05:00
Jesse McConnell
80cadf2c01
merging in from 9.3.x release
2016-05-19 10:05:44 -05:00
Jan Bartel
2e2b8e1a13
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-05-18 18:33:06 +10:00
Jan Bartel
387f433711
Refactor names of session impl classes; fix bugs; add some tests
2016-05-18 17:05:01 +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
Greg Wilkins
a5ad291add
Squashed commit of the following: ( #528 )
...
commit 4bf6b7c951
Merge: a50e882
301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 27 12:12:08 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 23 09:38:00 2016 +1000
work in progress
commit 4e286266c0
Merge: 5ae7da0
f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 16:34:12 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 12:12:24 2016 +1000
Work in progress on Features
commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 22:05:55 2016 +1000
Refactor Configurations.isEnabledByDefault, enable all configurations by default.
commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 17:32:22 2016 +1000
Fix features for jsp with osgi
commit 22d2b251e9
Merge: 571d503
2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 14 16:19:43 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 13 15:36:36 2016 +1000
code comment
commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 9 21:24:22 2016 +1000
fixed quickstart validation
commit 154d58bf62
Merge: 8e54aad
ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:25:17 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:21:30 2016 +1000
general cleanup of Configuration and ClasspathPattern usage
commit 65f8e5dbd0
Merge: ea1deda
2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 09:15:28 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit ea1deda4f9
Merge: cfe9c83
f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 18:21:56 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 17:57:23 2016 +1100
work in progress
commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 10:11:49 2016 +1100
work in progress
commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 14:01:00 2016 +1100
progress on OSGi
commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:52:33 2016 +1100
Fixed plugin
commit f08b84ba0e
Merge: f19bd2c
8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:55 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:06 2016 +1100
work in progress... all but OSGi
commit 2f15c3e4f9
Merge: 36b5687
7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 16:52:43 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 36b5687329
Merge: 13d914a
e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 07:20:05 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 04:41:30 2016 +1100
Work in progress on Features
Moved jar discovery to META-INF
commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 17:48:15 2016 +0100
Work in progress towards new quickstart arch
commit c5c23698c4
Merge: fd34007
692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:29:18 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:04:35 2016 +0100
Work in progress on Features for QuickStart
commit c5f0c80cd2
Merge: 0e6d886
b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 4 16:05:23 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 0e6d886b01
Merge: d150405
2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 17:32:36 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit d1504055de
Merge: 22a6cd0
3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 15:21:20 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 20:53:17 2016 +0100
Features work in progress
convert more server/system classes to Configurations
commit 037e04bfe5
Merge: add9876
bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 17:11:04 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit add9876f83
Merge: 5263f15
eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Feb 25 10:11:08 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5263f15acd
Merge: 89803ae
21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 23 14:35:31 2016 +0100
Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature
commit 89803aec95
Merge: 5fed7c7
779317d
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 16:09:38 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 11:21:13 2016 +0100
fixed merge
commit ec22a1ba0b
Merge: 4c8257d
d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 10:53:16 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 17 09:34:28 2015 +1100
Do not default quickstart
commit 57ce87770a
Merge: 14bde1f
96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 16 17:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 16:26:58 2015 +1100
work in progress on Configurations as services
commit 46ce2aef3a
Merge: 9e82fa0
ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 10:11:09 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 08:52:37 2015 +1100
work in progress to Configurations as ServiceLoader
commit 6e11f22de4
Merge: 120e330
5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 18:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 120e33034f
Merge: 6c5b95d
384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 14:20:52 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 6c5b95d6b8
Merge: 722eb60
5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 2 11:16:37 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 13:58:16 2015 +1100
Configurations can add server/system classes
commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 11:47:03 2015 +1100
Self ordering WebApp Configurations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-05-02 17:55:54 +10:00
Joakim Erdfelt
c09f31a51d
Bumping up master to version 10.0.0-SNAPSHOT
2016-04-29 11:47:15 -07:00
Jan Bartel
70a665d3e7
Refactor session implementation: rename SessionStore impls.
2016-04-28 16:18:29 +10:00
Jan Bartel
d28dffb16e
Remove SessionManager; refactor names of session classes; add start modules for new session arch
2016-04-15 11:08:46 +10: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
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
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
d0593ab046
Merged branch 'jetty-9.3.x' into 'master'.
2016-03-08 11:56:14 +01:00
Joakim Erdfelt
cc9a19775b
Issue #343 - ensure release deployment of test-jetty-webapp:war and test-proxy-webapp:war
2016-03-07 16:25:54 -07:00
Jesse McConnell
c74b0c23e9
Issue #367 Resolve remaining git.eclipse.org build references
2016-02-26 08:11:27 -07:00
Jesse McConnell
931f67baab
Update index.html
2016-02-26 08:08:17 -07:00
Jesse McConnell
7fab31e309
Update index.html
2016-02-26 08:08:16 -07:00
Jesse McConnell
e46a19bde0
Update index.html
2016-02-26 08:08:16 -07:00
Jesse McConnell
aaba9eca42
Update index.html
2016-02-26 08:08:16 -07:00
Jesse McConnell
d8f74233a0
fix some merge issues, some example javadoc that was never right and contributing language
2016-02-26 08:13:41 -06:00
Jesse McConnell
ce5a3b11d6
Issue #367 Resolve remaining git.eclipse.org build references
2016-02-26 08:03:33 -06:00
Jesse McConnell
881edcb640
Update index.html
2016-02-26 07:34:33 -06:00
Jesse McConnell
ad8733e5ab
Update index.html
2016-02-26 07:33:44 -06:00
Jesse McConnell
d0e8d5af2f
Update index.html
2016-02-26 07:33:16 -06:00
Jesse McConnell
6e41a267ef
Update index.html
2016-02-26 07:32:41 -06:00
Jan Bartel
c965dc905c
Update jdbc module for new session architecture
2016-02-16 15:12:23 +01:00
Jan Bartel
9b5aa6f90d
478918 Change javax.servlet.error,forward,include literals to RequestDispatcher constants
2016-02-16 11:52:29 +01:00
Jan Bartel
f10f32c080
478918 Change javax.servlet.error,forward,include literals to RequestDispatcher constants
2016-02-16 10:48:20 +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
Greg Wilkins
df79ad689a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-04 07:00:13 +01:00
Greg Wilkins
6c9a444b6c
486530 - Handler added to WebAppContext prevents ServletContext initialization
...
Added warnings for loops and inappropriate handlers.
Used insertHandler in more XML files
2016-02-03 10:54:39 +01:00
Jan Bartel
273e87a851
Merge branch 'master' into session-refactor
2016-02-02 18:23:39 +01:00
Jan Bartel
0f19eda53d
486530 Handler added to WebAppContext prevents ServletContext initialization
2016-02-02 15:05:58 +01:00
Jan Bartel
2831674067
486530 Handler added to WebAppContext prevents ServletContext initialization
2016-02-02 15:04:22 +01:00
Jan Bartel
a8c29334ca
Merge branch 'master' into session-refactor
...
Conflicts:
jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java
jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
2016-02-01 13:59:12 +01:00