Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Configure Keep-alive timeout - 4.0.x #7080

Merged
merged 1 commit into from Mar 28, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 28, 2024

This is an automatic copy of pull request #7071 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-3966

Description

Add the possibility to configure the keep-alive timeout at API level.


馃摎聽聽View the storybook of this branch here


Cherry-pick of 9894ebb has failed:

On branch mergify/bp/master/pr-7071
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 9894ebb54b.
  (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:   docker/quick-setup/https-gateway/.resources/Echo.json
	modified:   docker/quick-setup/keycloak/secured-api.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientOptionsDeserializer.java
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientOptionsSerializer.java
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-bestMatchFlowMode-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-cors-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-default-failover-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-defaulthttpconfig-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-empty-hostHeader-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-endpointgroup-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-endpointgroup.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-failover-singlecase-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-grpc-endpoint-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-grpc-endpoint-ssl-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-grpc-endpoint-without-type-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-headers-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-hostHeader-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-http2-endpoint-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-kafka-endpoint-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-logging-client-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-multitenants-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-override-failover-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-overridedhttpconfig-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-response-templates-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-virtualhosts-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-keystore-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-keystore.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-no-trustore.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nooptions-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-null-pem.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-propagateClientAcceptEncoding-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-truststore-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-truststore.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-with-backend-response-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-with-debug-steps-error-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-with-debug-steps-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-with-response-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-without-request.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/services/healthcheck/api-withservice-healthcheck-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/HttpClientOptions.java
	modified:   gravitee-apim-definition/gravitee-apim-definition-model/src/test/resources/io/gravitee/definition/model/kubernetes/v1alpha1/api-definition.json
	modified:   gravitee-apim-e2e/api-test/resources/wiremock/__files/api-whattimeisit.json
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-services/gravitee-apim-gateway-services-endpoint-discovery/src/test/java/io/gravitee/gateway/services/endpoint/discovery/verticle/EndpointDiscoveryVerticleTest.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-services/gravitee-apim-gateway-services-healthcheck/src/main/java/io/gravitee/gateway/services/healthcheck/http/HttpEndpointRuleHandler.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-services/gravitee-apim-gateway-services-healthcheck/src/test/java/io/gravitee/gateway/services/healthcheck/EndpointHealthcheckResolverTest.java
	modified:   gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/README.adoc
	modified:   gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/sharedConfiguration/schema-form.json
	modified:   gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/test/java/io/gravitee/plugin/endpoint/http/proxy/HttpProxyEndpointConnectorFactoryTest.java
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/java/io/gravitee/repository/management/PromotionRepositoryTest.java
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/api-tests/apis.json
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/apikey-tests/apis.json
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/application-tests/apis.json
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/page-tests/apis.json
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/promotion-tests/promotions.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/cockpit/command/handler/GoodByeCommandHandlerTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/ApiService_UpdateTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/JsonSchemaServiceTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/promotion/PromotionTasksServiceImplTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource-contextPath.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource-contextRef.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource-noIds.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource-version.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExport.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithExecutionMode-v3.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithExecutionMode-v4-emulation-engine.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithExecutionMode.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithoutMembers.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithoutMetadata.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithoutPages.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithoutPlans.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-gRPC-convertAsJsonForExport.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/http-connector.json
	modified:   pom.xml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/http/HttpClientOptions.java
	deleted by us:   gravitee-apim-gateway/gravitee-apim-gateway-http/src/main/java/io/gravitee/gateway/reactive/http/vertx/client/VertxHttpClient.java
	deleted by us:   gravitee-apim-gateway/gravitee-apim-gateway-http/src/test/java/io/gravitee/gateway/reactive/http/vertx/client/VertxHttpClientTest.java
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/JsonPatchServiceTest.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


馃摎聽聽View the storybook of this branch here

@mergify mergify bot requested a review from a team as a code owner March 28, 2024 10:01
@mergify mergify bot added the conflicts label Mar 28, 2024
@mergify mergify bot assigned phiz71 Mar 28, 2024
Copy link
Author

mergify bot commented Mar 28, 2024

Cherry-pick of 9894ebb has failed:

On branch mergify/bp/master/pr-7071
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 9894ebb54b.
  (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:   docker/quick-setup/https-gateway/.resources/Echo.json
	modified:   docker/quick-setup/keycloak/secured-api.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientOptionsDeserializer.java
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientOptionsSerializer.java
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-bestMatchFlowMode-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-cors-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-default-failover-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-defaulthttpconfig-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-empty-hostHeader-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-endpointgroup-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-endpointgroup.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-failover-singlecase-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-grpc-endpoint-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-grpc-endpoint-ssl-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-grpc-endpoint-without-type-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-headers-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-hostHeader-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-http2-endpoint-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-kafka-endpoint-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-logging-client-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-multitenants-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-override-failover-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-overridedhttpconfig-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-response-templates-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-virtualhosts-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-keystore-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-keystore.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-no-trustore.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nooptions-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-null-pem.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-propagateClientAcceptEncoding-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-truststore-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-truststore.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-with-backend-response-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-with-debug-steps-error-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-with-debug-steps-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-with-response-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/debug/debug-api-without-request.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/test/resources/io/gravitee/definition/jackson/services/healthcheck/api-withservice-healthcheck-expected.json
	modified:   gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/HttpClientOptions.java
	modified:   gravitee-apim-definition/gravitee-apim-definition-model/src/test/resources/io/gravitee/definition/model/kubernetes/v1alpha1/api-definition.json
	modified:   gravitee-apim-e2e/api-test/resources/wiremock/__files/api-whattimeisit.json
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-services/gravitee-apim-gateway-services-endpoint-discovery/src/test/java/io/gravitee/gateway/services/endpoint/discovery/verticle/EndpointDiscoveryVerticleTest.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-services/gravitee-apim-gateway-services-healthcheck/src/main/java/io/gravitee/gateway/services/healthcheck/http/HttpEndpointRuleHandler.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-services/gravitee-apim-gateway-services-healthcheck/src/test/java/io/gravitee/gateway/services/healthcheck/EndpointHealthcheckResolverTest.java
	modified:   gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/README.adoc
	modified:   gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/sharedConfiguration/schema-form.json
	modified:   gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/test/java/io/gravitee/plugin/endpoint/http/proxy/HttpProxyEndpointConnectorFactoryTest.java
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/java/io/gravitee/repository/management/PromotionRepositoryTest.java
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/api-tests/apis.json
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/apikey-tests/apis.json
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/application-tests/apis.json
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/page-tests/apis.json
	modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/resources/data/promotion-tests/promotions.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/cockpit/command/handler/GoodByeCommandHandlerTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/ApiService_UpdateTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/JsonSchemaServiceTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/promotion/PromotionTasksServiceImplTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource-contextPath.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource-contextRef.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource-noIds.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource-version.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsCustomResource.yml
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExport.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithExecutionMode-v3.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithExecutionMode-v4-emulation-engine.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithExecutionMode.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithoutMembers.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithoutMetadata.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithoutPages.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-convertAsJsonForExportWithoutPlans.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/export-gRPC-convertAsJsonForExport.json
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/http-connector.json
	modified:   pom.xml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/http/HttpClientOptions.java
	deleted by us:   gravitee-apim-gateway/gravitee-apim-gateway-http/src/main/java/io/gravitee/gateway/reactive/http/vertx/client/VertxHttpClient.java
	deleted by us:   gravitee-apim-gateway/gravitee-apim-gateway-http/src/test/java/io/gravitee/gateway/reactive/http/vertx/client/VertxHttpClientTest.java
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/JsonPatchServiceTest.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

@phiz71 phiz71 force-pushed the mergify/bp/master/pr-7071 branch 2 times, most recently from 8bc0563 to 4068bf4 Compare March 28, 2024 13:12
@phiz71 phiz71 removed the conflicts label Mar 28, 2024
@phiz71 phiz71 enabled auto-merge (rebase) March 28, 2024 13:17
Add the possibility to configure the keep-alive timeout at API level.

https://gravitee.atlassian.net/browse/APIM-3966
(cherry picked from commit 9894ebb)
@phiz71 phiz71 merged commit 002d432 into master Mar 28, 2024
32 of 36 checks passed
@phiz71 phiz71 deleted the mergify/bp/master/pr-7071 branch March 28, 2024 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant