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>
---
 .../src/main/package/tarball/assembly.xml          | 24 ++++------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'packages/apex-pdp-package-full/src/main/package/tarball')

diff --git a/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml b/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml
index 5101821ed..a5d25593c 100644
--- a/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml
+++ b/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml
@@ -1,19 +1,20 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2020 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  
+
   SPDX-License-Identifier: Apache-2.0
   ============LICENSE_END=========================================================
 -->
@@ -33,15 +34,6 @@
                 <include>*:jar</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <useProjectArtifact>true</useProjectArtifact>
-            <outputDirectory>war</outputDirectory>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-            <includes>
-                <include>*:war</include>
-            </includes>
-        </dependencySet>
     </dependencySets>
     <fileSets>
         <fileSet>
@@ -110,13 +102,5 @@
                 <exclude>*.formatted</exclude>
             </excludes>
         </fileSet>
-        <!-- Just to keep readme & war file in the same directory -->
-        <fileSet>
-            <directory>${project.build.directory}/etc</directory>
-            <includes>
-                <include>readme_examples-servlet.txt</include>
-            </includes>
-            <outputDirectory>war</outputDirectory>
-        </fileSet>
     </fileSets>
 </assembly>
-- 
cgit 1.2.3-korg