Commit Graph

227 Commits

Author SHA1 Message Date
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 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
Joakim Erdfelt 0b5a8789f0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-28 18:04:41 -05:00
Joakim Erdfelt deb3d60d11
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-28 18:04:32 -05:00
Joakim Erdfelt 9e54e9a081
Post merge cleanup.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 18:04:20 -05:00
Joakim Erdfelt 1f2ccda056
Adding missing tests post-merge
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 17:58:57 -05:00
Joakim Erdfelt 3c7cd43148
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-28 17:55:41 -05:00
Joakim Erdfelt 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
Greg Wilkins fd0877939e update 10 to 11
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-28 14:25:49 +02:00
Greg Wilkins a078d81003 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-28 14:18:06 +02:00
Greg Wilkins 665c42ffe8 Fixed references to jetty 9 & 10
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-28 14:15:56 +02:00
Greg Wilkins aabfbf0e0e fixed bad merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-28 13:44:22 +02:00
Greg Wilkins 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
dependabot[bot] 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
Joakim Erdfelt eebd33d3e0
Fixing post-merge build & tests 2020-09-25 15:40:57 -05:00
Joakim Erdfelt d00a7016a2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-25 14:59:06 -05:00
Joakim Erdfelt 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
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 ca7db8be32
Moving /examples/ to /demos/
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-24 10:39:13 -05:00
Joakim Erdfelt f7dedd8e7d
Addressing javadoc aggregate issues under JPMS
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-24 09:04:28 -05:00
Joakim Erdfelt 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
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 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
Joakim Erdfelt 5d73b42fb3
Issue #5264 -Fixing name
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 17:42:34 -05:00
Joakim Erdfelt 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
Joakim Erdfelt 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