diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index d0bfa46ea..4e830651c 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -40,6 +40,7 @@ management: # and API doc at /v3/api-docs.yaml springdoc: api-docs: + version: OPENAPI_3_0 enabled: false # Security Config diff --git a/docs/autogenerated/openapi.yaml b/docs/autogenerated/openapi.yaml index 91e1f5da9..d2eeb1bb4 100644 --- a/docs/autogenerated/openapi.yaml +++ b/docs/autogenerated/openapi.yaml @@ -283,15 +283,15 @@ paths: text/plain;version=0.0.4;charset=utf-8: schema: type: string - application/openmetrics-text; version=1.0.0; charset=utf-8: - schema: - type: string application/openmetrics-text;version=1.0.0;charset=utf-8: schema: type: string text/plain; version=0.0.4; charset=utf-8: schema: type: string + application/openmetrics-text; version=1.0.0; charset=utf-8: + schema: + type: string /actuator: get: tags: @@ -309,14 +309,14 @@ paths: type: object additionalProperties: $ref: "#/components/schemas/Link" - application/json: + application/vnd.spring-boot.actuator.v2+json: schema: type: object additionalProperties: type: object additionalProperties: $ref: "#/components/schemas/Link" - application/vnd.spring-boot.actuator.v2+json: + application/json: schema: type: object additionalProperties: @@ -336,31 +336,12 @@ paths: application/vnd.spring-boot.actuator.v3+json: schema: type: object - application/json: - schema: - type: object application/vnd.spring-boot.actuator.v2+json: schema: type: object - /actuator/health/**: - get: - tags: - - Actuator - summary: Actuator web endpoint 'health-path' - operationId: health-path - responses: - "200": - description: OK - content: - application/vnd.spring-boot.actuator.v3+json: - schema: - type: object application/json: schema: type: object - application/vnd.spring-boot.actuator.v2+json: - schema: - type: object components: schemas: OnDemandRepair: diff --git a/ecchronos-binary/src/test/bin/pytests.sh b/ecchronos-binary/src/test/bin/pytests.sh index c34be8a6f..71b37a51c 100755 --- a/ecchronos-binary/src/test/bin/pytests.sh +++ b/ecchronos-binary/src/test/bin/pytests.sh @@ -88,8 +88,8 @@ sed 's;^\(\s*\)\(\)\s*$;\1;g' -i "$CONF_ # springdoc -sed '/springdoc:/{n;/api-docs/{n;s/enabled: .*/enabled: true/}}' -i "$CONF_DIR"/application.yml -sed '/springdoc:/{n;/api-docs/{n;/enabled: true/{n;s/.*/ show-actuator: true\n/}}}' -i "$CONF_DIR"/application.yml +sed '/springdoc:/{n;/api-docs/{n;/version: OPENAPI_3_0/{n;s/enabled: .*/enabled: true/}}}' -i "$CONF_DIR"/application.yml +sed '/springdoc:/{n;/api-docs/{n;/version: OPENAPI_3_0/{n;/enabled: true/{n;s/.*/ show-actuator: true\n/}}}}' -i "$CONF_DIR"/application.yml ## Special config for test.table1 diff --git a/pom.xml b/pom.xml index 979688dfe..ee17804b2 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 3.4.1 2.3 2.0.16 - 2.7.0 + 2.8.3 2.2.27 1.20.4