You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by ca...@apache.org on 2016/07/05 23:35:49 UTC
[1/5] incubator-quarks git commit: init javadoc work
Repository: incubator-quarks
Updated Branches:
refs/heads/master 0f0b91794 -> b2899a82c
init javadoc work
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/ed9c773b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/ed9c773b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/ed9c773b
Branch: refs/heads/master
Commit: ed9c773b40a84c9204b0c3d13dfc08ea9457ec34
Parents: 5e1ed08
Author: cazen <ca...@apache.org>
Authored: Wed Jun 22 02:56:11 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Wed Jun 22 02:59:48 2016 +0000
----------------------------------------------------------------------
build.gradle | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/ed9c773b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index b89e76b..6f20999 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,6 +28,14 @@ ext.ext_classpath = ['com.google.code.gson:gson:2.2.4',
'io.dropwizard.metrics:metrics-core:3.1.2']
ext.target_dir = "$distsDir"
ext.target_java8_dir = "${ext.target_dir}/java8"
+ext.target_javadoc_dir = "${ext.target_dir}/docs/javadoc"
+
+if (JavaVersion.current().isJava8Compatible()) {
+ tasks.withType(Javadoc) {
+ options.addStringOption('Xdoclint:none', '-quiet')
+ options.addStringOption('sourcepath', 'src/main/java')
+ }
+}
/* Configure subprojects */
subprojects {
@@ -161,7 +169,31 @@ task copyScript {
}
}
+task aggregateJavadoc(type: Javadoc) {
+ destinationDir file("$rootProject.ext.target_javadoc_dir")
+ configure(options) {
+ author= true
+ version= true
+ use = true
+ docTitle "Apache Quarks (incubating) v${build_version}"
+ footer '<a href="http://quarks.incubator.apache.org">Apache Quarks (incubating)</a>'
+ bottom "Copyright © 2016 The Apache Software Foundation. All Rights Reserved - ${rootProject.ext.commithash}-${DSTAMP}-${TSTAMP}"
+ }
+ source subprojects.collect {project -> project.sourceSets.main.allJava }
+ classpath = files(subprojects.collect
+ {project -> project.sourceSets.main.compileClasspath}
+ )
+
+ exclude "**/connectors/runtime/**"
+ exclude "**/quarks/connectors/*/runtime/**"
+ exclude "**/quarks/console/**"
+ exclude "**/quarks/topology/spi/**"
+ exclude "**/quarks/graph/spi/**"
+ exclude "**/quarks/samples/scenarios/iotf/range/sensor/**"
+}
+
+build.dependsOn aggregateJavadoc
+
task wrapper(type: Wrapper) {
jarFile = rootProject.file('.gradle-wrapper/gradle-wrapper.jar')
}
-
[4/5] incubator-quarks git commit: apply QUARKS-152's change
Posted by ca...@apache.org.
apply QUARKS-152's change
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/5e94bab9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/5e94bab9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/5e94bab9
Branch: refs/heads/master
Commit: 5e94bab95c9c7923183d5a61e7d630a523a6d369
Parents: e17613d
Author: cazen <ca...@apache.org>
Authored: Fri Jul 1 05:13:08 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Fri Jul 1 05:13:08 2016 +0000
----------------------------------------------------------------------
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/5e94bab9/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 0896d44..930a3da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -175,14 +175,14 @@ task aggregateJavadoc(type: Javadoc) {
overview "quarks_overview.html"
windowTitle "Quarks v${build_version}"
- group("Quarks API", "quarks.execution", "quarks.function", "quarks.topology", "quarks.topology.*", "quarks.execution.*")
+ group("Quarks API", "quarks.execution", "quarks.function", "quarks.topology", "quarks.topology.json", "quarks.topology.mbeans", "quarks.topology.plumbing", "quarks.topology.services", "quarks.execution.*")
group("Quarks Providers", "quarks.providers.*")
group("Quarks Connectors", "quarks.connectors.*")
group("Quarks Samples", "quarks.samples.*")
group("Quarks Analytics", "quarks.analytics.*")
group("Quarks Utilities", "quarks.metrics", "quarks.metrics.*", "quarks.streamscope", "quarks.streamscope.*")
group("Quarks Low-Level API", "quarks.graph", "quarks.graph.*", "quarks.oplet", "quarks.oplet.*", "quarks.window")
- group("Quarks SPI", "quarks.*.spi.*")
+ group("Quarks SPI", "quarks.topology.spi", "quarks.topology.spi.*")
}
source subprojects.collect { project -> project.sourceSets.main.allJava }
classpath = files(subprojects.collect
[5/5] incubator-quarks git commit: Merge branch 'pr-147' This closes
#147
Posted by ca...@apache.org.
Merge branch 'pr-147'
This closes #147
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/b2899a82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/b2899a82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/b2899a82
Branch: refs/heads/master
Commit: b2899a82c8eb415b5d70b89cdd3c8ac6e282c342
Parents: 0f0b917 5e94bab
Author: cazen <ca...@apache.org>
Authored: Tue Jul 5 23:35:23 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Tue Jul 5 23:35:23 2016 +0000
----------------------------------------------------------------------
build.gradle | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/5] incubator-quarks git commit: remove Xdoclint:none option,
add group information
Posted by ca...@apache.org.
remove Xdoclint:none option, add group information
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/dbfc0bd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/dbfc0bd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/dbfc0bd1
Branch: refs/heads/master
Commit: dbfc0bd1be9018796e1c59c0ce5e3438bf69c9d9
Parents: ed9c773
Author: cazen <ca...@apache.org>
Authored: Fri Jun 24 04:46:30 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Fri Jun 24 04:46:30 2016 +0000
----------------------------------------------------------------------
build.gradle | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/dbfc0bd1/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6f20999..9a5fdee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,13 +30,6 @@ ext.target_dir = "$distsDir"
ext.target_java8_dir = "${ext.target_dir}/java8"
ext.target_javadoc_dir = "${ext.target_dir}/docs/javadoc"
-if (JavaVersion.current().isJava8Compatible()) {
- tasks.withType(Javadoc) {
- options.addStringOption('Xdoclint:none', '-quiet')
- options.addStringOption('sourcepath', 'src/main/java')
- }
-}
-
/* Configure subprojects */
subprojects {
if (!buildFile.exists()) {
@@ -171,6 +164,7 @@ task copyScript {
task aggregateJavadoc(type: Javadoc) {
destinationDir file("$rootProject.ext.target_javadoc_dir")
+ options.addStringOption('sourcepath', 'src/main/java')
configure(options) {
author= true
version= true
@@ -178,6 +172,17 @@ task aggregateJavadoc(type: Javadoc) {
docTitle "Apache Quarks (incubating) v${build_version}"
footer '<a href="http://quarks.incubator.apache.org">Apache Quarks (incubating)</a>'
bottom "Copyright © 2016 The Apache Software Foundation. All Rights Reserved - ${rootProject.ext.commithash}-${DSTAMP}-${TSTAMP}"
+ overview "quarks_overview.html"
+ windowTitle "Quarks v${build_version}"
+
+ group ("Quarks API", "quarks.execution", "quarks.function", "quarks.topology", "quarks.topology.*", "quarks.execution.*")
+ group ("Quarks Providers", "quarks.providers.*")
+ group ("Quarks Connectors", "quarks.connectors.*")
+ group ("Quarks Samples", "quarks.samples.*")
+ group ("Quarks Analytics", "quarks.analytics.*")
+ group ("Quarks Utilities", "quarks.metrics", "quarks.metrics.*", "quarks.streamscope", "quarks.streamscope.*")
+ group ("Quarks Low-Level API", "quarks.graph", "quarks.graph.*", "quarks.oplet", "quarks.oplet.*", "quarks.window")
+ group ("Quarks SPI", "quarks.*.spi.*")
}
source subprojects.collect {project -> project.sourceSets.main.allJava }
classpath = files(subprojects.collect
[3/5] incubator-quarks git commit: remove exclude option
Posted by ca...@apache.org.
remove exclude option
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/e17613d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/e17613d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/e17613d9
Branch: refs/heads/master
Commit: e17613d9283c115438a2582a2bf6dd830edb29cd
Parents: dbfc0bd
Author: cazen <ca...@apache.org>
Authored: Fri Jul 1 04:14:46 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Fri Jul 1 04:42:13 2016 +0000
----------------------------------------------------------------------
build.gradle | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/e17613d9/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9a5fdee..0896d44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,10 +164,10 @@ task copyScript {
task aggregateJavadoc(type: Javadoc) {
destinationDir file("$rootProject.ext.target_javadoc_dir")
- options.addStringOption('sourcepath', 'src/main/java')
+ options.addStringOption('Xdoclint:none', '-quiet')
configure(options) {
- author= true
- version= true
+ author = true
+ version = true
use = true
docTitle "Apache Quarks (incubating) v${build_version}"
footer '<a href="http://quarks.incubator.apache.org">Apache Quarks (incubating)</a>'
@@ -175,26 +175,19 @@ task aggregateJavadoc(type: Javadoc) {
overview "quarks_overview.html"
windowTitle "Quarks v${build_version}"
- group ("Quarks API", "quarks.execution", "quarks.function", "quarks.topology", "quarks.topology.*", "quarks.execution.*")
- group ("Quarks Providers", "quarks.providers.*")
- group ("Quarks Connectors", "quarks.connectors.*")
- group ("Quarks Samples", "quarks.samples.*")
- group ("Quarks Analytics", "quarks.analytics.*")
- group ("Quarks Utilities", "quarks.metrics", "quarks.metrics.*", "quarks.streamscope", "quarks.streamscope.*")
- group ("Quarks Low-Level API", "quarks.graph", "quarks.graph.*", "quarks.oplet", "quarks.oplet.*", "quarks.window")
- group ("Quarks SPI", "quarks.*.spi.*")
+ group("Quarks API", "quarks.execution", "quarks.function", "quarks.topology", "quarks.topology.*", "quarks.execution.*")
+ group("Quarks Providers", "quarks.providers.*")
+ group("Quarks Connectors", "quarks.connectors.*")
+ group("Quarks Samples", "quarks.samples.*")
+ group("Quarks Analytics", "quarks.analytics.*")
+ group("Quarks Utilities", "quarks.metrics", "quarks.metrics.*", "quarks.streamscope", "quarks.streamscope.*")
+ group("Quarks Low-Level API", "quarks.graph", "quarks.graph.*", "quarks.oplet", "quarks.oplet.*", "quarks.window")
+ group("Quarks SPI", "quarks.*.spi.*")
}
- source subprojects.collect {project -> project.sourceSets.main.allJava }
+ source subprojects.collect { project -> project.sourceSets.main.allJava }
classpath = files(subprojects.collect
- {project -> project.sourceSets.main.compileClasspath}
+ { project -> project.sourceSets.main.compileClasspath }
)
-
- exclude "**/connectors/runtime/**"
- exclude "**/quarks/connectors/*/runtime/**"
- exclude "**/quarks/console/**"
- exclude "**/quarks/topology/spi/**"
- exclude "**/quarks/graph/spi/**"
- exclude "**/quarks/samples/scenarios/iotf/range/sensor/**"
}
build.dependsOn aggregateJavadoc