Commit Graph

1653 Commits

Author SHA1 Message Date
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Joakim Erdfelt d5b08ea9f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-11 11:40:10 -06:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text
Issue #5784 - fix dual license text
2020-12-11 11:37:58 -06:00
olivier lamy efe4f5e5ea Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-11 12:11:53 +10:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735)
* enable spotbugs in CI

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

record issues

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

use warning new generation

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

activate errorprone

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix Jenkinsfile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

junit should allow empty results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

maven console can be use only once...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

one liner

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

recordissues only once

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

force id

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

aggregate results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

configure a name for aggregated reports

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

mo more -T3 no need anymore of remote session test profile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

I want to see what failing tests look like with new report.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

skip spotbugs for jetty-jmh

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

get rid of findbugs as we now have spotbugs

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

make pmd quiet for CI

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

remove -fae flag and do not display transfer progress

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

try junitParser() to see what it does

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

junit parser is a bad idea...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

increase timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

no -T2 for javadoc

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix skip spotbugs and pmd verbose

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 11:47:26 +10:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
Joakim Erdfelt d0572ada58
Merge remote-tracking branch 'origin/release-11.0.0' into jetty-11.0.x 2020-12-09 15:28:50 -06:00
Joakim Erdfelt 0a70fbf206
Merge remote-tracking branch 'origin/release-10.0.0' into jetty-10.0.x 2020-12-09 15:28:26 -06:00
olivier lamy 61aac5abb5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-07 21:15:26 +10:00
olivier lamy aabe5ceee2 remove duplicate dependencies
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-07 21:14:59 +10:00
Joakim Erdfelt 30bd8b9fba Updating to version 11.0.1-SNAPSHOT 2020-12-02 15:59:13 -06:00
Joakim Erdfelt 432f896d7a Updating to version 11.0.0 2020-12-02 15:35:56 -06:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Joakim Erdfelt cc9b41cf17
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 14:53:52 -06:00
Joakim Erdfelt 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
Jan Bartel a3c116f8a0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 18:48:05 +01:00
Jan Bartel 37882236a6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-12-02 18:35:49 +01:00
Jan Bartel 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
Joakim Erdfelt ddef266fe7
Fixing comment
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-02 10:54:13 -06:00
gregw 1768bd898f Fix #5739 Remove distribution from doco
Mostly mechanical fixes
2020-12-02 09:16:29 +01:00
Lachlan Roberts cf9a807d67 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 12:04:23 +11:00
Lachlan 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
Joakim Erdfelt fe0a4f624e
Merge remote-tracking branch 'origin/release-9.4.35' into jetty-9.4.x 2020-11-25 15:56:09 -06:00
dependabot[bot] 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
Olivier Lamy 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
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
dependabot[bot] 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
Jan Bartel 1d3e190e53 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-18 10:55:12 +01:00
Jan Bartel 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
Joakim Erdfelt d30d95c26c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-17 09:20:25 -06:00
Joakim Erdfelt e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-17 09:12:50 -06:00
Joakim Erdfelt 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
Lachlan Roberts 3a2095a7b0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-12 10:57:06 +11:00
Lachlan Roberts 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
Lachlan Roberts f0a58bcfdd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-11 14:25:22 +11:00
Lachlan Roberts 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
dependabot[bot] 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
Lachlan Roberts e842c16bb4 osgi AnnotationConfiguration should replace the standard one
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 00:55:01 +11:00
Lachlan Roberts bd553d98e5 fixing badly formatted XML comments
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:51:35 +11:00
Joakim Erdfelt 71ad5447a4
Merge remote-tracking branch 'origin/release-9.4.34' into jetty-9.4.x 2020-11-04 10:24:21 -06:00
Joakim Erdfelt c97670fdc9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-03 14:13:11 -06:00
Joakim Erdfelt 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
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 eb5927ef8c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-03 13:57:17 -06:00
Joakim Erdfelt 18049e9dec
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-03 13:57:03 -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 c182595a0f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-28 11:35:12 -05: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 cd913f028a Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-10-19 18:31:06 +02: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
Lachlan Roberts 9fa6d5f825 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 17:10:37 +11: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
Joakim Erdfelt e3118baf11
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-05 05:43:09 -05: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 c223ee37ab Updating to version 11.0.0-SNAPSHOT 2020-10-02 16:38:23 -05:00
Joakim Erdfelt 9ce21ec22b Updating to version 11.0.0.beta2 2020-10-02 16:20:55 -05: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 05c7bdf085
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-30 10:05:20 -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 c682f95639
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 11:44:04 -05:00
Joakim Erdfelt 88f3dd5a52
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 11:37:46 -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 eebd33d3e0
Fixing post-merge build & tests 2020-09-25 15:40:57 -05:00
Joakim Erdfelt fcc3b6b4cd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-25 10:09:58 -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 8b6031155c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-22 16:05:43 -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
Lachlan Roberts 8d526af3a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-10 11:07:44 +10: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 e47d2fb32b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-24 17:20:56 +02: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 63bb757f37 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-24 14:59:51 +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 690cdde4ad Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-11 19:40:37 +08: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 e26126264a Updating to version 11.0.0-SNAPSHOT 2020-08-11 16:48:06 +08:00
olivier lamy 6b2b429ba5 Updating to version 11.0.0.beta1 2020-08-11 16:48:06 +08: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 e8f76878e3 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-08-04 17:46:55 +02: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 14849a24d6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-22 11:22:39 +02:00
Jan Bartel b5eff0eb6b Skip javadoc for test-jetty-osgi-webapp-resources war. 2020-07-22 11:21:33 +02:00
Jan Bartel a7a2c8aa2e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-21 18:44:09 +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 1b2b721ce3 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-21 16:00:20 +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 c922b818eb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-14 16:30:52 +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 6ff39cf848 Updating to version 11.0.0-SNAPSHOT 2020-07-10 06:25:08 +10:00
olivier lamy 4c250b0f93 Updating to version 11.0.0.beta1 2020-07-10 06:25:07 +10:00
olivier lamy 9fa6a5794c Updating to version 11.0.0-SNAPSHOT 2020-07-09 16:24:52 +10:00
olivier lamy 5353ec98e0 Updating to version 11.0.0.beta0 2020-07-09 14:32:48 +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 f1be8cc72d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-08 16:35:16 +02: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 872b2741be Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-07 14:32:57 +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
Lachlan Roberts 50654b0dde Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-30 15:47:49 +10: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
olivier lamy fc77b3e199 Updating to version 10.0.0-SNAPSHOT 2020-05-30 19:41:49 +10:00
olivier lamy dddc4a58e4 Updating to version 11.0.0-alpha0 2020-05-30 13:27:25 +10:00
olivier lamy 4adfe7f976 use dependency from dependencyMngt
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-30 12:09:21 +10:00
olivier lamy a68af19b34 use released version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-30 11:57:03 +10:00
Lachlan Roberts 5d876d46db Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-05-26 10:44:16 +10: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 44abef5c58 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-05-08 11:13:04 +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 845fbaa289 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-04-28 11:41:09 +02: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
Jan Bartel 4077228553 Fix manifest and re-add @Test annotation
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-22 16:52:28 +02: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
Lachlan Roberts a4de309aef Merge branch jetty-10.0.x into jetty-11.0.x 2020-04-22 10:46:53 +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
Jan Bartel 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
Jan Bartel 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
olivier lamy 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
Jan Bartel 3f91a553b0 Fix jetty-annotation, jetty-jndi, jetty-plus, test webapps and start
fixing osgi.
2020-04-16 18:45:09 +02:00
Jan Bartel b15cfeda91 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-04-16 15:20:43 +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
olivier lamy 3483e0c2f7 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-04-07 11:39:31 +10: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
olivier lamy efd090d31e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-03-31 15:00:48 +10:00
olivier lamy 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
olivier lamy 495a6aca54 re enable osgi
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-31 14:54:59 +10:00
olivier lamy 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
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 d1cfecb3ce fix wrong parent
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-21 15:08:00 +10:00
olivier lamy e48f4f07e3 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-03-20 12:04:57 +10: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
olivier lamy f06c2b1774 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-03-17 11:27:33 +10: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
Lachlan Roberts f649bcbe4c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-03-12 18:37:57 +11: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
Lachlan Roberts 25966a7108 update version to 11.0.0-SNAPSHOT
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-04 20:50:57 +11: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