Skip to content
Snippets Groups Projects
Commit ebd5771b authored by Marc Burnie [AWS]'s avatar Marc Burnie [AWS]
Browse files

Merge branch 'master' into master-dev-merge

parents 9d1d1498 8e8ebe3c
No related branches found
No related tags found
1 merge request!250Adding AWS Helm Charts
Pipeline #131668 passed with warnings
...@@ -94,6 +94,7 @@ The following software have components provided under the terms of this license: ...@@ -94,6 +94,7 @@ The following software have components provided under the terms of this license:
- Cloud Storage JSON API v1-rev20220604-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Cloud Storage JSON API v1-rev20220604-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Cloud Storage JSON API v1-rev20220608-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Cloud Storage JSON API v1-rev20220608-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Cloud Storage JSON API v1-rev20220705-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Cloud Storage JSON API v1-rev20220705-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Cloud Storage JSON API v1-rev20220705-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections) - Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
- Commons Digester (from http://commons.apache.org/digester/) - Commons Digester (from http://commons.apache.org/digester/)
- Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson) - Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
...@@ -128,6 +129,7 @@ The following software have components provided under the terms of this license: ...@@ -128,6 +129,7 @@ The following software have components provided under the terms of this license:
- IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java)
- Identity and Access Management (IAM) API v2beta-rev20220421-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam) - Identity and Access Management (IAM) API v2beta-rev20220421-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
- Identity and Access Management (IAM) API v2beta-rev20220526-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam) - Identity and Access Management (IAM) API v2beta-rev20220526-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
- Identity and Access Management (IAM) API v2beta-rev20220713-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
- J2ObjC Annotations (from https://github.com/google/j2objc/) - J2ObjC Annotations (from https://github.com/google/j2objc/)
- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec) - JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
- JBoss Logging 3 (from http://www.jboss.org) - JBoss Logging 3 (from http://www.jboss.org)
...@@ -825,6 +827,8 @@ The following software have components provided under the terms of this license: ...@@ -825,6 +827,8 @@ The following software have components provided under the terms of this license:
- PostgreSQL JDBC Driver - PostgreSQL JDBC Driver
- Prometheus Java Simpleclient (from https://repo1.maven.org/maven2/io/prometheus/simpleclient) - Prometheus Java Simpleclient (from https://repo1.maven.org/maven2/io/prometheus/simpleclient)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com) - RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- Undertow Core (from https://repo1.maven.org/maven2/io/undertow/undertow-core)
- Undertow WebSockets JSR356 implementations (from https://repo1.maven.org/maven2/io/undertow/undertow-websockets-jsr)
- reactive-streams (from http://www.reactive-streams.org/) - reactive-streams (from http://www.reactive-streams.org/)
======================================================================== ========================================================================
......
...@@ -39,7 +39,7 @@ app.expireTime=300 ...@@ -39,7 +39,7 @@ app.expireTime=300
app.maxCacheSize=10 app.maxCacheSize=10
# Azure AD configuration # Azure AD configuration
azure.activedirectory.client-id=${aad_client_id} #azure.activedirectory.client-id=${aad_client_id}
azure.activedirectory.AppIdUri=api://${azure.activedirectory.client-id} azure.activedirectory.AppIdUri=api://${azure.activedirectory.client-id}
azure.activedirectory.session-stateless=true azure.activedirectory.session-stateless=true
azure.activedirectory.app-resource-id=${aad_client_id} azure.activedirectory.app-resource-id=${aad_client_id}
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<java.version>8</java.version> <java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -44,7 +46,7 @@ ...@@ -44,7 +46,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId> <artifactId>core-lib-gcp</artifactId>
<version>0.16.0-rc1</version> <version>0.16.0</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -84,6 +86,21 @@ ...@@ -84,6 +86,21 @@
<version>4.12</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<undertow-websockets-jsr.version>2.2.11.Final</undertow-websockets-jsr.version> <undertow-websockets-jsr.version>2.2.11.Final</undertow-websockets-jsr.version>
<jackson-dataformat-cbor.version>2.13.0</jackson-dataformat-cbor.version> <jackson-dataformat-cbor.version>2.13.0</jackson-dataformat-cbor.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -71,6 +73,21 @@ ...@@ -71,6 +73,21 @@
<artifactId>jackson-dataformat-cbor</artifactId> <artifactId>jackson-dataformat-cbor</artifactId>
<version>${jackson-dataformat-cbor.version}</version> <version>${jackson-dataformat-cbor.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
......
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