From a41c877a6b1980e0e866699633e0289d9a3fdbb5 Mon Sep 17 00:00:00 2001 From: liamfallon 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 --- .../site-docs/adoc/fragments/apex-configuration.adoc | 2 +- .../src/site-docs/adoc/fragments/dockerfile.adoc | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 examples/examples-periodic/src/site-docs/adoc/fragments/dockerfile.adoc (limited to 'examples/examples-periodic/src/site-docs') diff --git a/examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc b/examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc index 612149818..5540f1591 100644 --- a/examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc +++ b/examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc @@ -16,5 +16,5 @@ .APEX configuration [source,json,options="nowrap"] ---- -include::{adsite-examples-periodic-dir}/main/resources/config/ApexConfigPeriodic.json[APEX configuration] +include::{adsite-examples-periodic-dir}/main/resources/examples/config/Periodic/ApexConfigPeriodic.json[APEX configuration] ---- diff --git a/examples/examples-periodic/src/site-docs/adoc/fragments/dockerfile.adoc b/examples/examples-periodic/src/site-docs/adoc/fragments/dockerfile.adoc deleted file mode 100644 index 3ee66b3bd..000000000 --- a/examples/examples-periodic/src/site-docs/adoc/fragments/dockerfile.adoc +++ /dev/null @@ -1,20 +0,0 @@ -// -// ============LICENSE_START======================================================= -// Copyright (C) 2016-2018 Ericsson. All rights reserved. -// ================================================================================ -// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE -// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode -// -// SPDX-License-Identifier: CC-BY-4.0 -// ============LICENSE_END========================================================= -// -// @author Sven van der Meer (sven.van.der.meer@ericsson.com) -// - -== Dockerfile - -.Dockerfile -[source,bash,options="nowrap"] ----- -include::{adsite-examples-periodic-dir}/../Dockerfile[Dockerfile] ----- -- cgit 1.2.3-korg