From 194cac3589c54400a73cb775c9ee25a24c44c8ca Mon Sep 17 00:00:00 2001
From: Abhishek Patil <abpatil@microsoft.com>
Date: Thu, 29 Oct 2020 16:44:25 +0530
Subject: [PATCH] sdk upgrade and dependency management changes. aad auth
variables uncommented.
---
provider/indexer-azure/pom.xml | 30 +++++++++++++++++--
.../src/main/resources/application.properties | 4 +--
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index 62d8f1d15..2c17d39e9 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -43,8 +43,28 @@
<nimbus-jose-jwt.version>8.2</nimbus-jose-jwt.version>
<indexer-core.version>1.0.6-SNAPSHOT</indexer-core.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
+ <osdu.azurecore.version>0.0.37</osdu.azurecore.version>
+ <reactor-netty.version>0.9.12.RELEASE</reactor-netty.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Override version defined in parent's POM -->
+ <dependency>
+ <groupId>io.projectreactor.netty</groupId>
+ <artifactId>reactor-netty</artifactId>
+ <version>${reactor-netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>core-lib-azure</artifactId>
+ <version>${osdu.azurecore.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.yaml</groupId>
@@ -97,7 +117,12 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-spring-boot-starter</artifactId>
- <version>${azure.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -147,13 +172,12 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
- <version>0.0.33</version>
+ <version>${osdu.azurecore.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
- <version>0.5.0-preview</version>
</dependency>
<dependency>
diff --git a/provider/indexer-azure/src/main/resources/application.properties b/provider/indexer-azure/src/main/resources/application.properties
index ad3d128f3..7c0cdf614 100644
--- a/provider/indexer-azure/src/main/resources/application.properties
+++ b/provider/indexer-azure/src/main/resources/application.properties
@@ -50,8 +50,8 @@ azure.activedirectory.app-resource-id=${aad_client_id}
#AzureADconfiguration, commented below settings to disable AAD AuthN ,
#Uncomment it In the Istio AUTHN disabled Scenario
-#azure.activedirectory.session-stateless=true
-#azure.activedirectory.client-id=${aad_client_id}
+azure.activedirectory.session-stateless=true
+azure.activedirectory.client-id=${aad_client_id}
# Istio Auth Enabled
azure.istio.auth.enabled=${azure_istioauth_enabled}
--
GitLab