From a41c877a6b1980e0e866699633e0289d9a3fdbb5 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@ericsson.com>
Date: Wed, 5 Sep 2018 15:46:31 +0100
Subject: Fix package of apex examples and documents

The examples are not packaged correctly in the apex build
and the client wars are missing

The links and location of the documents are corrected.

Some POM duplicate dependencies removed.

Javadoc warnings removed.

Issue-ID: POLICY-867
Change-Id: I555c29191c61c0a9887365d95005dbc584eddf04
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
---
 client/client-monitoring/pom.xml           | 45 +++++++++++++++++++++++++++++-
 client/client-monitoring/src/site/site.xml |  1 +
 2 files changed, 45 insertions(+), 1 deletion(-)

(limited to 'client/client-monitoring')

diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml
index 5bfda41c0..274ac23f3 100644
--- a/client/client-monitoring/pom.xml
+++ b/client/client-monitoring/pom.xml
@@ -78,7 +78,7 @@
                         <goals>
                             <goal>unpack-dependencies</goal>
                         </goals>
-                        <phase>generate-resources</phase>
+                        <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
                             <includeArtifacIds>client-common</includeArtifacIds>
@@ -88,9 +88,51 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-common-resources-to-jar</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
+                            <filtering>false</filtering>
+                            <resources>
+                                <resource>
+                                    <directory>../client-common/src/main/resources</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-local-resources-to-jar</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
+                            <filtering>false</filtering>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/webapp</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -139,6 +181,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
                 <configuration>
                     <classifier>ui</classifier>
                     <warSourceDirectory>src/main/resources/webapp</warSourceDirectory>
diff --git a/client/client-monitoring/src/site/site.xml b/client/client-monitoring/src/site/site.xml
index 510752296..d3a31d2bf 100644
--- a/client/client-monitoring/src/site/site.xml
+++ b/client/client-monitoring/src/site/site.xml
@@ -16,6 +16,7 @@
 <project name="APEX Client Monitoring">
     <body>
         <menu name="APEX Client Monitoring">
+            <item href="javadocs/index.html" name="API Doc" />
         </menu>
         <menu ref="reports" inherit="top" />
         <menu ref="modules" />
-- 
cgit 1.2.3-korg