diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml index 9a4e029c2ad739b40f409b02fc0f2b5e5f2d07da..d4c2158de444111915e0cf1c9acb13b453182c89 100644 --- a/provider/indexer-azure/pom.xml +++ b/provider/indexer-azure/pom.xml @@ -41,13 +41,14 @@ <nimbus-jose-jwt.version>8.2</nimbus-jose-jwt.version> <indexer-core.version>0.10.0-SNAPSHOT</indexer-core.version> <spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version> - <osdu.corelibazure.version>0.6.2</osdu.corelibazure.version> + <osdu.corelibazure.version>0.9.0</osdu.corelibazure.version> <reactor-netty.version>0.9.12.RELEASE</reactor-netty.version> <java-jwt.version>3.8.1</java-jwt.version> <powermock.version>2.0.2</powermock.version> <mockito.version>3.0.0</mockito.version> <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version> <spring-security-oauth2.version>2.3.6.RELEASE</spring-security-oauth2.version> + <spring-boot.version>2.1.18.RELEASE</spring-boot.version> </properties> <dependencyManagement> @@ -58,6 +59,13 @@ <artifactId>reactor-netty</artifactId> <version>${reactor-netty.version}</version> </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring-boot.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <!-- Inherit managed dependencies from core-lib-azure --> <dependency> <groupId>org.opengroup.osdu</groupId> @@ -119,8 +127,8 @@ </dependency> <dependency> - <groupId>com.microsoft.azure</groupId> - <artifactId>azure-active-directory-spring-boot-starter</artifactId> + <groupId>com.azure.spring</groupId> + <artifactId>azure-spring-boot-starter-active-directory</artifactId> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/security/AADSecurityConfig.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/security/AADSecurityConfig.java index c38c67d0e5deb97771fe9828b081bb9a1fa14197..ff1bd512a2b333947365187500254b98f3209087 100644 --- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/security/AADSecurityConfig.java +++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/security/AADSecurityConfig.java @@ -14,7 +14,7 @@ package org.opengroup.osdu.indexer.azure.security; -import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter; +import com.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/provider/indexer-azure/src/main/resources/application.properties b/provider/indexer-azure/src/main/resources/application.properties index 897271df395ef070a6f4971f6cfa824d36436e28..59231e1ae9e1df6c0312d6e6334749cf4f179280 100644 --- a/provider/indexer-azure/src/main/resources/application.properties +++ b/provider/indexer-azure/src/main/resources/application.properties @@ -79,6 +79,7 @@ DEPLOYMENT_ENVIRONMENT=CLOUD logging.transaction.enabled=true logging.slf4jlogger.enabled=true logging.mdccontext.enabled=true +logging.ignore.servlet.paths=/swagger-ui.html # core-lib-azure configuration tenantFactoryImpl.required=true