olivier lamy
e5817db14a
fix diplicate dependency
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-26 21:13:11 +10:00
Jesse McConnell
d179bcf7ac
Resolves #2241 clean up javadoc warnings
2018-02-23 14:09:33 -06:00
Jan Bartel
1e8422935c
Issue #2164 Add test for javax.websocket in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
Jan Bartel
17f518ffb1
Issue #2164 Update websocket manifests for osgi and add test in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
Greg Wilkins
ab5fc29cca
Jetty 9.4.x 1803 proposal 0 - single ReservedThreadExecutor ( #2119 )
...
Issue #1803 - Review usage of scheduling strategies
Use a single ReservedThreadExecutor built into the QueuedThreadPool
via new interface TryExecutor.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-08 11:08:48 +01:00
Jan Bartel
8e55d0d6a7
Issue #2166 Update spifly to 1.0.10 ( #2167 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-01-31 15:06:56 +01:00
Joakim Erdfelt
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
Joakim Erdfelt
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
Joakim Erdfelt
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
Joakim Erdfelt
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
olivier lamy
5a323a01dd
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-09 13:35:58 +11:00
Joakim Erdfelt
2dd970b055
Updating to version 9.2.24-SNAPSHOT
2017-12-18 10:43:47 -06:00
Joakim Erdfelt
cdbe733684
Updating to version 9.2.23.v20171218
2017-12-18 09:06:48 -06:00
Jan Bartel
18cd1fb8df
Issue #2057 Add conscrypt test in osgi ( #2058 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-14 09:48:12 +01:00
Jan Bartel
f21fb5d6d9
Issue #2030 fix NPE in AnnotationConfiguration with debug enabled ( #2031 )
...
* Issue #2030 fix NPE in AnnotationConfiguration with debug enabled
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 11:04:55 +01:00
Jan Bartel
2df07f29e9
Jetty 9.4.x 2016 openjdk8 osgi headers ( #2026 )
...
* Issue #2016 Add osgi headers for openjdk8 alpn and add tests for http2 in osgi
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 10:38:13 +01:00
Joakim Erdfelt
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
Joakim Erdfelt
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
Jesse McConnell
a72eb0001d
Updating to version 9.3.23-SNAPSHOT
2017-10-30 15:39:57 -05:00
Jesse McConnell
705048cc49
Updating to version 9.3.22.v20171030
2017-10-30 15:16:29 -05:00
Jan Bartel
3793f974d5
Issue #1909
2017-10-19 15:08:02 +11:00
Jan Bartel
d5769c21a9
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 17:16:19 +11:00
Jan Bartel
da813488fb
Issue #1213
...
Ensure use asm5 for osgi tests
2017-10-18 17:07:00 +11:00
Greg Wilkins
c12ba01014
Issue #1797 use platform for MR jars
2017-10-18 12:24:26 +11:00
Greg Wilkins
44a1f1e1a6
Issue #1797 use platform for MR jars
2017-10-18 12:19:33 +11:00
Jan Bartel
3cffbdf6be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 11:24:04 +11:00
Jan Bartel
37c51710b0
Issue #1213
2017-10-18 10:05:59 +11:00
Jan Bartel
0282232ca4
Issue #1868
2017-10-05 17:12:21 +11:00
Jan Bartel
d808094e82
Issue #1829
2017-09-19 14:32:34 +10:00
Joakim Erdfelt
eee41174f2
Merge branch 'release-9.4.7' into jetty-9.4.x
2017-09-18 14:06:44 -07:00
Joakim Erdfelt
d9865a02ba
Updating to version 9.4.8-SNAPSHOT
2017-09-14 08:44:27 -07:00
Joakim Erdfelt
80fb788d0c
Updating to version 9.4.7.v20170914
2017-09-14 07:35:18 -07:00
Jan Bartel
7ad415b9b8
Issue #1819
2017-09-14 16:07:00 +10:00
Simone Bordet
b7c4e1c7dc
Issue #487 - JDK 9 build compatibility.
...
Made sure that when compiling with JDK 9 we actually use a JDK 8 runtime.
Updated the Maven Compiler Plugin to latest version, with support for
JDK 9 --release command line.
Removed unnecessary Maven Compiler Plugin declarations in POMs.
2017-08-16 12:37:44 +02:00
Jan Bartel
67d93f9f74
Issue #1724
2017-08-10 13:05:50 +10:00
Joakim Erdfelt
1311052b15
Cleaning up state of branch to match the original jetty-9.4.x
...
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Joakim Erdfelt
585f126b48
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-clean
2017-08-08 09:24:41 -07:00
Jan Bartel
7c4f7b13f7
Issue #1682
2017-08-08 09:15:35 -07:00
Jan Bartel
77d96ff36d
Issue ##1597
...
Make osgi import of javax.mail optional
2017-08-08 09:13:18 -07:00
Joakim Erdfelt
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
Joakim Erdfelt
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -07:00
Joakim Erdfelt
11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
Joakim Erdfelt
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
Joakim Erdfelt
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
Joakim Erdfelt
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07:00
Joakim Erdfelt
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
Joakim Erdfelt
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
Joakim Erdfelt
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
Joakim Erdfelt
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
Christoph Dreis
e9f398cf41
Deprecate ConcurrentHashSet ( #1570 )
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
WalkerWatch
82c909acdc
Documentation updates
2017-05-18 12:12:32 -04:00
Joakim Erdfelt
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
Joakim Erdfelt
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
Joakim Erdfelt
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
Joakim Erdfelt
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
Joakim Erdfelt
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
Joakim Erdfelt
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
Joakim Erdfelt
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
Joakim Erdfelt
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
Joakim Erdfelt
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
Joakim Erdfelt
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
Joakim Erdfelt
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
Joakim Erdfelt
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
Joakim Erdfelt
92afe54c1d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-10 13:22:32 -07:00
Joakim Erdfelt
e25007cb79
Issue #1390 - Addressing new File(URL) use in Windows
...
+ Fixing HashLoginService to track its Config via File reference only
(dropping support for URL reference)
+ Adding new `this.web-inf.path` property that jetty-web.xml can use
2017-03-10 12:47:06 -07:00
Jan Bartel
5933f70ae6
Issue #1049
...
Ensure file paths for osgi config files are correct urls
2017-03-10 09:34:20 -07:00
Joakim Erdfelt
cf507084fe
Cherry-pick Cleanup
2017-03-10 09:04:02 -07:00
Jan Bartel
7dc61365e4
Issue #1387
...
Upgraded paxexam and osgi container.
2017-03-10 09:02:40 -07:00
Jan Bartel
20c50424a3
Issue #1387
...
Upgraded paxexam and osgi container.
2017-03-10 17:28:42 +11:00
Jan Bartel
72fe2a88c2
Issue #1049
...
Ensure file paths for osgi config files are correct urls
2017-03-10 11:59:20 +11:00
Joakim Erdfelt
01d539e2be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-09 14:20:19 -07:00
Joakim Erdfelt
e796063ace
Issue #1049 - Upgrading paxexam, downgrading surefire
2017-03-09 07:43:26 -07:00
Joakim Erdfelt
76c6377ed7
Windows Test Issue
...
+ Adding slf4j-simple to test scope to attempt to capture reason
for the test setup failure:
"org.osgi.framework.BundleException: Error while renaming bundle file
to final location C:\"
2017-03-09 06:58:45 -07:00
Joakim Erdfelt
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
Jesse McConnell
700491f0da
Merge pull request #1289 from earldouglas/its
...
Replace contraction with possesive
2017-01-28 16:23:39 -06:00
Jan Bartel
0b45f377bf
Issue #1290
2017-01-27 15:42:52 +11:00
James Earl Douglas
590838f644
Replace contraction with possesive
2017-01-26 19:26:50 -07: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
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
f8e3b1f9c2
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-17 11:38:45 +01:00
Simone Bordet
9e9ee03d7f
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Fixed dependencies for modules that run tests that require ALPN.
2017-01-17 11:32:20 +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
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
afb750515e
Issue #963 Location based classpath pattern ( #978 )
...
Issue #963 location based white/black classpath lists
- removed outdated annotations/ClassNameResolver
- implemented loadedFrom in TypeUtil
- created a growable Trie
- reimplemented classpathpattern
- simplified OSGi classloading
2016-10-06 10:47:09 +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
Greg Wilkins
6c635e3263
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-12 14:06:36 +10:00
Greg Wilkins
46cdeca543
Use dynamic ports for OSGi tests
2016-08-12 14:06:14 +10:00
Jan Bartel
8f058d2b09
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-03 18:56:36 +10:00
Jan Bartel
4b920622d5
Issue #797
2016-08-03 18:33:53 +10:00
Jan Bartel
37fa778ea0
Issue #213
2016-07-27 20:13:24 +10:00
Joakim Erdfelt
e8d7bb5884
Fixing version
2016-07-26 13:09:51 -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
Jan Bartel
6de88fcee9
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-20 12:33:39 +10:00
Jan Bartel
9f825dadef
Issue #737
2016-07-20 12:26:41 +10:00
Jan Bartel
05260b63c9
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-14 14:11:45 +10:00
Jan Bartel
c7b80bee8f
Issue #704
2016-07-14 14:10:57 +10:00
Joakim Erdfelt
232a077b9d
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-12 17:50:16 -07:00
Joakim Erdfelt
35de3899b6
Issue #706 - Removing org.apache.jasper.compiler.disablejsr199 references
2016-07-12 17:49:11 -07: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
Joakim Erdfelt
02144e0a97
Making test keystores compatible with Java 8 restrictions
2016-06-20 17:46:21 -07: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
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
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
Jan Bartel
f550fcd57f
Merge pull request #499 from laeubi/is495
...
Fix #495 EventSender might leak service-references or miss them at all
2016-04-21 09:10:00 +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