Commit Graph

1424 Commits

Author SHA1 Message Date
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 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 aabe5ceee2 remove duplicate dependencies
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-07 21:14:59 +10: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 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 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 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
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 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 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 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 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 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 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