You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by cm...@apache.org on 2016/04/16 01:10:49 UTC
incubator-htrace git commit: HTRACE-354. Enable javadoc lint in
htrace-flume and htrace-htraced and avoid build breaks in jdk7 because of
unknown doclint flag (cmccabe)
Repository: incubator-htrace
Updated Branches:
refs/heads/master b190d9ac4 -> bdd933857
HTRACE-354. Enable javadoc lint in htrace-flume and htrace-htraced and avoid build breaks in jdk7 because of unknown doclint flag (cmccabe)
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/bdd93385
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/bdd93385
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/bdd93385
Branch: refs/heads/master
Commit: bdd93385750b838efa0bdbcdcb6a8067d915e952
Parents: b190d9a
Author: Colin P. Mccabe <cm...@apache.org>
Authored: Fri Apr 15 16:07:08 2016 -0700
Committer: Colin P. Mccabe <cm...@apache.org>
Committed: Fri Apr 15 16:07:08 2016 -0700
----------------------------------------------------------------------
htrace-flume/pom.xml | 3 ---
.../java/org/apache/htrace/impl/FlumeSpanReceiver.java | 6 ++----
htrace-hbase/pom.xml | 11 +++++++----
htrace-htraced/pom.xml | 3 ---
htrace-zipkin/pom.xml | 11 +++++++----
5 files changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/bdd93385/htrace-flume/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-flume/pom.xml b/htrace-flume/pom.xml
index 0e79d5a..c9e1834 100644
--- a/htrace-flume/pom.xml
+++ b/htrace-flume/pom.xml
@@ -47,9 +47,6 @@ language governing permissions and limitations under the License. -->
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/bdd93385/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java
----------------------------------------------------------------------
diff --git a/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java b/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java
index 199f93d..2a34954 100644
--- a/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java
+++ b/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java
@@ -247,11 +247,9 @@ public class FlumeSpanReceiver extends SpanReceiver {
}
/**
- * Close the receiver.
- * <p/>
- * This tries to shutdown thread pool.
+ * Close the receiver and shut down the thread pool.
*
- * @throws IOException
+ * @throws IOException On error.
*/
@Override
public void close() throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/bdd93385/htrace-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml
index f021dd0..6d9ea28 100644
--- a/htrace-hbase/pom.xml
+++ b/htrace-hbase/pom.xml
@@ -102,9 +102,6 @@ language governing permissions and limitations under the License. -->
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -242,6 +239,12 @@ language governing permissions and limitations under the License. -->
</plugins>
</build>
</profile>
+ <profile>
+ <id>doclint-disable</id>
+ <activation><jdk>[1.8,)</jdk></activation>
+ <properties>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </properties>
+ </profile>
</profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/bdd93385/htrace-htraced/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-htraced/pom.xml b/htrace-htraced/pom.xml
index 1724953..b67af6d 100644
--- a/htrace-htraced/pom.xml
+++ b/htrace-htraced/pom.xml
@@ -39,9 +39,6 @@ language governing permissions and limitations under the License. -->
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/bdd93385/htrace-zipkin/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml
index f9ceeb5..66659ff 100644
--- a/htrace-zipkin/pom.xml
+++ b/htrace-zipkin/pom.xml
@@ -48,9 +48,6 @@ language governing permissions and limitations under the License. -->
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -218,6 +215,12 @@ language governing permissions and limitations under the License. -->
</plugins>
</build>
</profile>
+ <profile>
+ <id>doclint-disable</id>
+ <activation><jdk>[1.8,)</jdk></activation>
+ <properties>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </properties>
+ </profile>
</profiles>
-
</project>