diff --git a/README.md b/README.md index be7cd72b..cac7aee4 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Follow instructions in README.txt in the decompressed folder To build and run the application you need: -- jdk 11 +- jdk 17 - maven Additionally, harvested data will only be picked up correctly by the API if all of the following are true: diff --git a/model/swagger.yml b/model/swagger.yml index 0ec4c347..6ab447e7 100644 --- a/model/swagger.yml +++ b/model/swagger.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: description: | Registry API enabling advanced search on PDS data and metadata. The API provides end-points to search for bundles, collections and any PDS products with advanced search queries. It also enables to browse the archive hierarchically downward (e.g. collection/s products) or upward (e.g. bundles containing a product). - version: 1.1.0 + version: 1.2.0 title: PDS Registry Search API termsOfService: 'http://pds.nasa.gov' contact: diff --git a/service/docker/Dockerfile.aws b/service/docker/Dockerfile.aws index ff845876..703ee224 100644 --- a/service/docker/Dockerfile.aws +++ b/service/docker/Dockerfile.aws @@ -41,7 +41,7 @@ # Normally we'd prefer Alpine Linux, but JDK 11 isn't available with it, so # we go with a slim Debian. Debian's good too. -FROM openjdk:11-slim +FROM openjdk:17-slim # API JAR file diff --git a/service/src/main/resources/application.properties.aws b/service/src/main/resources/application.properties.aws index 96c7e91d..a9022bd8 100644 --- a/service/src/main/resources/application.properties.aws +++ b/service/src/main/resources/application.properties.aws @@ -1,10 +1,20 @@ -springfox.documentation.swagger.v2.path=/api-docs server.contextPath=/ server.port=80 -server.forward-headers-strategy=framework +server.use-forward-headers=true + +springdoc.swagger-ui.enabled=true +springdoc.swagger-ui.path=index.html +springdoc.swagger-ui.tagsSorter=alpha + +springdoc.api-docs.path=/api-docs +springdoc.api-docs.enabled=true +springdoc.packagesToScan=gov.nasa.pds.api.registry.controller +springdoc.pathsToMatch=/** +server.forward-headers-strategy=framework +management.endpoints.web.exposure.include=* spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false -springfox.documentation.enabled=false + debug=true logging.level.root = DEBUG diff --git a/support/provenance/README.md b/support/provenance/README.md new file mode 100644 index 00000000..7566efd3 --- /dev/null +++ b/support/provenance/README.md @@ -0,0 +1,17 @@ + + +Build the docker image: + + docker build -t nasapds/registry-sweepers . + +Push it to docker hub (for integration tests): + + docker push nasapds/registry-sweepers + +Run it: + + docker run -e PROV_ENDPOINT='https://elasticsearch:9200/' -e PROV_CREDENTIALS='{"admin": "admin"}' nasapds/registry-sweepers + +With: +- PROV_ENDPOINT: the URL to the OpenSearch web server +- PROV_CREDENTIALS: the credentials for the OpenSearch connection as a JSO string, for example `{"username1": "secret_password"}`