This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 2bd2071d91dd13e3e4bafd41fb9cc03d05433374 Merge: e09d6c01f b9d8b991c Author: James Bognar <[email protected]> AuthorDate: Tue Dec 27 09:53:06 2022 -0500 Merge pull request #86 from apache/jbUpgradeServletTo6 Upgrade to Servlet 6.0.0 .github/workflows/maven.yml | 2 +- juneau-build-javadoc.sh | 2 +- .../org/apache/juneau/config/store/FileStore.java | 1 - .../juneau-examples-rest-springboot.launch | 4 +- .../juneau/examples/rest/springboot/App.java | 4 +- .../juneau/examples/rest/RequestEchoResource.java | 4 +- .../juneau-microservice-ftest/.gitignore | 6 - .../juneau-microservice-ftest/files/jetty.xml | 80 ---------- .../juneau-microservice-test.cfg | 38 ----- .../juneau-microservice-test.launch | 18 --- .../juneau-microservice-ftest/logs/.gitignore | 1 - .../juneau-microservice-ftest/logs/empty.txt | 0 .../juneau-microservice-ftest/pom.xml | 112 -------------- .../src/main/java/empty.txt | 0 .../apache/juneau/rest/test/ConfigResource.java | 40 ----- .../org/apache/juneau/rest/test/ConfigTest.java | 64 -------- .../juneau/rest/test/LargePojosResource.java | 43 ------ .../org/apache/juneau/rest/test/RestTestcase.java | 91 ----------- .../java/org/apache/juneau/rest/test/Root.java | 40 ----- .../apache/juneau/rest/test/TestMicroservice.java | 171 --------------------- .../org/apache/juneau/rest/test/_TestSuite.java | 42 ----- .../rest/test/HtmlPropertiesResource.properties | 31 ---- .../juneau/rest/test/ParamsResource.properties | 15 -- .../rest/test/ParamsResource_ja_JP.properties | 15 -- .../microservice/jetty/JettyMicroservice.java | 2 +- .../microservice/springboot/template/App.java | 2 +- juneau-microservice/pom.xml | 1 - juneau-open-javadoc.sh | 2 +- .../apache/juneau/rest/client/ResponseContent.java | 9 ++ .../apache/juneau/rest/mock/MockHttpSession.java | 33 +--- .../apache/juneau/rest/mock/MockRestClient.java | 2 +- .../apache/juneau/rest/mock/MockRestRequest.java | 4 +- .../juneau/rest/mock/MockServletRequest.java | 29 ++-- .../juneau/rest/mock/MockServletResponse.java | 20 +-- .../rest/OverrideableHttpServletRequest.java | 2 +- .../java/org/apache/juneau/rest/RestChildren.java | 2 +- .../java/org/apache/juneau/rest/RestContext.java | 6 +- .../java/org/apache/juneau/rest/RestOpContext.java | 4 +- .../java/org/apache/juneau/rest/RestRequest.java | 4 +- .../java/org/apache/juneau/rest/RestResponse.java | 4 +- .../java/org/apache/juneau/rest/RestSession.java | 5 +- .../apache/juneau/rest/annotation/RestDestroy.java | 2 +- .../apache/juneau/rest/annotation/RestEndCall.java | 2 +- .../apache/juneau/rest/annotation/RestInit.java | 2 +- .../juneau/rest/annotation/RestPostCall.java | 4 +- .../juneau/rest/annotation/RestPostInit.java | 2 +- .../apache/juneau/rest/annotation/RestPreCall.java | 4 +- .../juneau/rest/annotation/RestStartCall.java | 2 +- .../org/apache/juneau/rest/arg/CookieList.java | 2 +- .../juneau/rest/arg/HttpServletRequestArgs.java | 4 +- .../juneau/rest/arg/HttpServletResponseArgs.java | 2 +- .../apache/juneau/rest/arg/HttpSessionArgs.java | 2 +- .../apache/juneau/rest/arg/RestRequestArgs.java | 4 +- .../apache/juneau/rest/arg/RestResponseArgs.java | 2 +- .../apache/juneau/rest/debug/DebugEnablement.java | 2 +- .../juneau/rest/httppart/RequestAttributes.java | 4 +- .../juneau/rest/httppart/RequestContent.java | 2 +- .../juneau/rest/httppart/RequestFormParam.java | 4 +- .../juneau/rest/httppart/RequestFormParams.java | 2 +- .../juneau/rest/logger/BasicTestCallLogger.java | 2 +- .../org/apache/juneau/rest/logger/CallLogger.java | 5 +- .../apache/juneau/rest/logger/CallLoggerRule.java | 13 +- .../juneau/rest/matcher/ClientVersionMatcher.java | 2 +- .../rest/matcher/MultipartFormDataMatcher.java | 2 +- .../apache/juneau/rest/matcher/RestMatcher.java | 2 +- .../juneau/rest/matcher/UrlEncodedFormMatcher.java | 2 +- .../juneau/rest/processor/ResponseProcessor.java | 2 +- .../apache/juneau/rest/rrpc/RrpcRestOpContext.java | 2 +- .../juneau/rest/servlet/BasicRestObject.java | 2 +- .../juneau/rest/servlet/BasicRestObjectGroup.java | 2 +- .../org/apache/juneau/rest/servlet/RestObject.java | 4 +- .../apache/juneau/rest/servlet/RestServlet.java | 6 +- .../rest/swagger/BasicSwaggerProviderSession.java | 2 +- .../rest/util/BoundedServletInputStream.java | 2 +- .../rest/util/CachingHttpServletRequest.java | 6 +- .../rest/util/CachingHttpServletResponse.java | 6 +- .../rest/util/FinishableServletOutputStream.java | 2 +- .../org/apache/juneau/rest/util/RestUtils.java | 2 +- .../juneau/rest/vars/RequestAttributeVar.java | 2 +- juneau-sc/juneau-sc-server/pom.xml | 5 + .../http/remote/Remote_CommonInterfaces_Test.java | 36 ++--- .../org/apache/juneau/rest/RestOp_Params_Test.java | 2 +- .../rest/Rest_PredefinedStatusCodes_Test.java | 2 +- .../juneau/rest/annotation/RestInit_Test.java | 2 +- .../rest/annotation/RestOp_Matchers_Test.java | 2 +- .../juneau/rest/annotation/RestPostCall_Test.java | 2 +- .../juneau/rest/annotation/RestPreCall_Test.java | 2 +- .../juneau/rest/annotation/RestStartCall_Test.java | 2 +- .../rest/test/client/ThirdPartyProxyResource.java | 2 +- pom.xml | 6 +- 90 files changed, 143 insertions(+), 991 deletions(-)
