[resteasy-commits] [resteasy/resteasy] 16a716: Revert "fix merge compile issue"

Branch: refs/heads/main Home: https://github.com/resteasy/resteasy Commit: 16a716a694075691fdddfb8ef67c5a5c499fc427 https://github.com/resteasy/resteasy/commit/16a716a694075691fdddfb8ef67c5... Author: James R. Perkins <jperkins(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: ----------- Revert "fix merge compile issue" This reverts commit 87a25cca2893f49830ceb3e20ad8af83f1fdb9a0. Commit: 60bdac8a477ae6a5cb8217499e4e6a7f426b33a9 https://github.com/resteasy/resteasy/commit/60bdac8a477ae6a5cb8217499e4e6... Author: James R. Perkins <jperkins(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: ----------- Revert "re-remove flags for merge" This reverts commit 7c6cf643b01a07a310159c6892e39e6f285b8e4b. Commit: 4f31b25882a7470e18e6ef67ea263daddbf7864b https://github.com/resteasy/resteasy/commit/4f31b25882a7470e18e6ef67ea263... Author: James R. Perkins <jperkins(a)redhat.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: ----------- Revert "merged to upstream/main" This reverts commit 7e0ba4f5453545c8aba507be29dd7dfb559cd4b3. Commit: 885912ed08d749c877f05f63b890ab17cebfdc42 https://github.com/resteasy/resteasy/commit/885912ed08d749c877f05f63b890a... Author: James R. Perkins <jperkins(a)redhat.com&gt; Date: 2022-08-22 (Mon, 22 Aug 2022) Changed paths: R 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: ----------- Revert "Rebase to upstream/main" This reverts commit a743a304c4af4c91941bf80457baae403da7dc2b. Compare: https://github.com/resteasy/resteasy/compare/87a25cca2893...885912ed08d7