cedfea1d9e
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-12-16 18:22:21 +10:00
5d64ba0653
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-12-16 18:21:33 +10:00
d5b08ea9f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-12-11 11:40:10 -06:00
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
7bda9e8d59
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-12-11 16:50:10 +10:00
56ff8e8d35
force using local repository
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 15:32:41 +10:00
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
d0572ada58
Merge remote-tracking branch 'origin/release-11.0.0' into jetty-11.0.x
2020-12-09 15:28:50 -06:00
c4f8afc178
Fix Servlet 5 Schema redirects ( #5765 )
...
* Issue #5752 Fix servlet 5 redirects; update default servlet version
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-08 16:24:29 +01:00
adb8a4eafd
Issue #5759 Update jakarta transaction mail and inject apis ( #5760 )
...
* Issue #5759 Update jakarta transaction mail and inject apis
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-08 15:59:12 +01: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
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
67adf464a1
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 11:27:45 +01:00
5d83f6670a
Fixes #3080 - Do not create and use jars with "tests" classifier.
...
Removed the jetty-server and jetty-servlet test-jar artifacts.
The only one left is the jetty-maven-plugin test-jar.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-25 19:16:50 +01:00
79f646411f
fix websocket test in demo-jetty-webapp
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-25 18:39:55 +11: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
0d40a210fc
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-11-18 21:29:20 +10:00
33f413b37a
Jetty 10.0.x surefire upgrade and no skip errors ( #5438 )
...
* fix apacheds version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* get some logs
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* more debug
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* testing surefire M5
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* already part of the classpath
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* add slf4j-simple to get logs
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* execute full build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* no need to add jmx module
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use h2spec-reports
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* h2 spec tests are too flaky
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* debug
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* touch trigger build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* not trim stacktrace per default and a bit more memory for test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* disable embedded jmx test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* nit
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* no junit files for javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix dependency version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix missing dependency with surefire M5...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* remove debug
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix some upperbound dependency
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fail quickly
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-18 21:26:38 +10:00
83e5b3fc04
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-17 15:49:00 +01:00
ac6444f6ff
Issue #5272 Clean up LoginServices and LoginModules ( #5641 )
...
* Issue #5272 Clean up LoginServices and LoginModules
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-11-17 15:40:12 +01: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
5be2ee1032
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-03 14:00:11 -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
60fa27f12f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-10-16 08:52:05 -05:00
e12c3ce50b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-10-16 08:11:42 -05:00
8a34442967
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-10-16 15:41:55 +11:00
5800f4605f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-10-16 15:37:24 +11: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
da39314499
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-10-02 15:49:44 -05:00
1235539637
Addressing a fault in demo-*-javadoc.jar generated files during deploy
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-02 15:42:02 -05:00
f7fca28c50
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-30 08:48:22 -05:00
26dbe07987
General cleanup of html & links
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-30 08:46:14 -05:00
d81a85cd11
Fixing bad service file from last merge.
2020-09-30 08:25:41 -05:00
0284d8b267
fix build
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-30 14:16:31 +10: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
daac7dce31
Fixing Distribution Proxy testcase
...
+ Including jetty-client in demo-proxy-webapp
+ Cleaning up redundant reference to alpn-client
in jetty-proxy
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 06:03:21 -05:00
0b5a8789f0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-28 18:04:41 -05:00
deb3d60d11
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-28 18:04:32 -05:00
9e54e9a081
Post merge cleanup.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 18:04:20 -05:00
1f2ccda056
Adding missing tests post-merge
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 17:58:57 -05:00
3c7cd43148
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-09-28 17:55:41 -05:00
a9f728f49c
Issue #5360 - removing dependency to demo-jndi from demo-spec ( #5364 )
...
* Issue #5360 - removing dependency to demo-jndi from demo-spec
+ Adding demo-jndi dep to demo.mod instead.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 14:33:06 -05:00
fd0877939e
update 10 to 11
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-28 14:25:49 +02:00
a078d81003
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-28 14:18:06 +02:00
665c42ffe8
Fixed references to jetty 9 & 10
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-28 14:15:56 +02:00
aabfbf0e0e
fixed bad merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-28 13:44:22 +02:00
2d1cc51800
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-28 13:41:35 +02:00
e82365b7f4
Bump jsp-api from 2.1 to 2.2
...
Bumps jsp-api from 2.1 to 2.2.
Signed-off-by: dependabot[bot] <support@github.com>
2020-09-28 06:26:33 +00:00
eebd33d3e0
Fixing post-merge build & tests
2020-09-25 15:40:57 -05:00
d00a7016a2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-09-25 14:59:06 -05:00
d77911e34f
Cleanup of demo modules
...
+ Adding /demos/demo-mock-resources/ to keep things
stable for the demos
+ Fixing links in index.html
+ Allowing FileInitializer to "download" from things
that are not HTTP
+ Documenting local-deploy testing in jetty-home
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-25 14:56:32 -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
ca7db8be32
Moving /examples/ to /demos/
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-24 10:39:13 -05:00
f7dedd8e7d
Addressing javadoc aggregate issues under JPMS
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-24 09:04:28 -05:00
35bca82e35
Issue #5264 - Addressing (some) aggregate-javadoc issues
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 20:20:27 -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
73fe2ecfe8
Issue #5264 - Fixing demo-async-rest module reference
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 18:52:04 -05:00
5d73b42fb3
Issue #5264 -Fixing name
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 17:42:34 -05:00
1feb60bb2c
Issue #5264 - Updating Configure DTD to 10_0 for Demos
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 13:52:30 -05:00
faf6d80390
Issue #5264 - Moving demo webapps to /demos/ tree
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 13:35:19 -05:00
olivier lamy
Joakim Erdfelt
Jan Bartel
gregw
Lachlan Roberts
Simone Bordet
dependabot[bot]