diff --git a/NOTICE b/NOTICE index ae3ae29b0f758b29678a2d4a8974592e6f59e604..277c036faa44540f36dfe60016844b2ec972cfe5 100644 --- a/NOTICE +++ b/NOTICE @@ -347,6 +347,7 @@ The following software have components provided under the terms of this license: - AssertJ fluent assertions (from ) - Asynchronous Http Client (from ) - Asynchronous Http Client Netty Utils (from ) +- AutoValue Annotations (from ) - Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java) - BSON (from http://bsonspec.org) - Bean Validation API (from http://beanvalidation.org) @@ -374,6 +375,7 @@ The following software have components provided under the terms of this license: - Doxia :: XHTML Module (from ) - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) +- GSON extensions to the Google HTTP Client Library for Java. (from ) - Google APIs Client Library for Java (from ) - Google App Engine extensions to the Google HTTP Client Library for Java. (from ) - Google App Engine extensions to the Google HTTP Client Library for Java. (from ) @@ -686,6 +688,8 @@ The following software have components provided under the terms of this license: - GAX (Google Api eXtensions) (from https://github.com/googleapis) - Google APIs Client Library for Java (from ) - Google Auth Library for Java - Credentials (from ) +- Google Auth Library for Java - Credentials (from ) +- Google Auth Library for Java - OAuth2 HTTP (from ) - Google Auth Library for Java - OAuth2 HTTP (from ) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) diff --git a/pom.xml b/pom.xml index 9b9dac882a917408a52d250ebaac248b4c2b1c55..d455e0c33da5a04cd830bfb06a537aa69545d48a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ <maven.compiler.source>1.8</maven.compiler.source> <docker.image.prefix>opendes</docker.image.prefix> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <os-core-common.version>0.9.0-rc7</os-core-common.version> + <os-core-common.version>0.9.0-SNAPSHOT</os-core-common.version> <snakeyaml.version>1.26</snakeyaml.version> </properties> diff --git a/provider/legal-gcp/README.md b/provider/legal-gcp/README.md index c128bf16c89146f31005f72eeade221d3d6a3da5..76b3a3a7e70ee03c737ed5e77ea256676f17b5eb 100644 --- a/provider/legal-gcp/README.md +++ b/provider/legal-gcp/README.md @@ -126,6 +126,8 @@ You will need to have the following environment variables defined. | `HOST_URL` | `http://localhsot:8080/api/legal/v1/` | - | yes | - | | `MY_TENANT` | `osdu` | OSDU tenant used for testing | yes | - | | `SKIP_HTTP_TESTS` | ex `true` | jetty server returns 403 when running locally when deployed jettyserver is not used and the app returns a 302 so just run against deployed version only when checking http -> https redirects. Use 'true' for Google Cloud Run | yes | - | +| `GOOGLE_AUDIENCES` | ex `*****.apps.googleusercontent.com` | Client ID for getting access to cloud resources | yes | https://console.cloud.google.com/apis/credentials | +| `PARTITION_API` | ex `http://localhost:8081/api/partition/v1` | Partition service endpoint | no | - | **Entitlements configuration for integration accounts** diff --git a/provider/legal-gcp/pom.xml b/provider/legal-gcp/pom.xml index a24adb88cc37fac1e105b2fd183fd753299b8dc9..f1067516dca6dfb132af1abe7baa2df992a38dba 100644 --- a/provider/legal-gcp/pom.xml +++ b/provider/legal-gcp/pom.xml @@ -34,7 +34,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> <groupId>javax.servlet</groupId> diff --git a/provider/legal-gcp/src/main/resources/application.properties b/provider/legal-gcp/src/main/resources/application.properties index e7fe7aa6551a503201634d229a2d97e4bdcfd1db..1bb2083d6308f3d992dead21c3fddf74e2fba813 100644 --- a/provider/legal-gcp/src/main/resources/application.properties +++ b/provider/legal-gcp/src/main/resources/application.properties @@ -8,4 +8,7 @@ server.port=8080 JAVA_HEAP_OPTS=-Xms4096M -Xmx4096M JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45 -enable.full.bucket.name=false \ No newline at end of file +enable.full.bucket.name=false + +google.audiences=123.apps.googleusercontent.com +partition.api=http://localhost:8081/api/partition/v1 \ No newline at end of file