From 97be46af1b09c5fa6be63f8ba0c0843c4ce0e94c Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Tue, 29 Sep 2020 11:16:14 -0400
Subject: [PATCH] Fix deployment of frequency limiter policy

Changed the artifact IDs of the xacml-pdp applications so they won't
clash with other jar file names.

Issue-ID: POLICY-2848
Change-Id: I844aaf6b2c4d81e52716d840b3a784873c6ce121
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 applications/guard/pom.xml        |  2 +-
 applications/match/pom.xml        |  2 +-
 applications/monitoring/pom.xml   |  2 +-
 applications/naming/pom.xml       |  2 +-
 applications/native/pom.xml       |  2 +-
 applications/optimization/pom.xml |  2 +-
 main/pom.xml                      | 12 ++++++------
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml
index 3669f317..326f0a96 100644
--- a/applications/guard/pom.xml
+++ b/applications/guard/pom.xml
@@ -27,7 +27,7 @@
         <version>2.3.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>guard</artifactId>
+    <artifactId>xacml-guard</artifactId>
 
     <name>${project.artifactId}</name>
     <description>This modules contain an application that implements onap.Guard policy-types for XACML PDP.</description>
diff --git a/applications/match/pom.xml b/applications/match/pom.xml
index d4d72013..e1908aaf 100644
--- a/applications/match/pom.xml
+++ b/applications/match/pom.xml
@@ -27,7 +27,7 @@
         <version>2.3.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>match</artifactId>
+    <artifactId>xacml-match</artifactId>
 
     <name>${project.artifactId}</name>
     <description>This modules contains the Match applications.</description>
diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml
index 5d878bb5..e334da4d 100644
--- a/applications/monitoring/pom.xml
+++ b/applications/monitoring/pom.xml
@@ -27,7 +27,7 @@
         <version>2.3.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>monitoring</artifactId>
+    <artifactId>xacml-monitoring</artifactId>
 
     <name>${project.artifactId}</name>
     <description>This modules contains applications that implement policy-types for XACML PDP.</description>
diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml
index f89bc8ad..31f0146a 100644
--- a/applications/naming/pom.xml
+++ b/applications/naming/pom.xml
@@ -27,7 +27,7 @@
         <version>2.3.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>naming</artifactId>
+    <artifactId>xacml-naming</artifactId>
 
     <name>${project.artifactId}</name>
     <description>This modules contains the SDNC naming applications.</description>
diff --git a/applications/native/pom.xml b/applications/native/pom.xml
index 1a409e3e..7c44d995 100644
--- a/applications/native/pom.xml
+++ b/applications/native/pom.xml
@@ -6,7 +6,7 @@
     <version>2.3.2-SNAPSHOT</version>
   </parent>
 
-  <artifactId>native</artifactId>
+  <artifactId>xacml-native</artifactId>
 
   <name>${project.artifactId}</name>
   <description>This modules contains the xacml application that evaluates native policies and requests.</description>
diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml
index f2587cce..0bbab7a7 100644
--- a/applications/optimization/pom.xml
+++ b/applications/optimization/pom.xml
@@ -27,7 +27,7 @@
         <version>2.3.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>optimization</artifactId>
+    <artifactId>xacml-optimization</artifactId>
 
     <name>${project.artifactId}</name>
     <description>This modules contains applications that implement policy-types for XACML PDP.</description>
diff --git a/main/pom.xml b/main/pom.xml
index 3bf3ad98..b1d21130 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -70,32 +70,32 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.xacml-pdp.applications</groupId>
-            <artifactId>monitoring</artifactId>
+            <artifactId>xacml-monitoring</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.xacml-pdp.applications</groupId>
-            <artifactId>guard</artifactId>
+            <artifactId>xacml-guard</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.xacml-pdp.applications</groupId>
-            <artifactId>optimization</artifactId>
+            <artifactId>xacml-optimization</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.xacml-pdp.applications</groupId>
-            <artifactId>naming</artifactId>
+            <artifactId>xacml-naming</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.xacml-pdp.applications</groupId>
-            <artifactId>native</artifactId>
+            <artifactId>xacml-native</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.xacml-pdp.applications</groupId>
-            <artifactId>match</artifactId>
+            <artifactId>xacml-match</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-- 
2.16.6