diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cd05a9e1da3..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -dist: trusty -#sudo: required - -language: java - -jdk: - - oraclejdk8 - -before_install: -# - sudo apt-get install -qq libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev -# - wget http://archive.apache.org/dist/thrift/0.9.1/thrift-0.9.1.tar.gz -# - tar xfz thrift-0.9.1.tar.gz -# - cd thrift-0.9.1 -# - chmod +x ./configure -# - ./configure --disable-gen-erl --disable-gen-hs --without-cpp --without-boost --without-qt4 --without-c_glib --without-csharp --without-erlang --without-python --without-perl --without-php --without-php_extension --without-ruby --without-haskell --without-go --without-d -# - sudo make install -# - cd .. - - - pip install --user codecov -# we do not need to use the following commands anymore, because now we are a assemble project! -# - git clone https://github.com/thulab/tsfile.git -# - cd tsfile -# - mvn install -DskipTests=true -# - cd .. - -script: -# only SNAPSHOT version needs to do the following phase -#we do not need to run mvn cobertura:cobertura manually anymore, because we have config it in the pom.xml -# - mvn cobertura:cobertura - - bash <(curl -s https://codecov.io/bash) -t 853796a6-a626-422f-a897-ac233e121f8f - - mvn clean test - -after_success: -# - mvn cobertura:cobertura - - bash <(curl -s https://codecov.io/bash) -t 853796a6-a626-422f-a897-ac233e121f8f diff --git a/iotdb/.local.ci b/iotdb/.local.ci deleted file mode 100644 index 7edce9c3e38..00000000000 --- a/iotdb/.local.ci +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -#pwd -#rm -rf data - -## get tsfile and jdbc -#rm -rf tsfile -#git clone https://github.com/thulab/tsfile.git -#cd tsfile -#mvn clean install -Dmaven.test.skip=true -#cd .. -#rm -rf iotdb-jdbc -#git clone https://github.com/thulab/iotdb-jdbc.git -#cd iotdb-jdbc -#mvn clean install -Dmaven.test.skip=true -#cd .. - -##begin ... -#rm -rf data -#mvn clean test -#rm -rf data diff --git a/iotdb/pom.xml b/iotdb/pom.xml index 32d66f35b3c..345007b283b 100644 --- a/iotdb/pom.xml +++ b/iotdb/pom.xml @@ -9,7 +9,6 @@ ../pom.xml - cn.edu.tsinghua IoTDB jar @@ -21,6 +20,7 @@ 1.3.1 3.5.2 2.14.5 + false **/*Test.java **/NoTest.java @@ -115,6 +115,7 @@ 2.9 alphabetical + ${iotdb.test.skip} ${it.test.excludes} diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 7e93dbb19fd..59fdf1dac42 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -41,10 +41,11 @@ - + + false + - cn.edu.tsinghua tsfile @@ -77,7 +78,14 @@ - + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + ${jdbc.test.skip} + + diff --git a/jdbc/src/main/java/cn/edu/tsinghua/iotdb/jdbc/TsfileConnection.java b/jdbc/src/main/java/cn/edu/tsinghua/iotdb/jdbc/TsfileConnection.java index 4f29ba0c7d3..e2e01fa8fc0 100644 --- a/jdbc/src/main/java/cn/edu/tsinghua/iotdb/jdbc/TsfileConnection.java +++ b/jdbc/src/main/java/cn/edu/tsinghua/iotdb/jdbc/TsfileConnection.java @@ -54,8 +54,7 @@ public class TsfileConnection implements Connection { private DateTimeZone timeZone; private boolean autoCommit; - public TsfileConnection(){ - + public TsfileConnection(){ } public TsfileConnection(String url, Properties info) throws SQLException, TTransportException { diff --git a/pom.xml b/pom.xml index 6b267ac051c..7962538fa6d 100644 --- a/pom.xml +++ b/pom.xml @@ -121,8 +121,8 @@ 1.1.3 20140107 2.9.9 - false - false + 2.0.1 20140107 0.9.1 @@ -232,7 +232,7 @@ check - test + cobertura diff --git a/tsfile/pom.xml b/tsfile/pom.xml index 5e74f937bbf..f98f8c2e2ba 100644 --- a/tsfile/pom.xml +++ b/tsfile/pom.xml @@ -77,14 +77,15 @@ - + + false + ch.qos.logback logback-classic - org.json json @@ -145,6 +146,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + ${tsfile.test.skip} + +