Changed parent pom name. Delted build module and moved "binary" build to parent pom.

This commit is contained in:
Julian Feinauer 2019-07-26 18:38:16 +08:00 committed by qiaojialin
parent e4b8f0b5a7
commit 82706a3d18
12 changed files with 56 additions and 81 deletions

View File

@ -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>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>iotdb-client</artifactId> <artifactId>iotdb-client</artifactId>
@ -41,7 +41,7 @@
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<!--parent> <!--parent>
@ -61,7 +61,7 @@
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>
<version>${project.version}</version> <version>0.8.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.apache.iotdb.tsfile</groupId> <groupId>org.apache.iotdb.tsfile</groupId>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>
@ -39,12 +39,12 @@
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId> <artifactId>tsfile</artifactId>
<version>${project.version}</version> <version>0.8.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>service-rpc</artifactId> <artifactId>service-rpc</artifactId>
<version>${project.version}</version> <version>0.8.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

34
pom.xml
View File

@ -142,7 +142,6 @@
<module>example</module> <module>example</module>
<module>grafana</module> <module>grafana</module>
<module>spark-tsfile</module> <module>spark-tsfile</module>
<module>build</module>
<!-- <module>hadoop</module> --> <!-- <module>hadoop</module> -->
</modules> </modules>
<build> <build>
@ -608,6 +607,19 @@
<finalName>apache-iotdb-${project.version}-incubating</finalName> <finalName>apache-iotdb-${project.version}-incubating</finalName>
</configuration> </configuration>
</execution> </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> </executions>
</plugin> </plugin>
<!-- <!--
@ -638,6 +650,26 @@
</fileSets> </fileSets>
</configuration> </configuration>
</execution> </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> </executions>
</plugin> </plugin>
</plugins> </plugins>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>iotdb-server</artifactId> <artifactId>iotdb-server</artifactId>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>service-rpc</artifactId> <artifactId>service-rpc</artifactId>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>spark-tsfile</artifactId> <artifactId>spark-tsfile</artifactId>

View File

@ -22,7 +22,7 @@
<assembly> <assembly>
<id>release</id> <id>release</id>
<formats> <formats>
<format>tar.gz</format> <format>zip</format>
</formats> </formats>
<includeBaseDirectory>true</includeBaseDirectory> <includeBaseDirectory>true</includeBaseDirectory>
<files> <files>

View File

@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>incubating-iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.8.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>tsfile</artifactId> <artifactId>tsfile</artifactId>