This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new b956393 force require apache-rat check for travis (#84)
b956393 is described below
commit b95639384b504c0b5847b5c7ccbdb3abdb77d59f
Author: Xiangdong Huang <[email protected]>
AuthorDate: Mon Mar 4 00:11:43 2019 +0800
force require apache-rat check for travis (#84)
* force require apache-rat check for travis, but omit mvn apache-rat:check
on Linux+OpenJDK11 and Win OS.
---
.travis.yml | 14 ++++++++++----
pom.xml | 5 +++++
tsfile/pom.xml | 14 +-------------
.../iotdb/tsfile/file/header/PageHeaderTest.java | 19 +++++++++++++++++++
.../iotdb/tsfile/read/TsFileSequenceReaderTest.java | 19 +++++++++++++++++++
5 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 592feb9..36981a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,9 @@ matrix:
- export PATH=$PATH:"/c/java8/bin"
- export JAVA_HOME="/c/java8"
- choco install maven
+ script:
+ - java -version
+ - mvn clean integration-test
- os: windows
language: c
name: win-oraclejdk11
@@ -70,6 +73,9 @@ matrix:
- export PATH=$PATH:"/c/java11/bin"
- export JAVA_HOME="/c/java11"
- choco install maven
+ script:
+ - java -version
+ - mvn clean integration-test
#choco does not support openjdk8. we have to install it manually
# - os: windows
# language: c
@@ -90,6 +96,9 @@ matrix:
before_script:
- export JAVA_HOME=$PWD/jdk-11.0.2/
- export PATH=$JAVA_HOME/bin:$PATH
+ script:
+ - java -version
+ - mvn clean integration-test
- os: linux
name: linux-openjdk8
dist: trusty
@@ -117,11 +126,8 @@ before_install: true
install: true
script:
- #- mvn clean package -Dmaven.test.skip=true
- # For each test, travis-ci limits its output log. So we cannot test some
sub-modules like tsfile, iotdb.
- # We only test jdbc to ensure maven commands work correctly on travis-ci.
- #- mvn clean test -pl jdbc -am -Dtsfile.test.skip=true
- java -version
+ - mvn apache-rat:check
- mvn clean integration-test
after_success:
diff --git a/pom.xml b/pom.xml
index 6f92158..ee1c5e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,6 +204,11 @@
<!--IoTDB data files-->
<exclude>iotdb/data/**</exclude>
<exclude>iotdb/logs/**</exclude>
+ <exclude>src/test/resources/*.json</exclude>
+ <!-- for tsfile module -->
+ <!-- if `mvn clean` is not executed and `mvn test`
is interrupted, then perTestInputData may be not deleted -->
+
<exclude>src/test/resources/perTestInputData</exclude>
+ <exclude>src/test/resources/*.json</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 152b721..53ef892 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -113,19 +113,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/test/resources/*.json</exclude>
- <!-- if `mvn clean` is not executed and `mvn test` is
interrupted, then perTestInputData may be not deleted -->
- <exclude>src/test/resources/perTestInputData</exclude>
- <!-- Runtime log -->
- <exclude>**/*.log</exclude>
- </excludes>
- </configuration>
- </plugin>
+
</plugins>
</build>
<profiles>
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/header/PageHeaderTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/header/PageHeaderTest.java
index 1867e5a..0ae4810 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/header/PageHeaderTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/header/PageHeaderTest.java
@@ -1,3 +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.
+ */
+
package org.apache.iotdb.tsfile.file.header;
import java.io.File;
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTest.java
index f383274..6dde676 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTest.java
@@ -1,3 +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.
+ */
+
package org.apache.iotdb.tsfile.read;
import java.io.IOException;
