From 03800aeb562f0981c207bbbc8948d6506d84a8e9 Mon Sep 17 00:00:00 2001
From: Manish Jangid <msjangid@amazon.com>
Date: Mon, 23 Jan 2023 20:39:23 +0000
Subject: [PATCH] Set pathmatch strategy to ant-path-matcher

---
 notification-core/pom.xml                                     | 1 -
 pom.xml                                                       | 2 +-
 .../src/main/resources/application.properties                 | 4 +++-
 provider/notification-azure/pom.xml                           | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/notification-core/pom.xml b/notification-core/pom.xml
index b0234b2df..5ab7bd13b 100644
--- a/notification-core/pom.xml
+++ b/notification-core/pom.xml
@@ -40,7 +40,6 @@
         <undertow.version>2.2.19.Final</undertow.version>
         <woodstox-core.version>5.3.0</woodstox-core.version>
         <log4j.version>2.17.1</log4j.version>
-        <os-core-common.version>0.19.0-rc5</os-core-common.version>
         <google-oauth-client.version>1.33.3</google-oauth-client.version>
         <google-api-client.version>1.33.2</google-api-client.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index da4c6e434..7f60ee97d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 		<java.version>8</java.version>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
-		<os-core-common.version>0.19.0-rc5</os-core-common.version>
+		<os-core-common.version>0.19.0-rc6</os-core-common.version>
 		<log4j2.version>2.17.1</log4j2.version>
 		<springfox.version>3.0.0</springfox.version>
 		<json-smart.version>2.4.7</json-smart.version>
diff --git a/provider/notification-aws/src/main/resources/application.properties b/provider/notification-aws/src/main/resources/application.properties
index 476714e0d..60f09776d 100644
--- a/provider/notification-aws/src/main/resources/application.properties
+++ b/provider/notification-aws/src/main/resources/application.properties
@@ -49,4 +49,6 @@ server.ssl.key-alias=${SSL_KEY_ALIAS:osduonaws}
 server.ssl.key-password=${SSL_KEY_PASSWORD:}
 server.ssl.key-store-password=${SSL_KEY_STORE_PASSWORD:}
 
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration
\ No newline at end of file
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration
+
+spring.mvc.pathmatch.matching-strategy=ant-path-matcher
\ No newline at end of file
diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml
index c073510b5..2f567861c 100644
--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/pom.xml
@@ -40,7 +40,7 @@
     <reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
     <reactor.core.version>3.3.0.RELEASE</reactor.core.version>
     <osdu.corelibazure.version>0.19.0-rc8</osdu.corelibazure.version>
-    <osdu.oscorecommon.version>0.19.0-rc5</osdu.oscorecommon.version>
+    <osdu.oscorecommon.version>0.19.0-rc6</osdu.oscorecommon.version>
     <junit.version>5.6.0</junit.version>
     <jjwt.version>3.8.1</jjwt.version>
     <mockito.version>2.23.0</mockito.version>
@@ -50,7 +50,7 @@
     <oauth2-oidc-sdk.version>6.0</oauth2-oidc-sdk.version>
     <woodstox-core.version>5.3.0</woodstox-core.version>
     <spring-webmvc.version>5.3.22</spring-webmvc.version>
-    <os-core-common.version>0.19.0-rc5</os-core-common.version>
+    <os-core-common.version>0.19.0-rc6</os-core-common.version>
     <undertow.version>2.2.19.Final</undertow.version>
     <spring-boot-maven-plugin.version>2.7.6</spring-boot-maven-plugin.version>
   </properties>
-- 
GitLab