From 9aa62b777ddcd25665fdc1544934c133e0124230 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Wed, 25 Mar 2020 12:09:54 +0000
Subject: Reduce size of client artifacts

This change:
- Removes separate packaging of the three clients
- Reduces the size of the combined client by suppressing unused
  dependencies
- Removes the Servlet code from the Docker packaging
- Removes the client WARs from the docker package

Issue-ID: POLICY-2443
Change-Id: If0a0c2dddc3f05f2815b84ae04fcc029b1c4fe08
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 packages/apex-pdp-package-full/pom.xml | 80 +++-------------------------------
 1 file changed, 5 insertions(+), 75 deletions(-)

(limited to 'packages/apex-pdp-package-full/pom.xml')

diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index 6710c6ee3..facb4f6bd 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -47,32 +47,7 @@
             <artifactId>services-onappf</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- Client Servlet applications -->
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>apex-client-full</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>apex-client-editor</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>apex-client-deployment</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>apex-client-monitoring</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
-        
+
         <!-- Plugins for Context Distribution -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
@@ -200,7 +175,7 @@
             <artifactId>cli-editor</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- Tools -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.tools</groupId>
@@ -212,14 +187,14 @@
             <artifactId>model-generator</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- Test Data used by examples -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
             <artifactId>integration-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- Sample Examples -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.examples</groupId>
@@ -256,12 +231,6 @@
             <artifactId>examples-onap-vcpe</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.examples</groupId>
-            <artifactId>examples-servlet</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.examples</groupId>
             <artifactId>examples-onap-bbs</artifactId>
@@ -433,15 +402,6 @@
                                     <outputDirectory>${project.build.directory}/examples/models/ONAPBBS</outputDirectory>
                                     <includes>NomadicONTPolicyModel.json</includes>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.examples</groupId>
-                                    <artifactId>examples-servlet</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>war</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/examples/servlet</outputDirectory>
-                                    <includes>readme_examples-servlet.txt</includes>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.tools</groupId>
                                     <artifactId>tools-common</artifactId>
@@ -490,27 +450,6 @@
                                     <classifier>jar-with-dependencies</classifier>
                                     <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>apex-client-monitoring</artifactId>
-                                    <version>${project.version}</version>
-                                    <classifier>monitoring</classifier>
-                                    <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>apex-client-editor</artifactId>
-                                    <version>${project.version}</version>
-                                    <classifier>editor</classifier>
-                                    <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>apex-client-deployment</artifactId>
-                                    <version>${project.version}</version>
-                                    <classifier>deployment</classifier>
-                                    <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.client</groupId>
                                     <artifactId>apex-client-full</artifactId>
@@ -526,7 +465,7 @@
 
                 </executions>
             </plugin>
- 
+
             <!-- Build the tar ball -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -622,15 +561,6 @@
                                         <prefix>/opt/app/policy/${project.artifactId}-${project.version}/etc</prefix>
                                     </mapper>
                                 </data>
-                                <data>
-                                    <src>${project.build.directory}/install_hierarchy/war</src>
-                                    <type>directory</type>
-                                    <dst>etc</dst>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/opt/app/policy/${install.package.name}-${project.version}/war</prefix>
-                                    </mapper>
-                                </data>
                                 <data>
                                     <src>${project.build.directory}/install_hierarchy/examples</src>
                                     <type>directory</type>
-- 
cgit 1.2.3-korg