Joakim Erdfelt
4fd75a02ab
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-03 13:59:52 -06:00
Joakim Erdfelt
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
Joakim Erdfelt
edaadff55b
Updating to version 9.4.35-SNAPSHOT
2020-11-02 09:04:51 -06:00
Joakim Erdfelt
e46af88704
Updating to version 9.4.34.v20201102
2020-11-02 08:03:51 -06:00
dependabot[bot]
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
dependabot[bot]
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
Joakim Erdfelt
7f8169b8a3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-10-28 11:33:55 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
e726eefb0b
Updating to version 9.4.34-SNAPSHOT
2020-10-20 18:55:39 -05:00
Joakim Erdfelt
1be6875565
Updating to version 9.4.33.v20201020
2020-10-20 18:28:51 -05:00
Simone Bordet
a949afef64
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-10-19 18:24:38 +02:00
Jan Bartel
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
dependabot[bot]
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
Greg Wilkins
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
dependabot[bot]
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
Joakim Erdfelt
85e257fc98
Updating to version 9.4.33-SNAPSHOT
2020-09-30 11:53:09 -05:00
Joakim Erdfelt
de97d26f7b
Updating to version 9.4.32.v20200930
2020-09-30 11:03:24 -05:00
Joakim Erdfelt
525fc249ea
Fixing testcase expectation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-30 10:04:51 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-09-29 11:24:28 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
32875aa564
Issue #5264 - Fixing OSGi tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 17:56:58 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
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
gregw
88a110ed0f
added ALPN dependency for jdk8
...
Signed-off-by: gregw <gregw@webtide.com>
2020-09-16 15:17:01 +02:00
dependabot[bot]
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
dependabot[bot]
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
Joakim Erdfelt
ccc863726b
Issue #5133 - Updates based on review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-26 12:19:22 -05:00
Jan Bartel
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
Jan Bartel
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
Joakim Erdfelt
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
olivier lamy
88a4930951
upgrade librairies to avoid ConcurrentModificationException
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-11 21:39:18 +10:00
olivier lamy
c198d26e6b
Updating to version 10.0.0-SNAPSHOT
2020-08-11 16:47:55 +08:00
olivier lamy
429b091578
Updating to version 10.0.0.beta1
2020-08-11 16:47:54 +08:00
Simone Bordet
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
Joakim Erdfelt
fe9deae849
Updating to version 9.4.32-SNAPSHOT
2020-07-23 13:53:47 -05:00
Joakim Erdfelt
450ba27947
Updating to version 9.4.31.v20200723
2020-07-23 12:46:54 -05:00
Jan Bartel
b5eff0eb6b
Skip javadoc for test-jetty-osgi-webapp-resources war.
2020-07-22 11:21:33 +02:00
Jan Bartel
3f5d94f80f
Fix TestJettyOSGiClasspathResources test.
...
Also remove unnecessary deploy of tinybundle for
TestJettyOSGiBootWithJavaxWebSocket.
2020-07-21 18:41:57 +02:00
Jan Bartel
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
Jan Bartel
c791c58a92
Fix pom for test-jetty-osgi-webapp-resources
2020-07-21 14:29:56 +02:00
gregw
965e73e9e9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-20 12:01:53 +02:00
Jan Bartel
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
Jan Bartel
fb4cfa9be6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-14 15:01:37 +02:00
Jan Bartel
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
olivier lamy
eefe3d202b
revert fail release
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
olivier lamy
9619a5a743
Updating to version 10.0.0.beta1
2020-07-10 14:23:28 +10:00
olivier lamy
aaeffb719e
Updating to version 10.0.0-SNAPSHOT
2020-07-09 12:25:34 +10:00
olivier lamy
23c99ffdbe
Updating to version 10.0.0.beta1
2020-07-09 11:20:55 +10:00
Jan Bartel
f4f85fed44
Fix TestJettyOSGiAnnotationParser.
2020-07-08 16:33:14 +02:00
Jan Bartel
6c161ca5c0
Fix checkstyle violation.
2020-07-08 09:04:53 +02:00
Jan Bartel
73919e10e2
Fix headers on new files coming from jetty-9.4
2020-07-07 14:19:53 +02:00
Jan Bartel
7ca67f9948
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-07 14:13:11 +02:00
Jan Bartel
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
Joakim Erdfelt
02bd1e5956
Followup changes from merge
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-25 12:52:49 -05:00
Joakim Erdfelt
6df6fa33b8
Updating to version 9.4.31-SNAPSHOT
2020-06-11 08:24:34 -05:00
Joakim Erdfelt
271836e4c1
Updating to version 9.4.30.v20200611
2020-06-11 07:21:18 -05:00
Joakim Erdfelt
5d6f3e2ddc
Updating to version 9.4.30-SNAPSHOT
2020-05-21 13:42:25 -05:00
Joakim Erdfelt
77c232aed8
Updating to version 9.4.29.v20200521
2020-05-21 12:04:14 -05:00
Lachlan Roberts
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
Lachlan Roberts
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
Lachlan Roberts
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
Jan Bartel
4bf80d9653
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-04-28 11:40:20 +02:00
Jan Bartel
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
Lachlan Roberts
6ee0f2ebbc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketServlet
2020-04-23 13:53:10 +10:00
Lachlan Roberts
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
Jan Bartel
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
Olivier Lamy
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
Olivier Lamy
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
Greg Wilkins
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
Joakim Erdfelt
5699b9ff3d
Updating to version 9.4.29-SNAPSHOT
2020-04-08 13:15:04 -05:00
Joakim Erdfelt
ab228fde9e
Updating to version 9.4.28.v20200408
2020-04-08 12:33:56 -05:00
Jan Bartel
4265b1f467
Update test-jetty-osgi README.txt
2020-04-06 11:43:54 +02:00
Jan Bartel
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
Simone Bordet
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
Lachlan Roberts
89c4504d07
Issue #4722 - remove websocket-servlet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-27 16:31:37 +11:00
Simone Bordet
e215d071c8
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'.
2020-03-23 16:24:04 +01:00
Olivier Lamy
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
Simone Bordet
f8d9f82eff
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'.
2020-03-18 11:40:11 +01:00
Simone Bordet
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Jan Bartel
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
Simone Bordet
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
Joakim Erdfelt
8aabb52557
Updating to version 9.4.28-SNAPSHOT
2020-02-27 13:03:44 -06:00
Joakim Erdfelt
a304fd9f35
Updating to version 9.4.27.v20200227
2020-02-27 12:21:57 -06:00
Joakim Erdfelt
9683142c1e
Fixing merge issue
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 11:42:28 -06:00
Lachlan
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
Lachlan Roberts
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
Simone Bordet
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
Simone Bordet
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
Jan Bartel
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
Joakim Erdfelt
56fc476d55
Updating to version 9.4.27-SNAPSHOT
2020-01-17 07:00:10 -06:00
Joakim Erdfelt
7b38981d25
Updating to version 9.4.26.v20200117
2020-01-17 06:21:47 -06:00
Simone Bordet
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
Joakim Erdfelt
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
Joakim Erdfelt
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