Branch: refs/heads/main Home: https://github.com/resteasy/resteasy Commit: fc628c884f27347907afd17393f168dc63dcc7c8 https://github.com/resteasy/resteasy/commit/fc628c884f27347907afd17393f16... Author: Ron Sigal <rsigal(a)redhat.com&gt; Date: 2022-08-22 (Mon, 22 Aug 2022) Changed paths: Log Message: ----------- Only set the status of response with @ResponseStatus if it's not already set (#2744) (#2786) Fixes: https://github.com/quarkusio/quarkus/issues/16321 Co-authored-by: Georgios Andrianakis <geoand(a)gmail.com&gt; Co-authored-by: James R. Perkins <jperkins(a)redhat.com&gt; Co-authored-by: Georgios Andrianakis <geoand(a)gmail.com&gt; Commit: a743a304c4af4c91941bf80457baae403da7dc2b https://github.com/resteasy/resteasy/commit/a743a304c4af4c91941bf80457baa... Author: R Searls <rsearls(a)redhat.com&gt; Date: 2022-08-22 (Mon, 22 Aug 2022) Changed paths: A resteasy-client-microprofile/src/test/java/org/jboss/resteasy/microprofile/client/headers/ClientHeaderFillingTest.java M resteasy-client-reactor-netty/src/test/java/org/jboss/resteasy/client/jaxrs/engines/ReactorNettyClientHttpEngineTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/interceptors/InterceptorTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/logging/DebugLoggingTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/crypto/SigningTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/interceptor/gzip/GzipAbstractTestBase.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/CollectionCoreTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/JsonBindingAnnotationsJacksonTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/JsonBindingDebugLoggingTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/ValidationXMLTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessing2Test.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessingTest.java Log Message: ----------- Rebase to upstream/main Commit: 7e0ba4f5453545c8aba507be29dd7dfb559cd4b3 https://github.com/resteasy/resteasy/commit/7e0ba4f5453545c8aba507be29dd7... Author: Andy McCright <j.andrew.mccright(a)gmail.com&gt; Date: 2022-08-22 (Mon, 22 Aug 2022) Changed paths: M providers/multipart/src/test/java/org/jboss/resteasy/plugins/providers/multipart/Mime4JWorkaroundTest.java M resteasy-client/src/test/java/org/jboss/resteasy/client/jaxrs/engines/ManualClosingApacheHttpClient43EngineTest.java Log Message: ----------- merged to upstream/main Commit: 7c6cf643b01a07a310159c6892e39e6f285b8e4b https://github.com/resteasy/resteasy/commit/7c6cf643b01a07a310159c6892e39... Author: R Searls <rsearls(a)redhat.com&gt; Date: 2022-08-22 (Mon, 22 Aug 2022) Changed paths: M resteasy-client-reactor-netty/src/test/java/org/jboss/resteasy/client/jaxrs/engines/ReactorNettyClientHttpEngineTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/interceptors/InterceptorTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/logging/DebugLoggingTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/crypto/SigningTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/interceptor/gzip/GzipAbstractTestBase.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/CollectionCoreTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/JsonBindingAnnotationsJacksonTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/JsonBindingDebugLoggingTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/ValidationXMLTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessing2Test.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessingTest.java Log Message: ----------- re-remove flags for merge Commit: 87a25cca2893f49830ceb3e20ad8af83f1fdb9a0 https://github.com/resteasy/resteasy/commit/87a25cca2893f49830ceb3e20ad8a... Author: R Searls <rsearls(a)redhat.com&gt; Date: 2022-08-22 (Mon, 22 Aug 2022) Changed paths: M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/ValidationXMLTest.java Log Message: ----------- fix merge compile issue Compare: https://github.com/resteasy/resteasy/compare/d31063be7cbd...87a25cca2893