You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by cd...@apache.org on 2019/08/02 07:52:14 UTC
[incubator-iotdb] branch feature/fix-binary-distribution created
(now e47a310)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/fix-binary-distribution
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at e47a310 - Fix the main issues with the assembly of the binary distribution.
This branch includes the following new commits:
new e47a310 - Fix the main issues with the assembly of the binary distribution.
The 1 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] 01/01: - Fix the main issues with the assembly of
the binary distribution.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/fix-binary-distribution
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit e47a31036d9f6e3acc1b5577ded3ae2fdf5a2904
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Aug 2 09:52:00 2019 +0200
- Fix the main issues with the assembly of the binary distribution.
---
distribution/pom.xml | 86 ++++++++++++++++++++++
.../src}/assembly/distribution.xml | 24 ++++--
pom.xml | 15 +---
3 files changed, 103 insertions(+), 22 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
new file mode 100644
index 0000000..1557d79
--- /dev/null
+++ b/distribution/pom.xml
@@ -0,0 +1,86 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>iotdb-distribution</artifactId>
+ <name>IoTDB Distribution</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <!-- Package binaries-->
+ <execution>
+ <id>binary-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/distribution.xml</descriptor>
+ </descriptors>
+ <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-bin.zip</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/assembly/distribution.xml b/distribution/src/assembly/distribution.xml
similarity index 82%
rename from src/assembly/distribution.xml
rename to distribution/src/assembly/distribution.xml
index 00721f9..736b276 100644
--- a/src/assembly/distribution.xml
+++ b/distribution/src/assembly/distribution.xml
@@ -25,15 +25,31 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <!-- Forces the assembly module to be moved to the end of the build -->
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.apache.iotdb:iotdb-server</include>
+ <include>org.apache.iotdb:iotdb-client</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
<files>
<file>
<source>${maven.multiModuleProjectDirectory}/README.md</source>
</file>
<file>
<source>${maven.multiModuleProjectDirectory}/LICENSE-binary</source>
+ <destName>LICENSE</destName>
</file>
<file>
<source>${maven.multiModuleProjectDirectory}/NOTICE-binary</source>
+ <destName>NOTICE</destName>
</file>
<file>
<source>${maven.multiModuleProjectDirectory}/DISCLAIMER</source>
@@ -56,14 +72,6 @@
<outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>${maven.multiModuleProjectDirectory}/server/iotdb/lib</directory>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${maven.multiModuleProjectDirectory}/client/cli/lib</directory>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
- <fileSet>
<directory>${maven.multiModuleProjectDirectory}/server/iotdb/sbin</directory>
<outputDirectory>sbin</outputDirectory>
</fileSet>
diff --git a/pom.xml b/pom.xml
index e819ef5..4036540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
<module>grafana</module>
<module>spark-tsfile</module>
<!-- <module>hadoop</module> -->
+ <module>distribution</module>
</modules>
<build>
<pluginManagement>
@@ -608,19 +609,6 @@
<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</finalName>
- </configuration>
- </execution>
</executions>
</plugin>
<!--
@@ -646,7 +634,6 @@
<directory>${project.build.directory}</directory>
<includes>
<include>apache-iotdb-${project.version}-incubating-source-release.zip</include>
- <include>apache-iotdb-${project.version}-incubating-bin.zip</include>
</includes>
</fileSet>
</fileSets>