61aac5abb5
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-12-07 21:15:26 +10:00
aabe5ceee2
remove duplicate dependencies
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-07 21:14:59 +10:00
30bd8b9fba
Updating to version 11.0.1-SNAPSHOT
2020-12-02 15:59:13 -06:00
432f896d7a
Updating to version 11.0.0
2020-12-02 15:35:56 -06:00
9319f10425
Updating to version 10.0.1-SNAPSHOT
2020-12-02 15:30:13 -06:00
b9645a1737
Updating to version 10.0.0
2020-12-02 15:04:53 -06:00
cc9b41cf17
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-12-02 14:53:52 -06:00
41c2e9cb6d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5739-Remove-distribution-from-doco
2020-12-02 14:52:53 -06:00
a3c116f8a0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-12-02 18:48:05 +01:00
37882236a6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-12-02 18:35:49 +01:00
f0a2ab4fed
Issue #5675 Update some osgi test dependencies ( #5676 )
...
* Issue #5675 Update some osgi test dependencies
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-02 18:21:18 +01:00
ddef266fe7
Fixing comment
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-02 10:54:13 -06:00
1768bd898f
Fix #5739 Remove distribution from doco
...
Mostly mechanical fixes
2020-12-02 09:16:29 +01:00
cf9a807d67
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-12-02 12:04:23 +11:00
121d898517
Move websocket-util classes into websocket-core ( #5705 )
...
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util
* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-02 11:10:15 +11:00
fe0a4f624e
Merge remote-tracking branch 'origin/release-9.4.35' into jetty-9.4.x
2020-11-25 15:56:09 -06:00
36d7a90930
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2 ( #5666 )
...
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-25 10:58:07 +01:00
00d324979f
Fix problems caused by upgrade to jstl version. ( #5715 )
...
* Fix problems caused by upgrade to jstl version.
Signed-off-by: Jan Bartel <janb@webtide.com>
* fix upperbound dependency
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* add trailing /
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
2020-11-24 21:17:02 +10:00
e8683cba9f
Updating to version 9.4.36-SNAPSHOT
2020-11-20 16:05:27 -06:00
bdc54f03a5
Updating to version 9.4.35.v20201120
2020-11-20 15:05:50 -06:00
fcfa72ee40
Bump javax.servlet.jsp.jstl from 1.2.2 to 1.2.5 ( #5673 )
...
Bumps [javax.servlet.jsp.jstl](https://github.com/javaee/jstl-api ) from 1.2.2 to 1.2.5.
- [Release notes](https://github.com/javaee/jstl-api/releases )
- [Commits](https://github.com/javaee/jstl-api/compare/1.2.2...impl-1.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-20 14:21:17 +10:00
1d3e190e53
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-18 10:55:12 +01:00
a70ecb51a1
Remove addition of jetty-util-ajax to osgi deployment
...
The jetty-util-ajax jar is not a dependency of jetty-servlets in
jetty-10.0.x like it is in jetty-9.4.x.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-11-18 10:49:53 +01:00
d30d95c26c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-17 09:20:25 -06:00
e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-17 09:12:50 -06:00
770be2dbc3
Issue #5539 - Adding jetty-util-ajax missing dep to osgi tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:23 -06:00
3a2095a7b0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-12 10:57:06 +11:00
8ff545f696
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2
2020-11-12 09:42:48 +11:00
f0a58bcfdd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-11 14:25:22 +11:00
6934b94261
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-11 14:21:58 +11:00
80bb1bce90
Bump javax.servlet.jsp.jstl from 1.2.2 to 1.2.5 ( #5622 )
...
Bumps [javax.servlet.jsp.jstl](https://github.com/javaee/jstl-api ) from 1.2.2 to 1.2.5.
- [Release notes](https://github.com/javaee/jstl-api/releases )
- [Commits](https://github.com/javaee/jstl-api/compare/1.2.2...impl-1.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 16:33:58 +10:00
e842c16bb4
osgi AnnotationConfiguration should replace the standard one
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 00:55:01 +11:00
bd553d98e5
fixing badly formatted XML comments
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:51:35 +11:00
71ad5447a4
Merge remote-tracking branch 'origin/release-9.4.34' into jetty-9.4.x
2020-11-04 10:24:21 -06:00
c97670fdc9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-03 14:13:11 -06:00
448d700f5c
Merge pull request #5547 from eclipse/dependabot/maven/jetty-10.0.x/org.eclipse.osgi-org.eclipse.osgi-3.7.1
...
Bump org.eclipse.osgi from 3.6.0.v20100517 to 3.7.1
2020-11-03 14:12:57 -06:00
4fd75a02ab
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-03 13:59:52 -06:00
eb5927ef8c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-03 13:57:17 -06:00
18049e9dec
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-03 13:57:03 -06:00
40bde46b13
Bump maven-antrun-plugin from 1.8 to 3.0.0
...
+ and update configuration/task to configuration/target
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-03 08:46:27 -06:00
edaadff55b
Updating to version 9.4.35-SNAPSHOT
2020-11-02 09:04:51 -06:00
e46af88704
Updating to version 9.4.34.v20201102
2020-11-02 08:03:51 -06:00
9b4b52df59
Bump pax-url-wrap from 2.5.2 to 2.6.1
...
Bumps [pax-url-wrap](https://github.com/ops4j/org.ops4j.pax.url ) from 2.5.2 to 2.6.1.
- [Release notes](https://github.com/ops4j/org.ops4j.pax.url/releases )
- [Commits](https://github.com/ops4j/org.ops4j.pax.url/compare/url-2.5.2...url-2.6.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-11-02 06:40:10 +00:00
10243b675e
Bump org.eclipse.osgi from 3.6.0.v20100517 to 3.7.1
...
Bumps org.eclipse.osgi from 3.6.0.v20100517 to 3.7.1.
Signed-off-by: dependabot[bot] <support@github.com>
2020-11-02 06:38:03 +00:00
c182595a0f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-10-28 11:35:12 -05:00
7f8169b8a3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-10-28 11:33:55 -05:00
b3186a90c2
Merge pull request #5512 from eclipse/dependency/jetty-9.4.x/org.eclipse.platform-org.eclipse.osgi.services-3.9.0
...
Bump org.eclipse.osgi.services from 3.7.100 to 3.9.0
2020-10-28 11:32:57 -05:00
4f38624a6c
Bump org.eclipse.osgi (platform) from 3.13.100 to 3.16.0
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-27 16:12:16 -05:00
227e74f1e0
Bump org.eclipse.osgi.services from 3.7.100 to 3.9.0
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-27 16:11:29 -05:00
e726eefb0b
Updating to version 9.4.34-SNAPSHOT
2020-10-20 18:55:39 -05:00
1be6875565
Updating to version 9.4.33.v20201020
2020-10-20 18:28:51 -05:00
cd913f028a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
2020-10-19 18:31:06 +02:00
a949afef64
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-10-19 18:24:38 +02:00
936cd465e7
Bump spifly from 1.2.4 to 1.3.2 ( #5477 )
...
* Issue #5475 Update to spifly 1.3.2
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-10-19 17:58:20 +02:00
9fa6d5f825
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-10-16 17:10:37 +11:00
58a84f2772
Bump asm.version from 8.0.1 to 9.0 and org.apache.aries.spifly.dynamic.bundle to 1.3.1 ( #5349 )
...
* Bump asm.version from 8.0.1 to 9.0
Bumps `asm.version` from 8.0.1 to 9.0.
Updates `asm-commons` from 8.0.1 to 9.0
Updates `asm` from 8.0.1 to 9.0
Updates `asm-tree` from 8.0.1 to 9.0
Updates `asm-analysis` from 8.0.1 to 9.0
Updates `asm-util` from 8.0.1 to 9.0
Signed-off-by: dependabot[bot] <support@github.com>
* org.apache.aries.spifly.dynamic.bundle 1.3.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-16 16:01:24 +10:00
c40b955e09
Issue #5022 Filter Cache cleanup ( #5271 )
...
* Issue #5022 Filter Cache cleanup
Issue #5022 Filter Cache cleanup:
+ Fixed many compiler warnings
+ removed old LazyList leftovers
+ Don't create holder string for source unless required
+ Only have a single type of chain, so it can be wrapped regardless of cache
+ Reverse mappings lists to make filter chain creation easier
+ build chain directly rather than build a list then a chain
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* added comment to explain ordering
Signed-off-by: gregw <gregw@webtide.com>
* More cleanups
* fixed toString format
turn off debug in OSGI test
2020-10-05 13:29:11 +02:00
e3118baf11
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-10-05 05:43:09 -05:00
d987a0d94d
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2
...
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.
Signed-off-by: dependabot[bot] <support@github.com>
2020-10-05 06:25:38 +00:00
c223ee37ab
Updating to version 11.0.0-SNAPSHOT
2020-10-02 16:38:23 -05:00
9ce21ec22b
Updating to version 11.0.0.beta2
2020-10-02 16:20:55 -05:00
85e257fc98
Updating to version 9.4.33-SNAPSHOT
2020-09-30 11:53:09 -05:00
de97d26f7b
Updating to version 9.4.32.v20200930
2020-09-30 11:03:24 -05:00
05c7bdf085
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-30 10:05:20 -05:00
525fc249ea
Fixing testcase expectation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-30 10:04:51 -05:00
c682f95639
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-29 11:44:04 -05:00
88f3dd5a52
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-29 11:37:46 -05:00
b22ce9c044
Reorg of /demos/ with focus on demo-spec downstream dependencies. ( #5367 )
...
* Reorg of /demos/ with focus on spec modules
* Reworking demo-mock-resources into /demos/ proper
* Removing old /tests/ modules that no longer have a reason for existing.
* Making demo-mock-resources a formal module
* demo-jndi and demo-spec now depend on it
* Restoring jetty-maven-plugin config lost in demo-jetty-webapp
* Fixing jetty-maven-plugin realm usage to be local
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:37:22 -05:00
ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-09-29 11:24:28 -05:00
3423375a97
Issue #5357 - Updating to https://eclipse.org/ ( #5358 )
...
* Issue #5357 - Updating to https://eclipse.org/
- Removing redundant <url> refs in pom.xml
- Correcting bad indenting from merge
- Correcting mailing list references
- Correcting bugs.eclipse.org references
- Correcting text file references
- Correcting html references
- Correcting further references
- Correcting download.eclipse.org reference
- Adding test for demo-base /proxy/current/
- Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:02:32 -05:00
eebd33d3e0
Fixing post-merge build & tests
2020-09-25 15:40:57 -05:00
fcc3b6b4cd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-25 10:09:58 -05:00
3dbedd8347
Issue #5264 - Fixing OSGi symbolic name references
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 18:52:37 -05:00
32875aa564
Issue #5264 - Fixing OSGi tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 17:56:58 -05:00
ad805d4756
Issue #5264 - More post move to /demos/ updates
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 15:38:34 -05:00
8b6031155c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-22 16:05:43 -05:00
33286db44b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5133-webappcontext-extraclasspath-cleanup
2020-09-22 12:24:01 -05:00
88a110ed0f
added ALPN dependency for jdk8
...
Signed-off-by: gregw <gregw@webtide.com>
2020-09-16 15:17:01 +02:00
8d526af3a7
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-10 11:07:44 +10:00
105bbed56b
Bump org.eclipse.osgi.services from 3.7.100 to 3.8.0 ( #5236 )
...
Bumps org.eclipse.osgi.services from 3.7.100 to 3.8.0.
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-10 10:12:32 +10:00
2ffab7cca2
Bump org.eclipse.osgi from 3.15.100 to 3.15.300 ( #5237 )
...
Bumps org.eclipse.osgi from 3.15.100 to 3.15.300.
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-10 10:10:58 +10:00
ccc863726b
Issue #5133 - Updates based on review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-26 12:19:22 -05:00
e47d2fb32b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-08-24 17:20:56 +02:00
77779ed6d8
Issue #4996 - Regularlize logging ( #5167 )
...
* Issue #4996 Regularize logging
Signed-off-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-24 17:15:13 +02:00
63bb757f37
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-08-24 14:59:51 +02:00
49fb18d2b4
Issue #5181 Update to spifly 1.3.0 ( #5182 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-08-24 14:51:17 +02:00
0b0d7d3282
Issue #5133 - Reworking WebAppContext.extraClasspath
...
+ Now parsed by WebAppContext into List<Resource>
+ Reintroduced Resource.fromList
+ Refactored ResourceFactory to never return null
and always throw an exception if unable to
get/create/resolve the Resource
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-12 12:50:02 -05:00
690cdde4ad
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-08-11 19:40:37 +08:00
88a4930951
upgrade librairies to avoid ConcurrentModificationException
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-11 21:39:18 +10:00
e26126264a
Updating to version 11.0.0-SNAPSHOT
2020-08-11 16:48:06 +08:00
6b2b429ba5
Updating to version 11.0.0.beta1
2020-08-11 16:48:06 +08:00
c198d26e6b
Updating to version 10.0.0-SNAPSHOT
2020-08-11 16:47:55 +08:00
429b091578
Updating to version 10.0.0.beta1
2020-08-11 16:47:54 +08:00
e8f76878e3
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
2020-08-04 17:46:55 +02:00
8d69fc41a7
Fixes #5083 - Convert synchronized usages to AutoLock.
...
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
fe9deae849
Updating to version 9.4.32-SNAPSHOT
2020-07-23 13:53:47 -05:00
450ba27947
Updating to version 9.4.31.v20200723
2020-07-23 12:46:54 -05:00
14849a24d6
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-22 11:22:39 +02:00
b5eff0eb6b
Skip javadoc for test-jetty-osgi-webapp-resources war.
2020-07-22 11:21:33 +02:00
a7a2c8aa2e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-21 18:44:09 +02:00
3f5d94f80f
Fix TestJettyOSGiClasspathResources test.
...
Also remove unnecessary deploy of tinybundle for
TestJettyOSGiBootWithJavaxWebSocket.
2020-07-21 18:41:57 +02:00
1b2b721ce3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-21 16:00:20 +02:00
c4ffb65791
Fix new pom and TestJettyOSGiClasspathResource.
...
Test is still a WIP: in jetty-10 there are errors that don't occur in
jetty-9, still investigating.
2020-07-21 15:48:06 +02:00
c791c58a92
Fix pom for test-jetty-osgi-webapp-resources
2020-07-21 14:29:56 +02:00
965e73e9e9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-20 12:01:53 +02:00
89045959ac
Issue #5013 Classloader.getResources resolves preferentially from osgi bundle loader ( #5034 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-20 11:05:18 +02:00
c922b818eb
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-14 16:30:52 +02:00
fb4cfa9be6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-14 15:01:37 +02:00
6d88f966e1
Issue #4736 Use variables for osgi import ranges ( #4963 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-14 14:22:38 +02:00
eefe3d202b
revert fail release
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
9619a5a743
Updating to version 10.0.0.beta1
2020-07-10 14:23:28 +10:00
6ff39cf848
Updating to version 11.0.0-SNAPSHOT
2020-07-10 06:25:08 +10:00
4c250b0f93
Updating to version 11.0.0.beta1
2020-07-10 06:25:07 +10:00
9fa6a5794c
Updating to version 11.0.0-SNAPSHOT
2020-07-09 16:24:52 +10:00
5353ec98e0
Updating to version 11.0.0.beta0
2020-07-09 14:32:48 +10:00
aaeffb719e
Updating to version 10.0.0-SNAPSHOT
2020-07-09 12:25:34 +10:00
23c99ffdbe
Updating to version 10.0.0.beta1
2020-07-09 11:20:55 +10:00
f1be8cc72d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-08 16:35:16 +02:00
f4f85fed44
Fix TestJettyOSGiAnnotationParser.
2020-07-08 16:33:14 +02:00
6c161ca5c0
Fix checkstyle violation.
2020-07-08 09:04:53 +02:00
872b2741be
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-07 14:32:57 +02:00
73919e10e2
Fix headers on new files coming from jetty-9.4
2020-07-07 14:19:53 +02:00
7ca67f9948
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-07 14:13:11 +02:00
0808b5c0fc
Issue #4989 Prevent parsing of module-info.class in osgi bundles ( #4991 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-07 14:07:19 +02:00
50654b0dde
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-06-30 15:47:49 +10:00
02bd1e5956
Followup changes from merge
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-25 12:52:49 -05:00
6df6fa33b8
Updating to version 9.4.31-SNAPSHOT
2020-06-11 08:24:34 -05:00
271836e4c1
Updating to version 9.4.30.v20200611
2020-06-11 07:21:18 -05:00
fc77b3e199
Updating to version 10.0.0-SNAPSHOT
2020-05-30 19:41:49 +10:00
dddc4a58e4
Updating to version 11.0.0-alpha0
2020-05-30 13:27:25 +10:00
4adfe7f976
use dependency from dependencyMngt
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-30 12:09:21 +10:00
a68af19b34
use released version
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-30 11:57:03 +10:00
5d876d46db
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-05-26 10:44:16 +10:00
5d6f3e2ddc
Updating to version 9.4.30-SNAPSHOT
2020-05-21 13:42:25 -05:00
77c232aed8
Updating to version 9.4.29.v20200521
2020-05-21 12:04:14 -05:00
11d14a65b4
Issue #2173 & #2174 - Split websocket-core into client/server/common modules
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
44abef5c58
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-05-08 11:13:04 +10:00
e5cca92199
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketServlet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-01 15:46:03 +10:00
3a3c5e5df3
Fix broken OSGI tests due to websocket-util-server
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-01 01:35:19 +10:00
845fbaa289
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-04-28 11:41:09 +02:00
4bf80d9653
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-04-28 11:40:20 +02:00
e2af6419ae
Issue #4820 jetty-deployer.xml should be jetty-deploy.xml for osgi ( #4821 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-28 11:38:38 +02:00
6ee0f2ebbc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketServlet
2020-04-23 13:53:10 +10:00
4077228553
Fix manifest and re-add @Test annotation
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-22 16:52:28 +02:00
b58697817f
Issue #4722 - create new module websocket-util-server
...
- This module contains the WebSocketUpgradeFilter.
- Also has an internal package with the components used
to implement websocket upgrades common to both the
jetty and javax websocket implementations.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-22 17:26:46 +10:00
a4de309aef
Merge branch jetty-10.0.x into jetty-11.0.x
2020-04-22 10:46:53 +10:00
8516240c03
Tidy up osgi test code, add more to README.txt
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-21 16:51:58 +02:00
69fb6009d8
Make jsp and jstl work for maven plugin,osgi and distro.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-20 15:33:25 +02:00
4869ad7e72
Fix osgi manifests to make all bundles resolve.
...
JSP still needs more work.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-17 16:59:46 +02:00
44f384c4a8
fix more references for javax.mail and jakarta.transaction
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-17 09:53:02 +10:00
3f91a553b0
Fix jetty-annotation, jetty-jndi, jetty-plus, test webapps and start
...
fixing osgi.
2020-04-16 18:45:09 +02:00
b15cfeda91
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-04-16 15:20:43 +02:00
fb8c8270b3
upgrade spifly to 1.2.4 and replace jdk13 build with jdk14 ( #4780 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-16 11:20:43 +10:00
d681f10853
upgrade spifly to 1.2.4 and replace jdk13 build with jdk14 ( #4780 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-16 11:19:47 +10:00
2addb6a655
Jetty 10.0.x use HandlerList instead of HandlerCollection ( #4757 )
...
* Use HandlerList instead of HandlerCollection
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Use HandlerList instead of HandlerCollection
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-04-15 18:42:28 +02:00
5699b9ff3d
Updating to version 9.4.29-SNAPSHOT
2020-04-08 13:15:04 -05:00
ab228fde9e
Updating to version 9.4.28.v20200408
2020-04-08 12:33:56 -05:00
3483e0c2f7
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-04-07 11:39:31 +10:00
4265b1f467
Update test-jetty-osgi README.txt
2020-04-06 11:43:54 +02:00
3e2f27c197
Issue #4683 Fix jetty-slf4j-impl for osgi ( #4684 )
...
* Issue #4683 Fix jetty-slf4j-impl for osgi
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-06 11:35:57 +02:00
efd090d31e
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-31 15:00:48 +10:00
809887de96
more fix with updating the jar used for session serialisation
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-31 14:54:59 +10:00
495a6aca54
re enable osgi
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-31 14:54:59 +10:00
512e21e8e6
temporary disable osgi as it is not the most important
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-31 14:54:59 +10:00
fde16cdceb
wip - updating other dependencies which will need to use servlet 5
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-31 14:54:59 +10:00
5309b4b225
Issue #4568 - update to use jakarta.servlet 5.0.0
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-31 14:54:59 +10:00
200a3216f1
Issue #4568 - use jakarta.websocket for jetty-11
...
- Update the jetty-11.0.x branch to use Jakarta WebSocket API.
- Rename websocket classes, variables and comments using javax to use jakarta instead.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-31 14:54:59 +10:00
e224be650b
Issue #4400 - Review HttpClient's ContentProvider.
...
Review updates.
Closing MultiPartRequestContent before sending it.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-30 12:34:21 +02:00
89c4504d07
Issue #4722 - remove websocket-servlet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-27 16:31:37 +11:00
e215d071c8
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'.
2020-03-23 16:24:04 +01:00
d1cfecb3ce
fix wrong parent
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-21 15:08:00 +10:00
e48f4f07e3
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-20 12:04:57 +10:00
0541c5efb4
fix javadoc aggregate generation by using last maven javadoc plugin 3.2.0 ( #4675 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-19 07:06:13 +10:00
f8d9f82eff
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'.
2020-03-18 11:40:11 +01:00
9bb92f81bd
Issue #4443 - Track backport of ALPN APIs to Java 8.
...
Modified jetty-alpn-openjdk8-* classes to support both
pre 8u252 (via alpn-boot) and post 8u252 (via standard API).
Replaced usages of -Xbootclasspath with -javaagent, and
using Jetty ALPN Agent jar rather than Jetty ALPN boot jar.
Removed all alpn-1.8.0*.mod files since now it is
possible to use a fixed version of the ALPN Agent
to cover all the versions.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:40:29 +01:00
f06c2b1774
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-17 11:27:33 +10:00
57604d0955
Issue #4572 - Mechanical Change to use org.slf4j
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 15:48:25 -05:00
8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J
...
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
org.eclipse.jetty.util.log.Logger but as
simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
to org.eclipse.jetty.logging.StacklessLogging found in
the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
+ and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
+ Also adding note to jetty-util classes that are used by
jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 11:21:54 -05:00
f649bcbe4c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-03-12 18:37:57 +11:00
dfd3875dbc
Jetty 10.0.x 4506 metadata complete ( #4587 )
...
* Issue #4506 Do not introspect annotations on metadata-complete fragments
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-09 15:34:04 +01:00
25966a7108
update version to 11.0.0-SNAPSHOT
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-04 20:50:57 +11:00
1393c0e92b
Issue #4400 - Review HttpClient's ContentProvider.
...
Introduced Request.Content with a reactive model to provide
request content.
Introduced RequestContentAdapter to wrap ContentProviders
into Request.Content.
Updated implementation to use the reactive model rather than
the old pull model.
Reimplemented all ContentProviders in terms of Request.Content.
Converted most of the tests from ContentProvider to Request.Content.
Updated proxy servlets and documentation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-28 14:40:48 +01:00
8aabb52557
Updating to version 9.4.28-SNAPSHOT
2020-02-27 13:03:44 -06:00
a304fd9f35
Updating to version 9.4.27.v20200227
2020-02-27 12:21:57 -06:00
9683142c1e
Fixing merge issue
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 11:42:28 -06:00
5fe202f29f
Issue #4548 - clean up websocket removing duplicated and unused classes ( #4549 )
...
Create new module websocket-util which contains implementation classes shared by websocket-jetty and websocket-javax. Many of these classes had to be changed as the javax and jetty versions of them differed slightly.
Also includes general cleanups, removed unused interfaces and classes, etc..
2020-02-18 21:43:54 +11:00
55748f12c2
Issue #4581 - remove unnecessary javadoc on Override methods
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 11:33:56 +11:00
ce6e146ac1
Merge pull request #4489 from eclipse/jetty-10.0.x-2643-pkcs12_keystores
...
Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
2020-01-30 19:28:49 +01:00
8bd1a7f5bc
Using only non-obfuscated passwords in tests.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-30 18:48:08 +01:00
d74caab345
Issue #4496 Update paxexam for osgi tests ( #4497 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-21 09:48:46 +01:00
56fc476d55
Updating to version 9.4.27-SNAPSHOT
2020-01-17 07:00:10 -06:00
7b38981d25
Updating to version 9.4.26.v20200117
2020-01-17 06:21:47 -06:00
d60b4459bf
Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
...
Updated old keystores to new PKCS12 keystores.
Removed unused keystores and truststores.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-17 09:48:51 +01:00
01a5974f4b
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java
# jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/matchers/HttpFieldsMatchersTest.java
# jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterLenientTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletLifeCycleTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultNoRecompressTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
# jetty-unixsocket/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketClient.java
# jetty-util/src/test/java/org/eclipse/jetty/util/B64CodeTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java
# jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/LargeMessageTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/utils/ReflectUtilsTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/RestartContextTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfigTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilQuoteTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ConnectionManagerTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase11.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase12.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase4.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase73.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScannerTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ConnectionStateTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/http/HttpResponseHeaderParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageDebug.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/Utf8CharBufferTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/UnitGenerator.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8PartialBuilderTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RedirectWebSocketClientTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6BadUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6GoodUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7BadStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7GoodStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java
# pom.xml
# tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationsTest.java
# tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java
# tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
# tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java
2020-01-15 12:20:20 -06:00
8c65309963
Addressing Checkstyle violations in src/test/java
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
5f82e17d2f
Issue #3578 - Adopt EPL-2.0 for Jetty-10.
...
WIP: updated copyright headers for Java files.
TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 20:10:19 +01:00
a5c99207fc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-07 17:02:40 +01:00
923ec38adf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2020-01-07 16:51:25 +01:00
e3c8546667
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2020-01-07 16:35:05 +01:00
de890bb1b7
Happy New Year 2020.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
f4e7e4c3db
Merge branch 'release-9.4.25' into jetty-9.4.x
2020-01-03 12:49:27 -06:00
ff48fba585
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:59:21 +01:00
e1371a1c13
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
db0edf23de
Update websocket artifact IDs
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-23 13:32:21 +11:00
8974176c4b
Updating to version 9.4.26-SNAPSHOT
2019-12-20 11:30:41 -06:00
a9729c7e7f
Updating to version 9.4.25.v20191220
2019-12-20 10:46:56 -06:00
78c57131ae
update values for bundle-symbolic-name
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-20 16:21:34 +11:00
9cfaa414a1
Issue #4238 Pass system properties into xml configurations ( #4390 )
...
* Issue #4238 Pass system properties into xml configurations
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-09 08:33:52 +11:00
149ac97b6f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 11:58:12 +11:00
cfd21864cf
Issue #4350 Remove exclude of MultiInputStreamParser from jetty-util osgi ( #4356 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 11:45:33 +11:00
0f7a3b2d91
Updating to version 9.4.25-SNAPSHOT
2019-11-20 16:08:38 -06:00
363d5f2df3
Updating to version 9.4.24.v20191120
2019-11-20 15:25:01 -06:00
453d41940b
Updating to version 9.4.24-SNAPSHOT
2019-11-18 13:52:51 -06:00
abbccc65d6
Updating to version 9.4.23.v20191118
2019-11-18 13:09:44 -06:00
46a3368f3b
Issue #2578 - Listener behavior cleanup (Jetty 10.0.x) ( #3966 )
...
* Avoid creating listener list for rarely used requestAttributeListener
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
Keep a list of EventListeners in the AbstractConnector to make it
more efficient to add and iterate over them.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Use addEventListener rather than bespoke listener methods.
Support getEventListenerBeans at Container level for fast lookup
improve javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed test
more javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
Don't use null for empty lists of listeners
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fix merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Resolve differences between eventListeners added as beans and beans
added as EventListeners. The behaviour should now be the same
regardless of how they listener is added and all listeners are now
beans.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Add only SelectorManager listeners to manager from connector
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Fixed javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
removed old TODO
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
connector cannot be null
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
AbstractConnector keeps a specific list of HttpChannel.Listeners
to avoid Connection.Listeners and MBean listeners being added to
the HttpChannel listener list.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
removed the ability to set/clear context listeners
Instead just remove non-durable ones.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
Simplified listener handling by avoiding null connector, previously
only needed for testing.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed bad merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
Fixed test that assumed HttpChannel listeners were not cleared by a recycle
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
Separated out durable vs cyclic HttpChannel.Listeners, so as to
simplify handling.
Deprecated cyclic HttpChannel.Listeners, as I'm not sure the channel is
the right place for them.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* removed deprecated cyclic HttpChannel listeners
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* removed deprecated cyclic HttpChannel listeners - import
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4003 Cleanup quickstart
* Fixed tests that scan for "Started" on console
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* updates from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-13 11:04:38 +11:00
b1d231b9e7
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-11 16:45:12 +01:00
c336616c96
Issue #2709 - reduce default headerCacheSize to 1024 ( #4292 )
...
make headerCacheSize on HttpReceiverOverHTTP configurable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-08 21:57:49 +11:00
43d95cd984
Updating to version 9.3.29-SNAPSHOT
2019-11-05 13:02:10 -06:00
d7dd68d6e9
Updating to version 9.3.28.v20191105
2019-11-05 11:46:40 -06:00
b17439c731
Updating to version 9.2.30-SNAPSHOT
2019-11-05 11:23:21 -06:00
36c95fdd43
Updating to version 9.2.29.v20191105
2019-11-05 10:43:15 -06:00
dd53a8d70f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-05 09:17:29 +11:00
869c3b51ce
Issue #4265 Remove doError ( #4266 )
...
* Issue #4265 Remove doError
The doError method and the ErrorDispatchHandler class were
hang overs from when we needed to dispatch into a context to get sendError called, which would then generate the error page.
Now sendError doesn't do any generation, rather it changes state that arranges either for a minimal error page to be generated or an ERROR dispatch to a real handler/servlet to generate the error page.
Thus the ErrorDispatchHandler and doError methods can now be removed.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4265 Remove doError
Moved the error page dispatching logic back to the ErrorHandler class to assist with backwards compatibility
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4265 Remove doError
Moved the error page dispatching logic back to the ErrorHandler class to assist with backwards compatibility
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4265 doError
Updates from review.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-05 08:45:46 +11:00
1ed13b6b30
Updating to version 9.4.23-SNAPSHOT
2019-10-22 09:19:41 -05:00
b1e6b55512
Updating to version 9.4.22.v20191022
2019-10-22 08:20:50 -05:00
d7a189fa18
Updating to version 10.0.0-SNAPSHOT
2019-10-03 12:05:26 -05:00
fd6a2cb9f6
Updating to version 10.0.0.alpha1
2019-10-03 11:25:06 -05:00
7807eafad9
Updating to version 9.4.22-SNAPSHOT
2019-09-26 10:46:28 -05:00
72970db61a
Updating to version 9.4.21.v20190926
2019-09-26 09:59:15 -05:00
f7a0156961
Merge 9.4.x
2019-09-05 13:20:19 -04:00
3a6b26d292
fix typo ( #4055 )
...
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
2019-09-05 13:17:30 -04:00
189ba7a671
Merge from 9.4.x
2019-09-02 14:49:33 -04:00
49ba6d1acb
fix typo and grammar ( #4045 )
...
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
2019-09-02 14:29:50 -04:00
8f383faf78
Issue #3872 Javax Websocket Packaging ( #3873 )
...
* Issue #3872 Javax Websocket Packaging
Moved JaxaxWebSocketConfiguration and SCI to config package.
Limited classpath exposure in JavaxConfiguration (more needed)
Updated tests with work around for those that needs more classes exposed
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3872 Javax Websocket Packaging
Moved all remaining classes from org.eclipse.jetty.websocket.javax.server
to org.eclipse.jetty.websocket.javax.server.internal.
This works when running on the classpath, but the tests fail when running
on the modulepath (eg in commandline mvn run). The issue appears to be
that the tests don't load test classes from WEB-INF/lib or WEB-INF/classes.
Instead the test classes were themselves in org.eclipse.jetty.websocket.javax.server,
which is no longer exported from module-info.java.
The hacked "fix" for this has been to create a org.eclipse.jetty.websocket.javax.server.tests
package which is exported and to move all the tests to that. A better fix is needed.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3872 Javax Websocket Packaging
improve comments
tighten exposed classes more
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3872 - fixing tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3872 - move ContainerDefaultConfigurator to config package
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3873 - fix javax websocket test classloader issues
move websocket endpoints for test webapps to com.acme.websocket package
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-08-28 10:03:46 +10:00
a36af67abf
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-22 20:45:57 +10:00
fe3d3f7158
fix checkstyle in test sources ( #4013 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 19:56:41 +10:00
f1efc99918
Updating to version 9.4.21-SNAPSHOT
2019-08-13 17:34:20 -05:00
84700530e6
Updating to version 9.4.20.v20190813
2019-08-13 16:13:21 -05:00
ae004171e0
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-30 11:21:31 +10:00
1b6bf389d6
Jetty 9.4.x pax exam upgrade for central repo https, pre download all artifacts for maven its ( #3902 )
...
* ensure we use local repository first to avoid download, upgrade pax versions
pre download artifacts to avoid download by maven invoker its
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* force using local repository first see https://issues.apache.org/jira/browse/MINVOKER-249
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use local setttings to use mirrors
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use https
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* install build resources first to avoid checkstyle build issue
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* downgrade pax-swissbox-framework as the pax exam seems to use this one and want to download it...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix enforcer rule RequireUpperBoundDeps...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* not used anymore
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* force pax url to use provided settings via Jenkins withMvn
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* renove debugging System.out
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* version is defined in the project
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* cleanup after Jan review comments
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-30 11:13:54 +10:00
d10df5875e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-07-12 11:10:44 +02:00
4d4a7dc101
Issue #3870 Update to spifly 1.2.3
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-12 11:07:18 +02:00
6df9ef3a15
Updating to version 10.0.0-SNAPSHOT
2019-07-12 06:54:56 +10:00
8cbfd51e80
Updating to version 10.0.0-alpha0
2019-07-12 06:54:56 +10:00
a34e641a27
Updating to version 10.0.0-SNAPSHOT
2019-07-11 17:20:27 +10:00
2e58f2f515
Updating to version 10.0.0-alpha0
2019-07-11 14:19:45 +10:00
d744d097de
Checkstyle cleanup ( #3847 )
...
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 17:24:08 +02:00
b7a7a53a18
Jetty 10.0.x reformat ( #3812 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"
# Conflicts:
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml
* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
9706d70484
Jetty 9.4.x reformat ( #3811 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
internal default values.
We want to keep those values as a hedge against future default
value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
479eb77f6a
Merge pull request #3797 from eclipse/jetty-10.0.x-remove-deprecated
...
Remove deprecated in Jetty 10.0.x
2019-06-21 14:27:34 -05:00
343cf732b9
Issue #3789 XmlConfiguration Set Property ( #3790 )
...
Issue #3789 XmlConfiguration Set Property
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:04:53 +02:00
fe051bf392
Removing deprecated methods in Jetty 10
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 11:41:42 -05:00
372ed1455f
Issue #3661 - review of exposed classes in jetty-websocket-server ( #3779 )
...
* Issue #3661 - review of exposed classes in jetty-websocket-server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3762 - cleanups of jetty-websocket-server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-17 17:12:46 +10:00
60d8661890
Merge `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
# jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
# jetty-http/src/test/java/org/eclipse/jetty/http/QuotedCSVTest.java
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
# jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
# jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
# jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
# jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
# jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
# jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java
2019-06-13 14:14:42 -05:00
40e9e053b9
Merge pull request #3768 from eclipse/jetty-9.4.x-3708-stringutil-replace
...
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
2019-06-13 14:01:35 -05:00
877815e195
Issue #3708 - Adding new methods and converting codebase to use them
...
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 09:56:41 -05:00
33fe55c339
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
...
+ StringUtil.replace()
+ StringUtil.replaceFirst()
+ StringUtil.sanitizeFileSystemPath()
Change existing usages of String.replace() to either
use new StringUtil.replace() or other methods elsewhere
that better suit that specific need.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 11:25:50 -05:00
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
68a9498092
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 11:51:55 -05:00
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
826d68e80a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-10 11:41:47 +02:00
6686083462
Issue #3743 - Using only Location based XmlConfiguration in Jetty itself
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 11:55:01 -05:00
043521ce26
Cleanup webappconfiguration ( #3703 )
...
* Cleanup webappconfiguration
* formatting fix
* cleanup examples and OSGi
* disable classloader test until 9.4.19 is released with #3726 is fixed
* cleanup from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-05 11:53:56 +02:00
c578798370
Fixes #3197 - Use jetty specific websocket API jar.
...
Introduced jetty-javax-websocket-api artifact with proper
OSGi manifest entries and JPMS Automatic-Module-Name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-10 19:33:12 +02:00
734be56938
Updating to version 9.4.19-SNAPSHOT
2019-04-29 16:27:23 -05:00
e1bc35120a
Updating to version 9.4.18.v20190429
2019-04-29 15:40:33 -05:00
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
5882d63ba7
Updating to version 9.3.28-SNAPSHOT
2019-04-18 13:54:17 -05:00
d3e249f869
Updating to version 9.3.27.v20190418
2019-04-18 13:10:03 -05:00
2c14d93885
Updating to version 9.2.29-SNAPSHOT
2019-04-18 12:17:07 -05:00
1dffa36fe3
Updating to version 9.2.28.v20190418
2019-04-18 11:23:17 -05:00
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
9b19374c5d
Updating to version 9.2.28-SNAPSHOT
2019-04-03 19:38:05 -05:00
84dfe74b97
Updating to version 9.2.27.v20190403
2019-04-03 19:04:45 -05:00
c70034766e
Updating to version 9.3.27-SNAPSHOT
2019-04-03 18:46:31 -05:00
dae476e369
Updating to version 9.3.26.v20190403
2019-04-03 18:16:32 -05:00
2ccde9772b
Undoing bad release-9.3.26
2019-04-03 18:11:16 -05:00
81356d9d18
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:47:45 -05:00
cd3e8f0cd2
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:47:33 -05:00
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
7ec6d2fb32
Updating to version 9.3.26.v20190403
2019-04-03 13:06:51 +11:00
9c13cf3a52
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-02 17:37:56 +02:00
6fb243ff6c
Issue #3464 - Split SslContextFactory into Client and Server
...
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.
Refactored configuration checking so that warnings are not emitted
when non necessary.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
ec8a1bdb23
Merge pull request #3313 from eclipse/jetty-10.0.x-1350-dynamic_client_transport
...
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
2019-03-19 15:31:11 +01:00
95a6b76851
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-03-15 16:00:59 -05:00
123918018e
Issue #3425 - Upgrade conscrypt version to 2.0.0 and remove usage of reflection.
...
Small fixes after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-15 09:19:16 +01:00
a21dab222f
fix simone review comments
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 16:29:21 +01:00
e2ddfbde00
Issue #3425 upgrade conscrypt to 2.0.0 disable TLSv1.3 for jdk8 tests
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
aa211b033d
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
...
Introduced `HttpClientTransportDynamic` to be able to switch transport dynamically.
Refactored other transports and HttpDestination, removing now unnecessary classes.
Introduced ProxyProtocolClientConnectionFactory and used it for testing.
Updated OSGi tests now that jetty-client depends on jetty-alpn-client.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-06 10:26:10 +01:00
715bac2660
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageBinaryCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageTextCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryWholeMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextWholeMessage.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/EchoTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/OutgoingFramesCapture.java
2019-03-04 09:44:47 -05:00
5658bf96f6
Issue #1676 - Removing Deprecated Resource.getURL()
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 10:21:42 -05:00
e476cec6d3
Issue #1676 - Removing deprecated methods and classes
...
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-28 17:54:28 -05:00
f5b3ddc1a5
Adding optionalRemoteDebug feature to test-jetty-osgi
2019-02-28 16:10:46 -05:00
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
1c55e2bf79
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.annotation -> jakarta.annotation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 18:56:16 +01:00
b786a2c826
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:27:45 +01:00
875af5c692
Restored Automatic-Module-Name that was removed in 471dab752.
...
Cleaned up pom.xml files that required a correct JPMS module name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:16:07 +01:00
olivier lamy
Joakim Erdfelt
Jan Bartel
gregw
Lachlan Roberts
dependabot[bot]
Simone Bordet
Chris Walker
康智冬
olivier lamy