You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/07/27 02:40:58 UTC
[incubator-iotdb] branch cherry_pick_rel0.8 created (now 6b2bf22)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 6b2bf22 change version to 0.9.0-SNAPSHOT
This branch includes the following new commits:
new e4b8f0b Changed artefactId and incubating in release artefact.
new 82706a3 Changed parent pom name. Delted build module and moved "binary" build to parent pom.
new 4a489cc Fixed assembly plugin. Added sha512 code for binary package. Changed version to 0.8.0-SNAPSHOT.
new e3f6b2c [maven-release-plugin] prepare release release/0.8.0
new 5b03d26 [maven-release-plugin] prepare for next development iteration
new 8872de2 fix readme bug
new 6b2bf22 change version to 0.9.0-SNAPSHOT
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 07/07: change version to 0.9.0-SNAPSHOT
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 6b2bf220dd4032de03b6b6646976045732ef58e1
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Jul 27 10:40:13 2019 +0800
change version to 0.9.0-SNAPSHOT
---
client/pom.xml | 2 +-
example/kafka/pom.xml | 4 ++--
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
grafana/pom.xml | 2 +-
hadoop/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
pom.xml | 2 +-
server/pom.xml | 2 +-
service-rpc/pom.xml | 2 +-
spark-tsfile/pom.xml | 2 +-
tsfile/pom.xml | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 45e35a0..7849697 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-client</artifactId>
diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml
index 8db52bd..b7879eb 100644
--- a/example/kafka/pom.xml
+++ b/example/kafka/pom.xml
@@ -24,12 +24,12 @@
<!-- you need to add the following content if you remove the parent pom.
<groupId>org.apache.iotdb.example</groupId>
<artifactId>kafka-example</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0</version>
-->
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>kafka-example</artifactId>
diff --git a/example/pom.xml b/example/pom.xml
index 2ff9865..8f5851e 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/example/rocketmq/pom.xml b/example/rocketmq/pom.xml
index 6e001e2..4806ff1 100644
--- a/example/rocketmq/pom.xml
+++ b/example/rocketmq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rocketmq-example</artifactId>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index e318102..ba829ff 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!--parent>
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index c132f7d..a2a8751 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.iotdb.tsfile</groupId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 3912d9c..c5967a9 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-jdbc</artifactId>
diff --git a/pom.xml b/pom.xml
index fe36257..8369f11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache IoTDB (incubating) Project Parent POM</name>
<description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description>
diff --git a/server/pom.xml b/server/pom.xml
index 962db39..43a7d3f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-server</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index 40511b8..f61aa86 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>service-rpc</artifactId>
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index 28a9e06..3d74f8f 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-tsfile</artifactId>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 3b91e4b..709a4ef 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile</artifactId>
[incubator-iotdb] 02/07: Changed parent pom name. Delted build
module and moved "binary" build to parent pom.
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 82706a3d184651d0098f9adecbd235d7b8afcbaf
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Fri Jul 26 18:38:16 2019 +0800
Changed parent pom name. Delted build module and moved "binary" build to parent pom.
---
build/pom.xml | 57 ----------------------
client/pom.xml | 6 +--
example/pom.xml | 4 +-
grafana/pom.xml | 6 +--
hadoop/pom.xml | 4 +-
jdbc/pom.xml | 8 +--
pom.xml | 34 ++++++++++++-
server/pom.xml | 4 +-
service-rpc/pom.xml | 4 +-
spark-tsfile/pom.xml | 4 +-
.../resources => src/assembly}/distribution.xml | 2 +-
tsfile/pom.xml | 4 +-
12 files changed, 56 insertions(+), 81 deletions(-)
diff --git a/build/pom.xml b/build/pom.xml
deleted file mode 100644
index dbdfb94..0000000
--- a/build/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>incubating-iotdb-parent</artifactId>
- <groupId>org.apache.iotdb</groupId>
- <version>0.9.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>incubating-iotdb</artifactId>
- <name>build-incubating-iotdb</name>
- <url>https://iotdb.apache.org</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/resources/distribution.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/client/pom.xml b/client/pom.xml
index 2489c20..13d842a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-client</artifactId>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/example/pom.xml b/example/pom.xml
index 37ae439..2ff9865 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index a4246d3..416e720 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!--parent>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>${project.version}</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index ffad7d3..c132f7d 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.iotdb.tsfile</groupId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index ebaae26..79496b8 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-jdbc</artifactId>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
- <version>${project.version}</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>service-rpc</artifactId>
- <version>${project.version}</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 807a62a..f38f62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,6 @@
<module>example</module>
<module>grafana</module>
<module>spark-tsfile</module>
- <module>build</module>
<!-- <module>hadoop</module> -->
</modules>
<build>
@@ -608,6 +607,19 @@
<finalName>apache-iotdb-${project.version}-incubating</finalName>
</configuration>
</execution>
+ <!-- Package binaries-->
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/distribution.xml</descriptor>
+ </descriptors>
+ <finalName>apache-iotdb-${project.version}-incubating-bin</finalName>
+ </configuration>
+ </execution>
</executions>
</plugin>
<!--
@@ -638,6 +650,26 @@
</fileSets>
</configuration>
</execution>
+ <execution>
+ <id>sign-binary-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>apache-iotdb-${project.version}-SNAPSHOT-incubating-bin-release.zip</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/server/pom.xml b/server/pom.xml
index 5653926..962db39 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-server</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index 19b2955..40511b8 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>service-rpc</artifactId>
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index 7745435..28a9e06 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-tsfile</artifactId>
diff --git a/build/src/main/resources/distribution.xml b/src/assembly/distribution.xml
similarity index 99%
rename from build/src/main/resources/distribution.xml
rename to src/assembly/distribution.xml
index 8bd7bd3..149c8ab 100644
--- a/build/src/main/resources/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -22,7 +22,7 @@
<assembly>
<id>release</id>
<formats>
- <format>tar.gz</format>
+ <format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<files>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 8162cb8..3b91e4b 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile</artifactId>
[incubator-iotdb] 05/07: [maven-release-plugin] prepare for next
development iteration
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 5b03d26e103ce9bf8d69241f08689e1129405b03
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Fri Jul 26 21:21:08 2019 +0800
[maven-release-plugin] prepare for next development iteration
---
client/pom.xml | 4 ++--
example/kafka/pom.xml | 2 +-
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
grafana/pom.xml | 6 +++---
jdbc/pom.xml | 8 ++++----
pom.xml | 6 +++---
server/pom.xml | 2 +-
service-rpc/pom.xml | 4 ++--
spark-tsfile/pom.xml | 2 +-
tsfile/pom.xml | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 72cbd5c..8572043 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-client</artifactId>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml
index eb7cf9b..8db52bd 100644
--- a/example/kafka/pom.xml
+++ b/example/kafka/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>kafka-example</artifactId>
diff --git a/example/pom.xml b/example/pom.xml
index af0d443..2ff9865 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/example/rocketmq/pom.xml b/example/rocketmq/pom.xml
index 7e9da79..6e001e2 100644
--- a/example/rocketmq/pom.xml
+++ b/example/rocketmq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rocketmq-example</artifactId>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index dec8c2f..f1612a7 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!--parent>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -159,7 +159,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass>
</transformer>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index c295f70..73ecae2 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-jdbc</artifactId>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>service-rpc</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -137,7 +137,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore/>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index 38fd045..cfe1075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache IoTDB (incubating) Project Parent POM</name>
<description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description>
@@ -42,7 +42,7 @@
<connection>scm:git:https://github.com/apache/incubator-iotdb.git</connection>
<developerConnection>scm:git:https://github.com/apache/incubator-iotdb.git</developerConnection>
<url>https://github.com/apache/incubator-iotdb</url>
- <tag>release/0.8.0</tag>
+ <tag>rel/0.8</tag>
</scm>
<!-- Properties Management -->
<properties>
@@ -251,7 +251,7 @@
</requireJavaVersion>
<!-- Disabled for now as it breaks the ability to build single modules -->
<!--reactorModuleConvergence/-->
- <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/>
+ <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" />
</rules>
</configuration>
</execution>
diff --git a/server/pom.xml b/server/pom.xml
index 35c210e..962db39 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-server</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index f74a066..5c175bc 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>service-rpc</artifactId>
@@ -100,7 +100,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore/>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index 7c3013b..28a9e06 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-tsfile</artifactId>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index ef4c9a1..3b91e4b 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile</artifactId>
[incubator-iotdb] 01/07: Changed artefactId and incubating in
release artefact.
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit e4b8f0b5a70f3a1048b23088acae568ae5cad594
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Fri Jul 26 17:44:06 2019 +0800
Changed artefactId and incubating in release artefact.
---
pom.xml | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 79 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e54a41..807a62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,8 +27,8 @@
<version>21</version>
</parent>
<groupId>org.apache.iotdb</groupId>
- <artifactId>incubating-iotdb-parent</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache IoTDB (incubating) Project Parent POM</name>
<description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description>
@@ -42,7 +42,7 @@
<connection>scm:git:https://github.com/apache/incubator-iotdb.git</connection>
<developerConnection>scm:git:https://github.com/apache/incubator-iotdb.git</developerConnection>
<url>https://github.com/apache/incubator-iotdb</url>
- <tag>HEAD</tag>
+ <tag>rel/0.8</tag>
</scm>
<!-- Properties Management -->
<properties>
@@ -210,14 +210,15 @@
<!--Generated by Apache Release -->
<exclude>local-snapshots-dir/**</exclude>
<!--IoTDB data files-->
- <exclude>**/data/**</exclude>
- <exclude>**/logs/**</exclude>
+ <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>
- <exclude>NOTICE*</exclude>
+ <exclude>NOTICE-binary</exclude>
+ <exclude>LICENSE-binary</exclude>
</excludes>
</configuration>
</plugin>
@@ -368,6 +369,19 @@
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>
+ </plugin>
<!--use `mvn cobertura:cobertura` -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -570,5 +584,64 @@
</plugins>
</build>
</profile>
+ <!-- Make sure the source assembly has the right name (includes "incubating") -->
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <!-- heads up: combine.self in the following is highlighted
+ as an error in Eclipse's xml editor view.
+ Just ignore that.
+ See https://issues.apache.org/jira/browse/MNG-5454 sigh.
+ -->
+ <configuration combine.self="append">
+ <finalName>apache-iotdb-${project.version}-incubating</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--
+ Create SHA512 checksum files for the release artifacts.
+ -->
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>sign-source-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>apache-iotdb-${project.version}-incubating-source-release.zip</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[incubator-iotdb] 04/07: [maven-release-plugin] prepare release
release/0.8.0
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit e3f6b2c1e6653a5ff8601f5c67961f98e3af6924
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Fri Jul 26 21:20:50 2019 +0800
[maven-release-plugin] prepare release release/0.8.0
---
client/pom.xml | 4 ++--
example/kafka/pom.xml | 2 +-
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
grafana/pom.xml | 4 ++--
jdbc/pom.xml | 6 +++---
pom.xml | 4 ++--
server/pom.xml | 2 +-
service-rpc/pom.xml | 2 +-
spark-tsfile/pom.xml | 2 +-
tsfile/pom.xml | 2 +-
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 7178803..72cbd5c 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-client</artifactId>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml
index 2666e4f..eb7cf9b 100644
--- a/example/kafka/pom.xml
+++ b/example/kafka/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>kafka-example</artifactId>
diff --git a/example/pom.xml b/example/pom.xml
index 8a1ca86..af0d443 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/example/rocketmq/pom.xml b/example/rocketmq/pom.xml
index 28664ca..7e9da79 100644
--- a/example/rocketmq/pom.xml
+++ b/example/rocketmq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rocketmq-example</artifactId>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index 5b07c4e..dec8c2f 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!--parent>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 8ea8456..c295f70 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-jdbc</artifactId>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>service-rpc</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 9653797..38fd045 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<packaging>pom</packaging>
<name>Apache IoTDB (incubating) Project Parent POM</name>
<description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description>
@@ -42,7 +42,7 @@
<connection>scm:git:https://github.com/apache/incubator-iotdb.git</connection>
<developerConnection>scm:git:https://github.com/apache/incubator-iotdb.git</developerConnection>
<url>https://github.com/apache/incubator-iotdb</url>
- <tag>rel/0.8</tag>
+ <tag>release/0.8.0</tag>
</scm>
<!-- Properties Management -->
<properties>
diff --git a/server/pom.xml b/server/pom.xml
index 6eb0c62..35c210e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-server</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index d6d8ffb..f74a066 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>service-rpc</artifactId>
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index 9d07212..7c3013b 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-tsfile</artifactId>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 4a83f01..ef4c9a1 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile</artifactId>
[incubator-iotdb] 03/07: Fixed assembly plugin. Added sha512 code
for binary package. Changed version to 0.8.0-SNAPSHOT.
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 4a489ccaa02bd887d532171a809ae94e8fe7c036
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Fri Jul 26 18:48:21 2019 +0800
Fixed assembly plugin.
Added sha512 code for binary package.
Changed version to 0.8.0-SNAPSHOT.
---
client/pom.xml | 2 +-
example/kafka/pom.xml | 4 ++--
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
pom.xml | 25 +++----------------------
server/pom.xml | 2 +-
service-rpc/pom.xml | 2 +-
spark-tsfile/pom.xml | 2 +-
src/assembly/distribution.xml | 2 +-
tsfile/pom.xml | 2 +-
12 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 13d842a..7178803 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-client</artifactId>
diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml
index 0863efb..2666e4f 100644
--- a/example/kafka/pom.xml
+++ b/example/kafka/pom.xml
@@ -24,12 +24,12 @@
<!-- you need to add the following content if you remove the parent pom.
<groupId>org.apache.iotdb.example</groupId>
<artifactId>kafka-example</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0</version>
-->
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>kafka-example</artifactId>
diff --git a/example/pom.xml b/example/pom.xml
index 2ff9865..8a1ca86 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/example/rocketmq/pom.xml b/example/rocketmq/pom.xml
index 4806ff1..28664ca 100644
--- a/example/rocketmq/pom.xml
+++ b/example/rocketmq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rocketmq-example</artifactId>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index 416e720..5b07c4e 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!--parent>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 79496b8..8ea8456 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-jdbc</artifactId>
diff --git a/pom.xml b/pom.xml
index f38f62a..9653797 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache IoTDB (incubating) Project Parent POM</name>
<description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description>
@@ -617,7 +617,7 @@
<descriptors>
<descriptor>src/assembly/distribution.xml</descriptor>
</descriptors>
- <finalName>apache-iotdb-${project.version}-incubating-bin</finalName>
+ <finalName>apache-iotdb-${project.version}-incubating</finalName>
</configuration>
</execution>
</executions>
@@ -645,26 +645,7 @@
<directory>${project.build.directory}</directory>
<includes>
<include>apache-iotdb-${project.version}-incubating-source-release.zip</include>
- </includes>
- </fileSet>
- </fileSets>
- </configuration>
- </execution>
- <execution>
- <id>sign-binary-package</id>
- <phase>package</phase>
- <goals>
- <goal>files</goal>
- </goals>
- <configuration>
- <algorithms>
- <algorithm>SHA-512</algorithm>
- </algorithms>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>apache-iotdb-${project.version}-SNAPSHOT-incubating-bin-release.zip</include>
+ <include>apache-iotdb-${project.version}-incubating-bin.zip</include>
</includes>
</fileSet>
</fileSets>
diff --git a/server/pom.xml b/server/pom.xml
index 962db39..6eb0c62 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-server</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index 40511b8..d6d8ffb 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>service-rpc</artifactId>
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index 28a9e06..9d07212 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-tsfile</artifactId>
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
index 149c8ab..00721f9 100644
--- a/src/assembly/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -20,7 +20,7 @@
-->
<assembly>
- <id>release</id>
+ <id>bin</id>
<formats>
<format>zip</format>
</formats>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 3b91e4b..4a83f01 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile</artifactId>
[incubator-iotdb] 06/07: fix readme bug
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 8872de2964329a6118c37ae1100e00368d23ab33
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Jul 27 10:08:33 2019 +0800
fix readme bug
---
.mvn/wrapper/MavenWrapperDownloader.java | 18 -------
.mvn/wrapper/maven-wrapper.properties | 19 --------
LICENSE | 4 +-
LICENSE-binary | 5 +-
NOTICE | 35 +++-----------
NOTICE-binary | 80 +++-----------------------------
README.md | 77 ++++++++++++++----------------
client/pom.xml | 2 +-
grafana/pom.xml | 4 +-
jdbc/pom.xml | 6 +--
pom.xml | 3 +-
service-rpc/pom.xml | 2 +-
12 files changed, 60 insertions(+), 195 deletions(-)
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index 81453c4..0719667 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -1,21 +1,3 @@
-/**
- * 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.
- */
import java.util.Properties;
public class MavenWrapperDownloader {
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index c6a1519..a8812cf 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,21 +1,2 @@
-#
-# 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.
-#
-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
#wrapperUrl=https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar
diff --git a/LICENSE b/LICENSE
index 2b13598..284d469 100644
--- a/LICENSE
+++ b/LICENSE
@@ -217,6 +217,6 @@ The following classes are modified from Apache Hive, which is under Apache Licen
------------
-The following class is modified from Maven Wrapper, which is under Apache License 2.0:
+The following class is modified from Maven Wrapper
-./mvn/wrapper/MavenWrapperDownloader.java
+./.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/LICENSE-binary b/LICENSE-binary
index 5598843..b0bf564 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -223,9 +223,10 @@ The following classes are modified from Apache Hive, which is under Apache Licen
------------
-The following class is modified from Maven Wrapper, which is under Apache License 2.0:
+The following class is modified from Maven Wrapper:
+
+./.mvn/wrapper/MavenWrapperDownloader.java
-./mvn/wrapper/MavenWrapperDownloader.java
================================================================
The binary distribution of this product bundles these dependencies under the
diff --git a/NOTICE b/NOTICE
index 95d3c78..92e8847 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,28 +4,7 @@ Copyright 2018 and onwards The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Export Control Notice
----------------------
-
-This distribution includes cryptographic software. The country in which you currently reside may have
-restrictions on the import, possession, use, and/or re-export to another country, of encryption software.
-BEFORE using any encryption software, please check your country's laws, regulations and policies concerning
-the import, possession, or use, and re-export of encryption software, to see if this is permitted. See
-<http://www.wassenaar.org/> for more information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has classified this
-software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information security software
-using or performing cryptographic functions with asymmetric algorithms. The form and manner of this Apache
-Software Foundation distribution makes it eligible for export under the License Exception ENC Technology
-Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section 740.13) for
-both object code and source code.
-
-The following provides more details on the included cryptographic software:
-
-This software uses Apache Commons Crypto (https://commons.apache.org/proper/commons-crypto/) to
-support authentication, and encryption and decryption of data sent across the network between
-services.
-
+============================================================================
IoTDB project uses 4 Chinese Patents:
* 201711384490X
@@ -38,12 +17,10 @@ grant the users the right to the use of patent under the requirement of Apache 2
============================================================================
-This product contains a modified portion of 'Apache Hive', an open source
-Java SE, which can be obtained at:
+This product contains a modified portion of 'Apache Hive'
- * LICENSE:
- * https://github.com/apache/hive/blob/master/LICENSE (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/apache/hive
+Apache Hive
+Copyright 2008-2018 The Apache Software Foundation
-============================================================================
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/NOTICE-binary b/NOTICE-binary
index f32b5e0..f13f1b8 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -4,28 +4,7 @@ Copyright 2018 and onwards The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Export Control Notice
----------------------
-
-This distribution includes cryptographic software. The country in which you currently reside may have
-restrictions on the import, possession, use, and/or re-export to another country, of encryption software.
-BEFORE using any encryption software, please check your country's laws, regulations and policies concerning
-the import, possession, or use, and re-export of encryption software, to see if this is permitted. See
-<http://www.wassenaar.org/> for more information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has classified this
-software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information security software
-using or performing cryptographic functions with asymmetric algorithms. The form and manner of this Apache
-Software Foundation distribution makes it eligible for export under the License Exception ENC Technology
-Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section 740.13) for
-both object code and source code.
-
-The following provides more details on the included cryptographic software:
-
-This software uses Apache Commons Crypto (https://commons.apache.org/proper/commons-crypto/) to
-support authentication, and encryption and decryption of data sent across the network between
-services.
-
+============================================================================
IoTDB project uses 4 Chinese Patents:
* 201711384490X
@@ -38,57 +17,10 @@ grant the users the right to the use of patent under the requirement of Apache 2
============================================================================
-This product contains a modified portion of 'Apache Hive', an open source
-Java SE, which can be obtained at:
-
- * LICENSE:
- * https://github.com/apache/hive/blob/master/LICENSE (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/apache/hive
-
-============================================================================
-
-The binary distribution of this product bundles binaries of
-ch.qos.logback:logback-classic:1.1.11 and ch.qos.logback:logback-core:1.1.11 (https://logback.qos.ch/).
-It has the following notices:
-
-Logback: the reliable, generic, fast and flexible logging framework.
-Copyright (C) 1999-2017, QOS.ch. All rights reserved.
-
-This program and the accompanying materials are dual-licensed under
-either the terms of the Eclipse Public License v1.0 as published by
-the Eclipse Foundation
-
----
-
-The binary distribution of this product bundles binaries of
-javax.annotation:javax.annotation-api:1.3.2 (https://github.com/javaee/javax.annotation).
-It has the following notices:
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws of the
-State of California (excluding conflict-of-law provisions). Any
-litigation relating to this License shall be subject to the jurisdiction
-of the Federal Courts of the Northern District of California and the
-state courts of the State of California, with venue lying in Santa Clara
-County, California.
-
----
-
-The binary distribution of this product bundles binaries of
-javax.activation:javax.activation-api:1.2.0 (https://docs.oracle.com/javase/7/docs/api/javax/activation/package-summary.html).
-It has the following notices:
-
-Copyright © 1993, 2018, Oracle and/or its affiliates. All rights reserved. Use is subject to license terms. Also see the documentation redistribution policy.
-
----
-
-The binary distribution of this product bundles binaries of
-javax.xml.bind:jaxb-api:2.4.0-b180725.0427 (https://docs.oracle.com/javase/8/docs/api/javax/xml/bind/JAXB.html).
-It has the following notices:
+This product contains a modified portion of 'Apache Hive'
-Copyright © 1993, 2018, Oracle and/or its affiliates. All rights reserved. Use is subject to license terms. Also see the documentation redistribution policy.
+Apache Hive
+Copyright 2008-2018 The Apache Software Foundation
----
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
index b975f08..6298f79 100644
--- a/README.md
+++ b/README.md
@@ -59,21 +59,11 @@ If you want to use Hadoop or Spark to analyze IoTDB data file (called as TsFile)
# Quick Start
-This short guide will walk you through the basic process of using IoTDB. For a more-complete guide, please visit our website's [User Guide](https://iotdb.apache.org/#/Documents/0.8.0/sec1).
+This short guide will walk you through the basic process of using IoTDB. For a more-complete guide, please visit our website's [User Guide](https://iotdb.apache.org/#/Documents/0.8.0/chap1/sec1).
## Installation from source code
-Use git to get IoTDB source code:
-
-```
-> git clone https://github.com/apache/incubator-iotdb.git
-```
-
-Or use the following command if you have configured SSH key on GitHub:
-
-```
-> git clone git@github.com:apache/incubator-iotdb.git
-```
+You can get the released source code from https://iotdb.apache.org/#/Download, or from the git repository https://github.com/apache/incubator-iotdb/tree/master
Now suppose your directory is like this:
@@ -84,7 +74,7 @@ Now suppose your directory is like this:
> ls -l
incubator-iotdb/ <-- root path
|
-+- iotdb/
++- server/
|
+- jdbc/
|
@@ -95,18 +85,18 @@ incubator-iotdb/ <-- root path
+- pom.xml
```
-Let $IOTDB_HOME = /workspace/incubator-iotdb/iotdb/iotdb/
+Let $IOTDB_HOME = /workspace/incubator-iotdb/server/iotdb/
-Let $IOTDB_CLI_HOME = /workspace/incubator-iotdb/iotdb-cli/cli
+Let $IOTDB_CLI_HOME = /workspace/incubator-iotdb/client/cli
Note:
* if `IOTDB_HOME` is not explicitly assigned,
-then by default `IOTDB_HOME` is the direct parent directory of `bin/start-server.sh` on Unix/OS X
-(or that of `bin\start-server.bat` on Windows).
+then by default `IOTDB_HOME` is the direct parent directory of `sbin/start-server.sh` on Unix/OS X
+(or that of `sbin\start-server.bat` on Windows).
* if `IOTDB_CLI_HOME` is not explicitly assigned,
-then by default `IOTDB_CLI_HOME` is the direct parent directory of `bin/start-client.sh` on
-Unix/OS X (or that of `bin\start-client.bat` on Windows).
+then by default `IOTDB_CLI_HOME` is the direct parent directory of `sbin/start-client.sh` on
+Unix/OS X (or that of `sbin\start-client.bat` on Windows).
If you are not the first time that building IoTDB, remember deleting the following files:
@@ -121,7 +111,7 @@ Then under the root path of incubator-iotdb, you can build IoTDB using Maven:
> pwd
/workspace/incubator-iotdb
-> mvn clean package -pl iotdb -am -Dmaven.test.skip=true
+> mvn clean package -pl server -am -Dmaven.test.skip=true
```
If successful, you will see the the following text in the terminal:
@@ -130,38 +120,39 @@ If successful, you will see the the following text in the terminal:
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
-[INFO] IoTDB Root ......................................... SUCCESS [ 7.020 s]
-[INFO] TsFile ............................................. SUCCESS [ 10.486 s]
-[INFO] Service-rpc ........................................ SUCCESS [ 3.717 s]
-[INFO] IoTDB Jdbc ......................................... SUCCESS [ 3.076 s]
-[INFO] IoTDB .............................................. SUCCESS [ 8.258 s]
+[INFO] Apache IoTDB (incubating) Project Parent POM ....... SUCCESS [ 6.405 s]
+[INFO] TsFile ............................................. SUCCESS [ 10.435 s]
+[INFO] Service-rpc ........................................ SUCCESS [ 4.170 s]
+[INFO] IoTDB Jdbc ......................................... SUCCESS [ 3.252 s]
+[INFO] IoTDB Server ....................................... SUCCESS [ 8.072 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
```
+
Otherwise, you may need to check the error statements and fix the problems.
-After build, the IoTDB project will be at the folder "iotdb/iotdb". The folder will include the following contents:
+After build, the IoTDB project will be at the folder "server/iotdb". The folder will include the following contents:
```
-iotdb/iotdb/ <-- root path
+server/iotdb/ <-- root path
|
-+- bin/ <-- script files
++- sbin/ <-- script files for starting and stopping the server
+|
++- tools/ <-- script files of tools
|
+- conf/ <-- configuration files
|
+- lib/ <-- project dependencies
```
-<!-- > NOTE: We also provide already built JARs and project at [http://tsfile.org/download](http://tsfile.org/download) instead of build the jar package yourself. -->
-
## Configure
Before starting to use IoTDB, you need to config the configuration files first. For your convenience, we have already set the default config in the files.
In total, we provide users three kinds of configurations module: environment config module (iotdb-env.bat, iotdb-env.sh), system config module (tsfile-format.properties, iotdb-engine.properties) and log config module (logback.xml). All of these kinds of configuration files are put in iotdb/config folder.
-For more, you are advised to check our documentation [Chapter4: Deployment and Management](https://iotdb.apache.org/#/Documents/0.8.0/sec4) in detail.
+For more, you are advised to check our documentation [Chapter4: Deployment and Management](https://iotdb.apache.org/#/Documents/0.8.0/chap4/sec1) in detail.
## Start
@@ -171,10 +162,10 @@ After that we start the server. Running the startup script:
```
# Unix/OS X
-> $IOTDB_HOME/bin/start-server.sh
+> $IOTDB_HOME/sbin/start-server.sh
# Windows
-> $IOTDB_HOME\bin\start-server.bat
+> $IOTDB_HOME\sbin\start-server.bat
```
### Stop Server
@@ -183,10 +174,10 @@ The server can be stopped with ctrl-C or the following script:
```
# Unix/OS X
-> $IOTDB_HOME/bin/stop-server.sh
+> $IOTDB_HOME/sbin/stop-server.sh
# Windows
-> $IOTDB_HOME\bin\stop-server.bat
+> $IOTDB_HOME\sbin\stop-server.bat
```
### Start Client
@@ -198,13 +189,13 @@ Now let's trying to read and write some data from IoTDB using our Client. To sta
> pwd
/workspace/incubator-iotdb
-> mvn clean package -pl iotdb-cli -am -Dmaven.test.skip=true
+> mvn clean package -pl client -am -Dmaven.test.skip=true
# Unix/OS X
-> $IOTDB_CLI_HOME/bin/start-client.sh -h <IP> -p <PORT> -u <USER_NAME>
+> $IOTDB_CLI_HOME/sbin/start-client.sh -h <IP> -p <PORT> -u <USER_NAME>
# Windows
-> $IOTDB_CLI_HOME\bin\start-client.bat -h <IP> -p <PORT> -u <USER_NAME>
+> $IOTDB_CLI_HOME\sbin\start-client.bat -h <IP> -p <PORT> -u <USER_NAME>
```
> NOTE: In the system, we set a default user in IoTDB named 'root'. The default password for 'root' is 'root'. You can use this default user if you are making the first try or you didn't create users by yourself.
@@ -275,7 +266,7 @@ execute successfully.
If your session looks similar to what's above, congrats, your IoTDB is operational!
-For more on what commands are supported by IoTDB SQL, see our documentation [Chapter 5: IoTDB SQL Documentation](https://iotdb.apache.org/#/Documents/0.8.0/sec5).
+For more on what commands are supported by IoTDB SQL, see our documentation [Chapter 5: IoTDB SQL Documentation](https://iotdb.apache.org/#/Documents/0.8.0/chap5/sec1).
# Usage of import-csv.sh
@@ -295,10 +286,10 @@ CREATE TIMESERIES root.fit.p.s1 WITH DATATYPE=INT32,ENCODING=RLE;
### Run import shell
```
# Unix/OS X
-> $IOTDB_CLI_HOME/bin/import-csv.sh -h <ip> -p <port> -u <username> -pw <password> -f <xxx.csv>
+> $IOTDB_CLI_HOME/tools/import-csv.sh -h <ip> -p <port> -u <username> -pw <password> -f <xxx.csv>
# Windows
-> $IOTDB_CLI_HOME\bin\import-csv.bat -h <ip> -p <port> -u <username> -pw <password> -f <xxx.csv>
+> $IOTDB_CLI_HOME\tools\import-csv.bat -h <ip> -p <port> -u <username> -pw <password> -f <xxx.csv>
```
### Error data file
@@ -310,8 +301,8 @@ CREATE TIMESERIES root.fit.p.s1 WITH DATATYPE=INT32,ENCODING=RLE;
### Run export shell
```
# Unix/OS X
-> $IOTDB_CLI_HOME/bin/export-csv.sh -h <ip> -p <port> -u <username> -pw <password> -td <xxx.csv> [-tf <time-format>]
+> $IOTDB_CLI_HOME/tools/export-csv.sh -h <ip> -p <port> -u <username> -pw <password> -td <xxx.csv> [-tf <time-format>]
# Windows
-> $IOTDB_CLI_HOME\export-csv.bat -h <ip> -p <port> -u <username> -pw <password> -td <xxx.csv> [-tf <time-format>]
+> $IOTDB_CLI_HOME\tools\export-csv.bat -h <ip> -p <port> -u <username> -pw <password> -td <xxx.csv> [-tf <time-format>]
```
diff --git a/client/pom.xml b/client/pom.xml
index 8572043..45e35a0 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index f1612a7..e318102 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -159,7 +159,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass>
</transformer>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 73ecae2..3912d9c 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>service-rpc</artifactId>
- <version>0.8.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
@@ -137,7 +137,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index cfe1075..fe36257 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,6 +188,7 @@
<excludes>
<!-- Git related files -->
<exclude>**/.git/**</exclude>
+ <exclude>**/.mvn/**</exclude>
<exclude>**/.gitignore</exclude>
<!-- Maven related files -->
<exclude>**/target/**</exclude>
@@ -251,7 +252,7 @@
</requireJavaVersion>
<!-- Disabled for now as it breaks the ability to build single modules -->
<!--reactorModuleConvergence/-->
- <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" />
+ <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/>
</rules>
</configuration>
</execution>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index 5c175bc..40511b8 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -100,7 +100,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>