gravitee-api-management
gravitee-api-management copied to clipboard
Published
20 hours ago •
gravitee-io
gravitee-io
[4.5.x] Reduce numbers of opening files
This is an automatic copy of pull request #12093 done by Mergify.
Issue
https://gravitee.atlassian.net/browse/APIM-9724
Description
- use a cache of files instead of reopen it
- close the HTTP client
- some others clean up
📚 View the storybook of this branch here
Cherry-pick of 9885932b30bc3ce4bde47d88cd874df7c4e26093 has failed:
On branch mergify/bp/4.5.x/pr-12093
Your branch is up to date with 'origin/4.5.x'.
You are currently cherry-picking commit 9885932b30.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/AbstractGrpcGatewayTest.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/policy/KeylessPolicy.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/io/gravitee/apim/gateway/tests/sdk/utils/TLSUtilsTest.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/GrpcTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/Http2HeadersTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/ManuallyDeployTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/ManuallyRedeployTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/ManuallyUndeployTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/NotExtendingAbstractClassTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/OrganizationDeploymentTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/PlaceholderTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/RegisterTwiceSameApiClassLevelTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/RegisterTwiceSameApiMethodLevelTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/SuccessTestCase.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/fake/ActionReportPolicy.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/fake/MessageFlowReadyPolicy.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4/GrpcBidirectionalStreamingV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4/GrpcServerStreamingV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4/GrpcUnaryRPCV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcBidirectionalStreamingV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcNoEndpointV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcSecuredServerStreamingV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcServerStreamingV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcUnaryRPCV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcUnknownEndpointV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcUnknownServiceV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/HttpRequestKeylessV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/HttpRequestTimeoutV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/HttpRequestTimeoutV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/HttpRequestTimeoutV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/attributes/AbstractAttributesIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/attributes/AttributesIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/bestmatch/BestMatchV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/bestmatch/BestMatchV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/cors/AbstractCorsIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/cors/CorsV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/cors/CorsV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/failover/FailoverV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/flows/FlowPhaseExecutionV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/flows/FlowPhaseExecutionV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/flows/FlowPhaseExecutionV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/logging/LoggingV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/logging/LoggingV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/pathparams/PathParametersV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/pathparams/PathParametersV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/AbstractMqtt5EndpointIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/httppost/HttpPostEntrypointMockEndpointIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/httppost/HttpPostEntrypointMqtt5EndpointIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/logging/MetricsIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/websocket/WebsocketEntrypointSolaceEndpointIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/multiservers/AbstractMultiServersApiDeployIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/multiservers/MultiServersApiDeployV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/multiservers/MultiServersApiDeployV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/multiservers/MultiServersApiDeployV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/organization/HttpRequestOrganizationV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/organization/HttpRequestOrganizationV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/apikey/PlanApiKeyV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/apikey/PlanApiKeyV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/jwt/PlanJwtV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/keyless/PlanKeylessV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyJwtMutualTLSV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyJwtOAuth2MutualTLSV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyMutualTLSV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessMutualTLSV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/oauth2/PlanOAuth2V4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/oauth2/PlanOAuth2V4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/reporting/DoOnReportV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/reporting/DoOnReportV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/tcp/TcpGatewayWebsocketIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/tcp/TcpSecuredBackendIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketAcceptV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketBidirectionalV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketCloseV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketHeadersV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketPingFrameV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketRejectV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4/AbstractWebsocketV4GatewayTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketAcceptV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketBidirectionalV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketCloseV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketHeadersV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketPingFrameV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketRejectV4EmulationIntegrationTest.java
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/container/GatewayTestContainer.java
deleted by us: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/converters/NativeApiDeploymentPreparer.java
both modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/logging/LoggingV4EmulationIntegrationTest.java
both modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/httpget/HttpGetEntrypointKafkaEndpointIntegrationTest.java
deleted by us: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/tracing/OpenTelemetryTracingV4IntegrationTest.java
Cherry-pick of b241663b15879e8647391bfdac0fa1e03a26e8a8 has failed:
On branch mergify/bp/4.5.x/pr-12093
Your branch is ahead of 'origin/4.5.x' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit b241663b15.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/pom.xml
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/resources/gravitee-default/config/gravitee.yml
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/runner/GatewayRunner.java
Cherry-pick of f7340695bace792b834a841e62344e749a42356f has failed:
On branch mergify/bp/4.5.x/pr-12093
Your branch is ahead of 'origin/4.5.x' by 3 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit f7340695ba.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/HttpClientParameterResolver.java
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/AbstractGatewayTest.java
Cherry-pick of 8ebbcde9c3e0370331e5c638595e4c9055b5db0f has failed:
On branch mergify/bp/4.5.x/pr-12093
Your branch is ahead of 'origin/4.5.x' by 5 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 8ebbcde9c3.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/mtls/PlanMutualTLSClientAuthRequestIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/mtls/PlanMutualTLSClientAuthRequiredIntegrationTest.java
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/AbstractGatewayTest.java
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
![mergify[bot] avatar](https://avatars.githubusercontent.com/in/10562?v=4 "Published by a pub.dev verified publisher"){kind=small}
Cherry-pick of 9885932b30bc3ce4bde47d88cd874df7c4e26093 has failed:
On branch mergify/bp/4.5.x/pr-12093
Your branch is up to date with 'origin/4.5.x'.
You are currently cherry-picking commit 9885932b30.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/AbstractGrpcGatewayTest.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/policy/KeylessPolicy.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/io/gravitee/apim/gateway/tests/sdk/utils/TLSUtilsTest.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/GrpcTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/Http2HeadersTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/ManuallyDeployTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/ManuallyRedeployTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/ManuallyUndeployTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/NotExtendingAbstractClassTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/OrganizationDeploymentTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/PlaceholderTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/RegisterTwiceSameApiClassLevelTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/RegisterTwiceSameApiMethodLevelTestCase.java
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/test/java/testcases/SuccessTestCase.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/fake/ActionReportPolicy.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/fake/MessageFlowReadyPolicy.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4/GrpcBidirectionalStreamingV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4/GrpcServerStreamingV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4/GrpcUnaryRPCV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcBidirectionalStreamingV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcNoEndpointV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcSecuredServerStreamingV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcServerStreamingV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcUnaryRPCV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcUnknownEndpointV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/grpc/v4Emulation/GrpcUnknownServiceV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/HttpRequestKeylessV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/HttpRequestTimeoutV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/HttpRequestTimeoutV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/HttpRequestTimeoutV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/attributes/AbstractAttributesIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/attributes/AttributesIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/bestmatch/BestMatchV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/bestmatch/BestMatchV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/cors/AbstractCorsIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/cors/CorsV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/cors/CorsV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/failover/FailoverV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/flows/FlowPhaseExecutionV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/flows/FlowPhaseExecutionV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/flows/FlowPhaseExecutionV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/logging/LoggingV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/logging/LoggingV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/pathparams/PathParametersV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/pathparams/PathParametersV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/AbstractMqtt5EndpointIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/httppost/HttpPostEntrypointMockEndpointIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/httppost/HttpPostEntrypointMqtt5EndpointIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/logging/MetricsIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/websocket/WebsocketEntrypointSolaceEndpointIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/multiservers/AbstractMultiServersApiDeployIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/multiservers/MultiServersApiDeployV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/multiservers/MultiServersApiDeployV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/multiservers/MultiServersApiDeployV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/organization/HttpRequestOrganizationV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/organization/HttpRequestOrganizationV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/apikey/PlanApiKeyV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/apikey/PlanApiKeyV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/jwt/PlanJwtV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/keyless/PlanKeylessV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyJwtMutualTLSV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyJwtOAuth2MutualTLSV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyMutualTLSV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessApiKeyV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/multiple/PlanKeylessMutualTLSV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/oauth2/PlanOAuth2V4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/oauth2/PlanOAuth2V4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/reporting/DoOnReportV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/reporting/DoOnReportV4IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/tcp/TcpGatewayWebsocketIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/tcp/TcpSecuredBackendIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketAcceptV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketBidirectionalV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketCloseV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketHeadersV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketPingFrameV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v3/WebsocketRejectV3IntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4/AbstractWebsocketV4GatewayTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketAcceptV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketBidirectionalV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketCloseV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketHeadersV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketPingFrameV4EmulationIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/websocket/v4Emulation/WebsocketRejectV4EmulationIntegrationTest.java
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/container/GatewayTestContainer.java
deleted by us: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/converters/NativeApiDeploymentPreparer.java
both modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/http/logging/LoggingV4EmulationIntegrationTest.java
both modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/messages/httpget/HttpGetEntrypointKafkaEndpointIntegrationTest.java
deleted by us: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/tracing/OpenTelemetryTracingV4IntegrationTest.java
Cherry-pick of b241663b15879e8647391bfdac0fa1e03a26e8a8 has failed:
On branch mergify/bp/4.5.x/pr-12093
Your branch is ahead of 'origin/4.5.x' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit b241663b15.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/pom.xml
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/resources/gravitee-default/config/gravitee.yml
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/runner/GatewayRunner.java
Cherry-pick of f7340695bace792b834a841e62344e749a42356f has failed:
On branch mergify/bp/4.5.x/pr-12093
Your branch is ahead of 'origin/4.5.x' by 3 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit f7340695ba.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/HttpClientParameterResolver.java
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/AbstractGatewayTest.java
Cherry-pick of 8ebbcde9c3e0370331e5c638595e4c9055b5db0f has failed:
On branch mergify/bp/4.5.x/pr-12093
Your branch is ahead of 'origin/4.5.x' by 5 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 8ebbcde9c3.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/mtls/PlanMutualTLSClientAuthRequestIntegrationTest.java
modified: gravitee-apim-integration-tests/src/test/java/io/gravitee/apim/integration/tests/plan/mtls/PlanMutualTLSClientAuthRequiredIntegrationTest.java
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: gravitee-apim-gateway/gravitee-apim-gateway-tests-sdk/src/main/java/io/gravitee/apim/gateway/tests/sdk/AbstractGatewayTest.java
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally