From 861c65451e377799de1970712c5ab55e398f5930 Mon Sep 17 00:00:00 2001 From: qiaojialin <646274302@qq.com> Date: Sat, 12 Oct 2019 09:45:27 +0800 Subject: [PATCH 1/3] exclude .mvn/wrapper/maven-wrapper.jar --- .gitignore | 4 +++- pom.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 18a7508f98bac..3eaa333a8e7f9 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,9 @@ grafana/target/ !grafana/.mvn/wrapper/maven-wrapper.jar grafana/.mvn/ +#skip the maven-wrapper.jar +.mvn/wrapper/maven-wrapper.jar + grafana/logs/ *.log @@ -79,7 +82,6 @@ grafana/data/ grafana/data/test.csv **/lib/ -*.jar /target/ *.tsfile tsfile/src/test/resources/*.ts diff --git a/pom.xml b/pom.xml index 164cc6cad86be..f269bc8f3d046 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ spark-iotdb-connector distribution - + 1.8 1.8 From 15ae828da318c56c929b829ea750de5e45ffd2c6 Mon Sep 17 00:00:00 2001 From: qiaojialin <646274302@qq.com> Date: Sat, 12 Oct 2019 14:40:19 +0800 Subject: [PATCH 2/3] exclude mvn jar in distribution.xml --- distribution/src/assembly/distribution.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/distribution/src/assembly/distribution.xml b/distribution/src/assembly/distribution.xml index b0cfd6f924521..f11ea11e8c329 100644 --- a/distribution/src/assembly/distribution.xml +++ b/distribution/src/assembly/distribution.xml @@ -64,4 +64,9 @@ docs + + + mvnw* + .mvn/** + From 8979a7f85f152a62491beff97a91288ed0b26bd2 Mon Sep 17 00:00:00 2001 From: qiaojialin <646274302@qq.com> Date: Sat, 12 Oct 2019 15:05:23 +0800 Subject: [PATCH 3/3] remove excludes in distribution.xml --- distribution/src/assembly/distribution.xml | 5 ----- pom.xml | 1 - 2 files changed, 6 deletions(-) diff --git a/distribution/src/assembly/distribution.xml b/distribution/src/assembly/distribution.xml index f11ea11e8c329..b0cfd6f924521 100644 --- a/distribution/src/assembly/distribution.xml +++ b/distribution/src/assembly/distribution.xml @@ -64,9 +64,4 @@ docs - - - mvnw* - .mvn/** - diff --git a/pom.xml b/pom.xml index f269bc8f3d046..d1e4331e231e3 100644 --- a/pom.xml +++ b/pom.xml @@ -404,7 +404,6 @@ false - org.apache.maven.plugins maven-javadoc-plugin