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 <[email protected]> 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>
