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