Fix aggregateJavadoc processing warnings (not the javadoc warnings)

Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/740fcd11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/740fcd11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/740fcd11

Branch: refs/heads/master
Commit: 740fcd116ab189890477344475c1707d55b9a4d7
Parents: a08252e
Author: Dale LaBossiere <dlab...@us.ibm.com>
Authored: Thu Sep 15 09:06:47 2016 -0400
Committer: Dale LaBossiere <dlab...@us.ibm.com>
Committed: Thu Sep 15 09:06:47 2016 -0400

----------------------------------------------------------------------
 build.gradle         | 7 ++-----
 edgent_overview.html | 7 ++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/740fcd11/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 5eee9ac..f37f672 100644
--- a/build.gradle
+++ b/build.gradle
@@ -677,15 +677,11 @@ task aggregateJavadoc(type: Javadoc) {
     group("Edgent SPI", "org.apache.edgent.topology.spi", 
"org.apache.edgent.topology.spi.*")
   }
   source subprojects.collect { project -> project.sourceSets.main.allJava }
-  classpath = files(subprojects.collect
-          { project -> project.sourceSets.main.compileClasspath }
-  )
-  // Eliminate implementation packages/classes from the javadoc.
-  // TODO achieve the effect w/o causing warnings from the javadoc run
   exclude "**/edgent/connectors/**/runtime"
   exclude "**/edgent/console"
   exclude "**/edgent/samples/scenarios/iotp/range/sensor"
   exclude "**/android/**"
+  classpath = files(filteredSubprojects.collect { it.jar.archivePath })
   
   // doc-files aren't picked up automatically so get them now.
   doLast {
@@ -753,6 +749,7 @@ task releaseTarGz(type: Tar) {
 assemble {
   description = "Assemble distribution artifacts and populate the target_dir 
with jars, doc, etc. Like 'build' w/o 'test'"
   dependsOn filteredSubprojects*.assemble, aggregateJavadoc, copyScripts
+  aggregateJavadoc.mustRunAfter filteredSubprojects*.assemble
 }
 
 task all(dependsOn: assemble) {

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/740fcd11/edgent_overview.html
----------------------------------------------------------------------
diff --git a/edgent_overview.html b/edgent_overview.html
index ed4395c..e2a73ba 100644
--- a/edgent_overview.html
+++ b/edgent_overview.html
@@ -225,9 +225,14 @@ an Eclipse Jetty based implementation:
 <li>{@code 
<edgent-target>/connectors/javax.websocket-client/lib/javax.websocket-client.jar}</li>
 </ul>
 <p>
+Include jars for any Edgent analytic features you use:
+<ul>
+<li>{@code <edgent-target>/analytics/math3/lib/edgent.analytics.math3.jar}</li>
+<li>{@code 
<edgent-target>/analytics/sensors/lib/edgent.analytics.sensors.jar}</li>
+</ul>
 Include jars for any Edgent utility features you use:
 <ul>
-<li>{@code <edgent-target>/utils/metrics/lib/edgent.utils.metrics.jar} - for 
the {@code edgent.metrics} package</li>
+<li>{@code <edgent-target>/utils/metrics/lib/edgent.utils.metrics.jar} - for 
the {@code org.apache.edgent.metrics} package</li>
 </ul>
 Edgent uses <a href="www.slf4j.org">slf4j</a> for logging,
 leaving the decision of the actual logging implementation to your application

Reply via email to