diff --git a/DEPENDENCIES b/DEPENDENCIES index ed150a38..e95ca73e 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -8,12 +8,12 @@ maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.1, Apache-2.0, approved, #15200 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache-2.0, approved, CQ21280 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.16.2, Apache-2.0, approved, #11606 -maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.0, Apache-2.0, approved, #13672 +maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.1, Apache-2.0, approved, #13672 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.2, Apache-2.0, approved, #13672 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.16.2, Apache-2.0 AND MIT, approved, #11602 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.2, , approved, #13665 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.16.2, Apache-2.0, approved, #11605 -maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.0, Apache-2.0, approved, #13671 +maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.1, Apache-2.0, approved, #13671 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.2, Apache-2.0, approved, #13671 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.16.2, Apache-2.0, approved, #11855 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.17.2, Apache-2.0, approved, #13669 @@ -23,7 +23,7 @@ maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.2 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.17.2, Apache-2.0, approved, #14194 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.16.2, Apache-2.0, approved, #11858 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.17.2, Apache-2.0, approved, #14195 -maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.0, Apache-2.0, approved, #13668 +maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.1, Apache-2.0, approved, #13668 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.2, Apache-2.0, approved, #13668 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.2, Apache-2.0, approved, #14162 @@ -284,15 +284,15 @@ maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.6, EPL-2.0 OR GPL-2.0-only with maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/osgi-resource-locator/1.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.7, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ11429 maven/mavencentral/org.hamcrest/hamcrest/2.1, BSD-3-Clause, approved, clearlydefined @@ -338,10 +338,10 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.25, MIT, approved, CQ13368 maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368 maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368 maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915 -maven/mavencentral/org.testcontainers/database-commons/1.20.0, MIT, approved, clearlydefined -maven/mavencentral/org.testcontainers/jdbc/1.20.0, MIT, approved, clearlydefined -maven/mavencentral/org.testcontainers/junit-jupiter/1.20.0, MIT, approved, clearlydefined -maven/mavencentral/org.testcontainers/postgresql/1.20.0, MIT, approved, clearlydefined -maven/mavencentral/org.testcontainers/testcontainers/1.20.0, MIT, approved, #15747 +maven/mavencentral/org.testcontainers/database-commons/1.20.1, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/jdbc/1.20.1, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/junit-jupiter/1.20.1, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/postgresql/1.20.1, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/testcontainers/1.20.1, MIT, approved, #15747 maven/mavencentral/org.xmlresolver/xmlresolver/5.2.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232 diff --git a/core/crawler-core/build.gradle.kts b/core/crawler-core/build.gradle.kts index b4faf33c..05c9ee46 100644 --- a/core/crawler-core/build.gradle.kts +++ b/core/crawler-core/build.gradle.kts @@ -31,9 +31,3 @@ dependencies { testImplementation(libs.edc.ext.http) testImplementation(libs.awaitility) } - -edcBuild { - swagger { - apiGroup.set("management-api") - } -} diff --git a/core/federated-catalog-core/build.gradle.kts b/core/federated-catalog-core/build.gradle.kts index 6f697210..6d2b9b4a 100644 --- a/core/federated-catalog-core/build.gradle.kts +++ b/core/federated-catalog-core/build.gradle.kts @@ -45,9 +45,3 @@ dependencies { testImplementation(testFixtures(project(":spi:federated-catalog-spi"))) } - -edcBuild { - swagger { - apiGroup.set("management-api") - } -} diff --git a/docs/developer/architecture/federated-catalog-apis.md b/docs/developer/architecture/federated-catalog-apis.md index a76354b5..3dc94d75 100644 --- a/docs/developer/architecture/federated-catalog-apis.md +++ b/docs/developer/architecture/federated-catalog-apis.md @@ -20,11 +20,11 @@ Once all catalogs are collected, clients may add additional query parameters to the [QuerySpec class](https://github.com/eclipse-edc/Connector/blob/main/spi/common/core-spi/src/main/java/org/eclipse/edc/spi/query/QuerySpec.java) for details. -Please also check out [this link](https://eclipse-edc.github.io/FederatedCAtalog/openapi/catalog-api) for the complete +Please also check out [this link](https://eclipse-edc.github.io/FederatedCatalog/openapi/catalog-api) for the complete OpenAPI documentation. ## Observability API The Observability API is intended to provide information about the application health to the Docker daemon via Docker health checks and the Kubernetes control plane via Kubernetes Readiness Probes. It is not intended to be reachable -from outside the container as it lacks access control. \ No newline at end of file +from outside the container as it lacks access control. diff --git a/extensions/api/federated-catalog-api/build.gradle.kts b/extensions/api/federated-catalog-api/build.gradle.kts index c89c2f44..b6d68e3f 100644 --- a/extensions/api/federated-catalog-api/build.gradle.kts +++ b/extensions/api/federated-catalog-api/build.gradle.kts @@ -48,6 +48,6 @@ dependencies { edcBuild { swagger { - apiGroup.set("management-api") + apiGroup.set("catalog-api") } } diff --git a/extensions/api/federated-catalog-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApiExtension.java b/extensions/api/federated-catalog-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApiExtension.java index 64ffa955..8e11c356 100644 --- a/extensions/api/federated-catalog-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApiExtension.java +++ b/extensions/api/federated-catalog-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApiExtension.java @@ -50,7 +50,7 @@ public class FederatedCatalogApiExtension implements ServiceExtension { public static final String NAME = "Cache Query API Extension"; private static final String CATALOG_QUERY_SCOPE = "CATALOG_QUERY_API"; - private static final String API_VERSION_JSON_FILE = "fc-api-version.json"; + private static final String API_VERSION_JSON_FILE = "catalog-version.json"; @Inject private WebService webService; diff --git a/extensions/api/federated-catalog-api/src/main/resources/fc-api-version.json b/extensions/api/federated-catalog-api/src/main/resources/catalog-version.json similarity index 100% rename from extensions/api/federated-catalog-api/src/main/resources/fc-api-version.json rename to extensions/api/federated-catalog-api/src/main/resources/catalog-version.json diff --git a/resources/openapi/README.md b/resources/openapi/README.md new file mode 100644 index 00000000..1ff8b431 --- /dev/null +++ b/resources/openapi/README.md @@ -0,0 +1,6 @@ +# Openapi + +### .version files + +The `*.version` files contain the path for the `*-version.json` file that will be used by the openapi publish workflow +to get the context api version to be published to github pages. diff --git a/resources/openapi/catalog-api.version b/resources/openapi/catalog-api.version new file mode 100644 index 00000000..89eaf3fc --- /dev/null +++ b/resources/openapi/catalog-api.version @@ -0,0 +1 @@ +extensions/api/federated-catalog-api/src/main/resources/fc-api-version.json