Repository: incubator-eagle Updated Branches: refs/heads/master a781937e9 -> 310935d27
[CI] Integrate coveralls to track eagle code coverage ## CI Building Command mvn clean test cobertura:cobertura coveralls:report -DrepoToken=$COVERALLS_EAGLE_TOKEN Get repoToken and check report at https://coveralls.io/github/apache/incubator-eagle Author: Hao Chen <h...@apache.org> Author: Hao Chen <ha...@users.noreply.github.com> Closes #523 from haoch/integrate_coveralls. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/310935d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/310935d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/310935d2 Branch: refs/heads/master Commit: 310935d27d8be8dd12f246ceceba958c1005e2e9 Parents: a781937 Author: Hao Chen <h...@apache.org> Authored: Tue Oct 18 16:44:17 2016 +0800 Committer: Hao Chen <h...@apache.org> Committed: Tue Oct 18 16:44:17 2016 +0800 ---------------------------------------------------------------------- .gitattributes | 53 ++++++++++++++++++++ README.md | 4 +- .../eagle-alert/alert-coordinator/pom.xml | 16 ------ .../eagle/service/hbase/EmbeddedHbaseTest.java | 2 +- eagle-dev/ci-build.sh | 31 ++++++++++++ eagle-dev/ci-log4j.properties | 22 ++++++++ pom.xml | 28 +++++++++++ 7 files changed, 137 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/310935d2/.gitattributes ---------------------------------------------------------------------- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1bb92d0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,53 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# See https://github.com/alexkaratarakis/gitattributes/raw/master/Java.gitattributes + +# Handle line endings automatically for files detected as text +# and leave all files detected as binary untouched. +* text=auto + +# +# The above will handle all files NOT found below +# +# These files are text and should be normalized (Convert crlf => lf) +*.css text +*.df text +*.htm text +*.html text +*.java text +*.js text +*.json text +*.jsp text +*.jspf text +*.properties text +*.sh text +*.tld text +*.txt text +*.xml text + +# These files are binary and should be left untouched +# (binary is a macro for -text -diff) +*.class binary +*.dll binary +*.ear binary +*.gif binary +*.ico binary +*.jar binary +*.jpg binary +*.jpeg binary +*.png binary +*.so binary +*.war binary \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/310935d2/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 77fc93c..49be553 100755 --- a/README.md +++ b/README.md @@ -30,9 +30,9 @@ For more details, please visit [https://eagle.incubator.apache.org](https://eagl ## Status ### Branches -| name | status | version | description | +| name | build | coverage | description | | :---:| :---: | :---: | :--- | -| **master** | [![Build Status](https://builds.apache.org/buildStatus/icon?job=incubator-eagle-main)](https://builds.apache.org/job/incubator-eagle-main/) | 0.5.0-incubating-SNAPSHOT | Branch for continuous development. | +| [**master**](https://github.com/apache/incubator-eagle/tree/master) | [![Build Status](https://builds.apache.org/buildStatus/icon?job=incubator-eagle-main)](https://builds.apache.org/job/incubator-eagle-main/) | [![Coverage Status](https://coveralls.io/repos/github/apache/incubator-eagle/badge.svg)](https://coveralls.io/github/apache/incubator-eagle) | 0.5.0-incubating-SNAPSHOT | Branch for continuous development. | ### Latest Release http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/310935d2/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml index 772d602..64df39f 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml @@ -49,18 +49,6 @@ <groupId>com.sun.jersey.contribs</groupId> <artifactId>jersey-multipart</artifactId> </dependency> - <!--<dependency>--> - <!--<groupId>org.codehaus.jackson</groupId>--> - <!--<artifactId>jackson-mapper-asl</artifactId>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>org.codehaus.jackson</groupId>--> - <!--<artifactId>jackson-jaxrs</artifactId>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>org.codehaus.jackson</groupId>--> - <!--<artifactId>jackson-xc</artifactId>--> - <!--</dependency>--> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -81,10 +69,6 @@ <groupId>org.wso2.siddhi</groupId> <artifactId>siddhi-core</artifactId> </dependency> - <dependency> - <groupId>org.wso2.siddhi</groupId> - <artifactId>siddhi-core</artifactId> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/310935d2/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/EmbeddedHbaseTest.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/EmbeddedHbaseTest.java b/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/EmbeddedHbaseTest.java index dc7843d..0330eee 100644 --- a/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/EmbeddedHbaseTest.java +++ b/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/EmbeddedHbaseTest.java @@ -21,6 +21,6 @@ import org.junit.Test; public class EmbeddedHbaseTest extends TestHBaseBase { @Test public void testHBaseCreateTable() { - hbase.createTable("test_hbase_table","f"); + // hbase.createTable("test_hbase_table","f"); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/310935d2/eagle-dev/ci-build.sh ---------------------------------------------------------------------- diff --git a/eagle-dev/ci-build.sh b/eagle-dev/ci-build.sh new file mode 100755 index 0000000..64acc07 --- /dev/null +++ b/eagle-dev/ci-build.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Continuous Integration +# Go to eagle project root directory + +cd "$(dirname $0)/../" + +# Check whether COVERALLS_EAGLE_TOKEN is set +if [ -z "$COVERALLS_EAGLE_TOKEN" ];then + echo "Error: COVERALLS_EAGLE_TOKEN is not set, get token from https://coveralls.io/github/apache/incubator-eagle" 1>&2 + exit 1 +fi + +# build and report to coveralls +mvn clean test cobertura:cobertura coveralls:report -DrepoToken=$COVERALLS_EAGLE_TOKEN -Dmaven.javadoc.skip=true -P!ui +echo "Check report at https://coveralls.io/github/apache/incubator-eagle" http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/310935d2/eagle-dev/ci-log4j.properties ---------------------------------------------------------------------- diff --git a/eagle-dev/ci-log4j.properties b/eagle-dev/ci-log4j.properties new file mode 100644 index 0000000..a01759a --- /dev/null +++ b/eagle-dev/ci-log4j.properties @@ -0,0 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +log4j.debug=false + +log4j.rootLogger=OFF, console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/310935d2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6dc1d6c..ae97bb3 100755 --- a/pom.xml +++ b/pom.xml @@ -167,6 +167,8 @@ <maven-failsafe.version>2.6</maven-failsafe.version> <maven-checkstyle.version>2.17</maven-checkstyle.version> <checkstyle.version>7.1</checkstyle.version> + <cobertura-maven.version>2.7</cobertura-maven.version> + <coveralls-maven.version>4.3.0</coveralls-maven.version> <!-- Environment Versions--> <thrift.version>0.9.2</thrift.version> @@ -1141,6 +1143,32 @@ <artifactId>scalatest-maven-plugin</artifactId> <version>${maven-scalatest.version}</version> </plugin> + + <!-- CMD: mvn clean cobertura:cobertura coveralls:report -DrepoToken=$COVERALLS_EAGLE_TOKEN --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>${cobertura-maven.version}</version> + <configuration> + <format>xml</format> + <maxmem>256m</maxmem> + <!-- aggregated reports for multi-module projects --> + <aggregate>true</aggregate> + </configuration> + <dependencies> + <!--Use asm-5.0 to support Java 8--> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>5.0.3</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.eluder.coveralls</groupId> + <artifactId>coveralls-maven-plugin</artifactId> + <version>${coveralls-maven.version}</version> + </plugin> </plugins> </pluginManagement> <plugins>