Commit 1a21015e authored by Aman Verma's avatar Aman Verma
Browse files

fixing version conflict

parent 2971c797
Pipeline #46390 passed with stages
in 36 minutes and 33 seconds
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
<osdu.os-schema-core.version>0.10.0-SNAPSHOT</osdu.os-schema-core.version> <osdu.os-schema-core.version>0.10.0-SNAPSHOT</osdu.os-schema-core.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<cucumber.version>5.4.0</cucumber.version> <cucumber.version>5.4.0</cucumber.version>
<nimbus-jose-jwt-azure.version>7.9</nimbus-jose-jwt-azure.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -147,11 +146,6 @@ ...@@ -147,11 +146,6 @@
<artifactId>jackson-dataformat-cbor</artifactId> <artifactId>jackson-dataformat-cbor</artifactId>
<version>2.12.3</version> <version>2.12.3</version>
</dependency> </dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbus-jose-jwt-azure.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.azure.spring</groupId> <groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory</artifactId> <artifactId>azure-spring-boot-starter-active-directory</artifactId>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
LOG_PREFIX=schema LOG_PREFIX=schema
server.servlet.context-path=/api/schema-service/v1 server.servlet.context-path=/api/schema-service/v1
server.port=${server.port} server.port=${server.port}
spring.main.allow-bean-definition-overriding=true
AUTHORIZE_API=${entitlements_service_endpoint} AUTHORIZE_API=${entitlements_service_endpoint}
AUTHORIZE_API_KEY=${entitlements_service_api_key} AUTHORIZE_API_KEY=${entitlements_service_api_key}
...@@ -72,3 +73,4 @@ shared.tenant.name=system ...@@ -72,3 +73,4 @@ shared.tenant.name=system
azure.eventGrid.enabled=${event_grid_enabled} azure.eventGrid.enabled=${event_grid_enabled}
azure.eventGrid.topicName=${event_grid_topic} azure.eventGrid.topicName=${event_grid_topic}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment