Commit Graph

88 Commits

Author SHA1 Message Date
Jan Bartel 4ff96f6a87 Issue #5992 Change more modules to glassfish-jstl
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-19 20:55:49 +01:00
Joakim Erdfelt 01fb5769f4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-15 14:18:34 -06:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt da63fcfe82
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-15 12:26:30 -06:00
Joakim Erdfelt d6572823b9
Issue #5966 - Remove /webapps from jetty-home
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-11 08:04:29 -06:00
olivier lamy 3576909019 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-28 10:57:19 +10:00
Joakim Erdfelt fcbbf8ab55
Cleaning up demos/embedded
+ Removing JettyHome.java
+ Removing JettyDemoBase.java
+ Introducing JettyDemos.java to find
  content in the /demos/ directory

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-26 12:57:49 -06:00
olivier lamy a2270fe74a Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-26 21:25:24 +10:00
olivier lamy b214837c78 use local repo to download mod files
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-26 21:03:56 +10:00
Joakim Erdfelt 10136235b2
Happy New Year 2021 (Jetty 11 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:22:28 -06:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Simone Bordet 7b1e64f6a5 Issue #5880 - Move test-simple-webapp to demos.
Adding dependency to jstl.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 17:25:24 +01:00
Simone Bordet bacb4b2555 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 16:23:32 +01:00
Simone Bordet 9fe5700260
Fixes #5880 - Move test-simple-webapp to demos. (#5881)
* Fixes #5880 - Move test-simple-webapp to demos.

Moved test-simple-webapp to demos under demo-simple-webapp.
Moved the JSP demos into their own module: out of demo-jetty-webapp into demo-jsp-webapp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 15:27:03 +01:00
Olivier Lamy 06df421b56
Remove javax.* dependencies (#5776)
remove non needed enforcer rule in websocket poms
force search transitive

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-22 08:17:16 +10:00
olivier lamy cedfea1d9e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-16 18:22:21 +10:00
olivier lamy 5d64ba0653 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-16 18:21:33 +10: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 7bda9e8d59 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-11 16:50:10 +10:00
olivier lamy 56ff8e8d35 force using local repository
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 15:32:41 +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
Jan Bartel 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
Jan Bartel 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
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
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
Simone Bordet 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
Simone Bordet 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
Lachlan Roberts 79f646411f fix websocket test in demo-jetty-webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-25 18:39:55 +11: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
olivier lamy 0d40a210fc Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-11-18 21:29:20 +10:00
Olivier Lamy 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
Jan Bartel 83e5b3fc04 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-17 15:49:00 +01:00
Jan Bartel 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
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
Joakim Erdfelt 5be2ee1032
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-03 14:00:11 -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 60fa27f12f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 08:52:05 -05:00
Joakim Erdfelt e12c3ce50b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 08:11:42 -05:00
Lachlan Roberts 8a34442967 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 15:41:55 +11:00