diff options
| author |   liamfallon <liam.fallon@ericsson.com> | 2018-09-05 15:46:31 +0100 |
|---|---|---|
| committer | liamfallon <liam.fallon@ericsson.com> | 2018-09-06 13:26:24 +0100 |
| commit | a41c877a6b1980e0e866699633e0289d9a3fdbb5 (patch) | |
| tree | 4f8d15559549760c2e74880871ec08c3b8df2d0e /client/client-deployment | |
| parent | 825ae627d4378c5cc7ab4b7d5f4b4ffefcb7977e (diff) | |
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>
Diffstat (limited to 'client/client-deployment')
| -rw-r--r-- | client/client-deployment/pom.xml | 47 | ||||
| -rw-r--r-- | client/client-deployment/src/site/site.xml | 1 |
2 files changed, 46 insertions, 2 deletions
diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml index ee4038c7a..aacf34a02 100644 --- a/client/client-deployment/pom.xml +++ b/client/client-deployment/pom.xml @@ -79,11 +79,11 @@ <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>unpack-client-deployment-shared-resources</id> + <id>unpack-client-deployment-shared-resources-war</id> <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> @@ -95,7 +95,49 @@ </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> @@ -144,6 +186,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-deployment/src/site/site.xml b/client/client-deployment/src/site/site.xml index 69399deef..aeb592ea6 100644 --- a/client/client-deployment/src/site/site.xml +++ b/client/client-deployment/src/site/site.xml @@ -16,6 +16,7 @@ <project name="APEX Client Deployment"> <body> <menu name="APEX Client Deployment"> + <item href="javadocs/index.html" name="API Doc" /> </menu> <menu ref="reports" inherit="top" /> <menu ref="modules" /> |