Commit Graph

21809 Commits

Author SHA1 Message Date
Joakim Erdfelt 61eab91437
Correcting upperbounds enforcer rule check on jetty-http-tools
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 03:27:13 -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 8b1fcf0b58
Issue #5362 - Adding SslContextFactory.Client to Proxy's HttpClient (#5363)
- ProxyServletTest additions for server backend TLS
 - Updating test-proxy-webapp testing
 - Better class name for test
 - More documentation on purpose of test.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 17:39:59 -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
Joakim Erdfelt 8a524a6bf9
Cleaning up junit dep issues in session tests.
+ Enforcer mandates common version of junit-jupiter,
  but the org.testcontainers:testcontainers brings in
  an older version.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 13:48:46 -05:00
Joakim Erdfelt e879c1fcea
Cleaning up junit dep issues in session tests.
+ Enforcer mandated

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 12:44:32 -05:00
gregw 661b881d6e Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-09-28 17:10:28 +02:00
gregw 1f86fb0442 removed old examples pom
Signed-off-by: gregw <gregw@webtide.com>
2020-09-28 17:10:13 +02:00
Joakim Erdfelt f8d8997619
Removing test scoped dependencies that are no longer in use
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 10:04:27 -05:00
Joakim Erdfelt a5fe448a21
Fixing enforcer rule around junit versioning
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 10:02:37 -05:00
Joakim Erdfelt b9112ce631
Moving jetty-cdi tests to /tests/test-cdi to avoid jpms testing hell
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 09:08:35 -05:00
Joakim Erdfelt 2942b9ea74
Minor updates for demo-base
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 09:06:27 -05:00
Joakim Erdfelt ebe7f97137
Adding basic module-info to jetty-cdi
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 08:27:58 -05:00
Joakim Erdfelt efb3216d59
Fixing bad EOL on groovy files
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 08:25:56 -05:00
Greg Wilkins fc99120ce9 Merge branch 'jetty-10.0.x' of https://github.com/eclipse/jetty.project into jetty-10.0.x 2020-09-28 14:16:40 +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
Joakim Erdfelt f8b06e8bc6
Bumping jetty-test-helper from 5.4 to 5.5
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 07:07:15 -05:00
Joakim Erdfelt 5fba93177f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-28 06:49:43 -05:00
Joakim Erdfelt 1904903f8c
Merge pull request #5356 from eclipse/jetty-9.4.x_no_wagon_ssh
remove maven-wagon-ssh dependency
2020-09-28 06:49:28 -05:00
Joakim Erdfelt f7f369890a
Merge pull request #5346 from eclipse/dependabot/maven/jetty-9.4.x/org.glassfish.jaxb-jaxb-runtime-2.3.3
Bump jaxb-runtime from 2.3.0.1 to 2.3.3
2020-09-28 06:48:34 -05:00
Greg Wilkins 5e583fa9f3
Fix #5327 NPE in PushBuilder (#5328)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-28 13:36:56 +02:00
olivier lamy 92c9d782c2 Revert "Bump derbytools from 10.14.2.0 to 10.15.2.0 (#5345)"
This reverts commit 71388ef575.
2020-09-28 20:06:35 +10:00
Joakim Erdfelt bb0c558128
Merge pull request #5350 from eclipse/dependabot/maven/jetty-10.0.x/javax.servlet.jsp-jsp-api-2.2
Bump jsp-api from 2.1 to 2.2
2020-09-28 04:45:22 -05:00
dependabot[bot] 39f6111227
Bump maven-shade-plugin from 3.2.2 to 3.2.4 (#5335)
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.2...maven-shade-plugin-3.2.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-28 19:17:20 +10:00
dependabot[bot] 98264d6274
Bump maven-jar-plugin from 3.1.2 to 3.2.0 (#5347)
Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.1.2 to 3.2.0.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.1.2...maven-jar-plugin-3.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-28 19:16:33 +10:00
dependabot[bot] 71388ef575
Bump derbytools from 10.14.2.0 to 10.15.2.0 (#5345)
Bumps derbytools from 10.14.2.0 to 10.15.2.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-28 19:15:08 +10: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
dependabot[bot] 350c0c0466
Bump jaxb-runtime from 2.3.0.1 to 2.3.3
Bumps jaxb-runtime from 2.3.0.1 to 2.3.3.

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-28 06:24:47 +00:00
olivier lamy 88a2816d09 remove wagon ssh dependency
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-28 14:41:57 +10:00
dependabot[bot] 2b76af0059
Bump derby from 10.14.2.0 to 10.15.2.0 (#5333)
Bumps derby from 10.14.2.0 to 10.15.2.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-28 14:16:36 +10:00
Joakim Erdfelt c9202ae214
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-27 17:03:02 -05:00
Joakim Erdfelt 28293737bf
Have dependabot monitor all 3 main branches
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-27 08:37:12 -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 3590bfcfd1
separate javadoc no longer necessary
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-25 13:45:16 -05:00
Joakim Erdfelt 7c7a202f96
Fixing PropertyPassingTest
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-25 13:37:38 -05:00
Joakim Erdfelt 9fb27b1bdd
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-25 09:49:11 -05:00
Joakim Erdfelt 86602c9aeb
Updating attributes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-25 09:48:38 -05:00
Greg Wilkins c5f9faa479 Improve error messages for failed starts
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-25 16:47:08 +02:00
Greg Wilkins c17bcc7db8 Converted README to md
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-25 16:07:54 +02:00
gregw ffd92d304d README for jetty-home
Signed-off-by: gregw <gregw@webtide.com>
2020-09-25 11:16:28 +02:00
Lachlan Roberts 11465791cc Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-25 15:20:25 +10:00
Lachlan 7e627359b3
Merge pull request #5276 from eclipse/jetty-9.4.x-IncludeExcludeConnectionStatistics
update documentation for statistics collection
2020-09-25 15:20:04 +10:00
Lachlan Roberts a55ddc2093 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-25 13:28:41 +10:00
Lachlan 6186d71b4e
Merge pull request #5312 from eclipse/jetty-9.4.x-5170-WebSocketUpgrade
Issue #5170 - backport fixes for WebSocket upgrade to jetty-9.4.x
2020-09-25 13:06:49 +10:00
Joakim Erdfelt 1846e94d07
Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-09-24 15:42:01 -05:00
Joakim Erdfelt 4288fd863d
Fixing JPMS testing issues.
+ Removing jetty-cdi module-info.java
+ Adding requires java.xml to jetty-http-spi

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-24 15:41:39 -05:00
Simone Bordet 3ae713d80a Fixes #5324 - Jetty XML <Get> should support nested elements.
Added Id and Class elements to DTD.
Removed Name element from New since it was never processed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-09-24 18:39:58 +02:00
Joakim Erdfelt 7622dec391
Merge branch 'jetty-10.0.x-move-to-demo' into jetty-10.0.x 2020-09-24 11:37:35 -05:00