Skip to content
Snippets Groups Projects
Commit f4de6035 authored by Rostislav Vatolin's avatar Rostislav Vatolin
Browse files

Merge remote-tracking branch 'origin/master' into fix-deps

parents ea29b3d1 af1fe295
No related branches found
No related tags found
1 merge request!44Fix security vulnerabilities
Pipeline #43280 failed
......@@ -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>
......
......@@ -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:
......
......@@ -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>
......
......@@ -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}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment