[incubator-iotdb] branch master updated: modify pom and git ignore

[lt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lta 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 0403bfa  modify pom and git ignore
0403bfa is described below

commit 0403bfa1b789bd13e3eb66624ba1ecf3f69d60ea
Author: lta <li...@163.com>
AuthorDate: Sat Jul 27 09:34:32 2019 +0800

    modify pom and git ignore
---
 .gitignore | 22 +++++-----------------
 pom.xml    | 27 +++------------------------
 2 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 891a4e8..400c94e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,8 @@
-iotdb/data/*
-iotdb/derby.log
-iotdb/iotdb/data/*
-iotdb/iotdb/derby.log
-iotdb/*.pid
-iotdb/iotdb/data/*
-iotdb/iotdb/gc.log*
-iotdb/iotdb/logs/*
-iotdb/iotdb/lib/*
-iotdb/unsequence/
-iotdb/testunsequence
-conf/*
-lib/*
-sbin/*
-tools/*
+**/*.pid
+**/gc.log*
+**/logs/*
+**/lib/**
+**/data/**
 
 tsfile/src/test/resources/perTestInputData
 # Eclipse IDE files
@@ -40,7 +30,6 @@ derby-tsfile-db
 **/target/
 
 # intermediately generated locally
-**/logs/
 
 tsfile-timeseries/src/main/resources/logback.out.out.xml
 tsfile-timeseries/src/main/resources/logback.out.xml
@@ -53,7 +42,6 @@ tsfile-jdbc/src/main/resources/output/queryRes.csv
 *.gz
 *.tar.gz
 *.tar
-/data/
 #src/test/resources/logback.xml
 
 
diff --git a/pom.xml b/pom.xml
index 760b839..3e54a41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,13 +210,14 @@
                             <!--Generated by Apache Release -->
                             <exclude>local-snapshots-dir/**</exclude>
                             <!--IoTDB data files-->
-                            <exclude>iotdb/data/**</exclude>
-                            <exclude>iotdb/logs/**</exclude>
+                            <exclude>**/data/**</exclude>
+                            <exclude>**/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>
+                            <exclude>NOTICE*</exclude>
                         </excludes>
                     </configuration>
                 </plugin>
@@ -367,28 +368,6 @@
               Check if all files contain Apache headers in them.
               Ignore this plugin, we use license-maven-plugin to check apache header.
             -->
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>license-check</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <excludes>
-                        <!-- Additional files like .gitignore etc.-->
-                        <exclude>**/.*/**</exclude>
-                        <exclude>**/data/**</exclude>
-                        <exclude>NOTICE*</exclude>
-                        <exclude>licenses/*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <!--use `mvn cobertura:cobertura` -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>