diff --git a/pom.xml b/pom.xml index 5e5bab22d7cbf2e37f70bf62b61c13fcebe28adc..7a1dd41998a20204e2a1275f5691333cea6fbaee 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <docker.image.prefix>org.opengroup.osdu</docker.image.prefix> <powermock.version>2.0.6</powermock.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <os-core-common.version>0.9.0-rc13</os-core-common.version> + <os-core-common.version>0.9.0-rc17</os-core-common.version> <snakeyaml.version>1.26</snakeyaml.version> <nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version> </properties> diff --git a/provider/crs-catalog-gcp/crs-catalog-gke/README.md b/provider/crs-catalog-gcp/crs-catalog-gke/README.md index f8e0c863a1148fd2bfa6fe5411e740958f164ebf..665eba94c02281beeddcd930d4ce814d1d674c2b 100644 --- a/provider/crs-catalog-gcp/crs-catalog-gke/README.md +++ b/provider/crs-catalog-gcp/crs-catalog-gke/README.md @@ -47,7 +47,8 @@ In order to run the service locally or remotely, you will need to have the follo | `CRS_CATALOG_HOSTNAME` | ex `os-crs-catalog-dot-opendes.appspot.com` | CRS Catalog host| no | output of infrastructure deployment | | `AUDIENCES` | ex `*****.apps.googleusercontent.com` | Client ID for getting access to cloud resources | yes | https://console.cloud.google.com/apis/credentials | | `PROJECT_ID` | ex `opendes` | Google Cloud Project Id| no | output of infrastructure deployment | - + | `PARTITION_API` | ex `http://localhost:8081/api/partition/v1` | Partition service endpoint | no | - | + ### Run Locally Check that maven is installed: diff --git a/provider/crs-catalog-gcp/crs-catalog-gke/pom.xml b/provider/crs-catalog-gcp/crs-catalog-gke/pom.xml index d87455bcb81ec80f6587774760db62f71c9345f1..9191e365f09c00025cdfb362abbfee1b39150def 100644 --- a/provider/crs-catalog-gcp/crs-catalog-gke/pom.xml +++ b/provider/crs-catalog-gcp/crs-catalog-gke/pom.xml @@ -91,7 +91,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gcp</artifactId> - <version>0.7.0</version> + <version>0.9.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/provider/crs-catalog-gcp/crs-catalog-gke/src/main/resources/application.properties b/provider/crs-catalog-gcp/crs-catalog-gke/src/main/resources/application.properties index f39981eecaae8965e990fe98bec984fb1ba1e443..e877282236e936e130bcd07159a6b60c3c637f7f 100644 --- a/provider/crs-catalog-gcp/crs-catalog-gke/src/main/resources/application.properties +++ b/provider/crs-catalog-gcp/crs-catalog-gke/src/main/resources/application.properties @@ -32,3 +32,8 @@ osdu.crs.catalog.filename=${CRS_CATALOG_FILENAME:/mnt/crs_catalogs/crs_catalog_v # ENTITLEMENT_URL=https://entitlements-dot-opendes.appspot.com/entitlements/v1 # CRS_CATALOG_HOSTNAME=os-crs-catalog-dot-opendes.appspot.com # AUDIENCES=245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com + +PARTITION_API = http://localhsot:8080/api/partition/v1 +GOOGLE_AUDIENCES=${AUDIENCES} +partition.api=${PARTITION_API} +