This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch rel/0.8 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.8 by this push: new 3184d1a let the pom can be run on JDK8; remove source-assembly.xml 3184d1a is described below commit 3184d1adb6a5fc9114513db1ea487e6fb5e5ed59 Author: xiangdong huang <saint...@gmail.com> AuthorDate: Tue Dec 3 19:57:28 2019 +0800 let the pom can be run on JDK8; remove source-assembly.xml --- pom.xml | 7 +- source-assembly.xml | 281 ---------------------------------------------------- 2 files changed, 3 insertions(+), 285 deletions(-) diff --git a/pom.xml b/pom.xml index 6bf1c1f..2f5d4a2 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ <properties> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - <maven.compiler.release>8</maven.compiler.release> <maven.assembly.version>2.5.5</maven.assembly.version> <scala.version>2.11.12</scala.version> <hadoop.version>2.7.3</hadoop.version> @@ -796,6 +795,9 @@ <!-- This needs to be updated as soon as Java 20 is shipped --> <jdk>[11,20)</jdk> </activation> + <properties> + <maven.compiler.release>8</maven.compiler.release> + </properties> <dependencies> <!-- for jdk-11 --> <dependency> @@ -943,9 +945,6 @@ See https://issues.apache.org/jira/browse/MNG-5454 sigh. --> <configuration combine.self="append"> - <descriptors> - <descriptor>source-assembly.xml</descriptor> - </descriptors> <finalName>apache-iotdb-${project.version}-incubating</finalName> </configuration> </execution> diff --git a/source-assembly.xml b/source-assembly.xml deleted file mode 100644 index f42728d..0000000 --- a/source-assembly.xml +++ /dev/null @@ -1,281 +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. - ---> -<!-- How to maintain this file: -1. if you add a new file into the root of the project and want to attach the file into -source-release.zip, just add it into <files> tag. -2. if you add a new folder into the root of the project, just add it into <fileSet> tag. ---> -<assembly> - <id>source-release</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <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> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/RELEASE_NOTES.md</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/pom.xml</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/source-assembly.xml</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/mvnw.sh</source> - <fileMode>755</fileMode> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/mvnw.cmd</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/Jenkinsfile</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/jenkins.pom</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/checkstyle.xml</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/codecov.yml</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/.travis.yml</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/.gitignore</source> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/.checkstyle</source> - </file> - <!-- tsfile --> - <file> - <source>${maven.multiModuleProjectDirectory}/tsfile/pom.xml</source> - <destName>tsfile/pom.xml</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/tsfile/README.md</source> - <destName>tsfile/README.md</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/tsfile/package.sh</source> - <destName>tsfile/package.sh</destName> - </file> - <!-- spark-tsfile --> - <file> - <source>${maven.multiModuleProjectDirectory}/spark-tsfile/pom.xml</source> - <destName>spark-tsfile/pom.xml</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/spark-tsfile/README.md</source> - <destName>spark-tsfile/README.md</destName> - </file> - <!-- service-rpc--> - <file> - <source>${maven.multiModuleProjectDirectory}/service-rpc/pom.xml</source> - <destName>service-rpc/pom.xml</destName> - </file> - <!-- server --> - <file> - <source>${maven.multiModuleProjectDirectory}/server/pom.xml</source> - <destName>server/pom.xml</destName> - </file> - <!-- jdbc--> - <file> - <source>${maven.multiModuleProjectDirectory}/jdbc/pom.xml</source> - <destName>jdbc/pom.xml</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/jdbc/README.md</source> - <destName>jdbc/README.md</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/jdbc/package.sh</source> - <destName>jdbc/package.sh</destName> - </file> - <!-- hadoop--> - <file> - <source>${maven.multiModuleProjectDirectory}/hadoop/pom.xml</source> - <destName>hadoop/pom.xml</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/hadoop/README.md</source> - <destName>hadoop/README.md</destName> - </file> - <!-- grafana --> - <file> - <source>${maven.multiModuleProjectDirectory}/grafana/pom.xml</source> - <destName>grafana/pom.xml</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/grafana/readme.md</source> - <destName>grafana/readme.md</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/grafana/readme_zh.md</source> - <destName>grafana/readme_zh.md</destName> - </file> - <!-- example--> - <file> - <source>${maven.multiModuleProjectDirectory}/example/pom.xml</source> - <destName>example/pom.xml</destName> - </file> - <!-- kafka --> - <file> - <source>${maven.multiModuleProjectDirectory}/example/kafka/pom.xml</source> - <destName>example/kafka/pom.xml</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/example/kafka/readme.md</source> - <destName>example/kafka/readme.md</destName> - </file> - <!-- rocketmq --> - <file> - <source>${maven.multiModuleProjectDirectory}/example/rocketmq/pom.xml</source> - <destName>example/rocketmq/pom.xml</destName> - </file> - <file> - <source>${maven.multiModuleProjectDirectory}/example/rocketmq/readme.md</source> - <destName>example/rocketmq/readme.md</destName> - </file> - <!-- distribution--> - <file> - <source>${maven.multiModuleProjectDirectory}/distribution/pom.xml</source> - <destName>distribution/pom.xml</destName> - </file> - <!-- client --> - <file> - <source>${maven.multiModuleProjectDirectory}/client/pom.xml</source> - <destName>client/pom.xml</destName> - </file> - <!-- client-py --> - </files> - <fileSets> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/licenses</directory> - <outputDirectory>licenses</outputDirectory> - </fileSet> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/docs</directory> - <outputDirectory>docs</outputDirectory> - </fileSet> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/.mvn</directory> - <excludes> - <exclude>**/*.jar</exclude> - </excludes> - <outputDirectory>.mvn</outputDirectory> - </fileSet> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/docker</directory> - <outputDirectory>docker</outputDirectory> - </fileSet> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/tools</directory> - <outputDirectory>tools</outputDirectory> - </fileSet> - <!-- modules --> - <!-- tsfie --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/tsfile/src</directory> - <outputDirectory>tsfile/src</outputDirectory> - </fileSet> - <!-- spark-tsfie --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/spark-tsfie/src</directory> - <outputDirectory>spark-tsfie/src</outputDirectory> - </fileSet> - <!-- service-rpc --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/service-rpc/src</directory> - <outputDirectory>service-rpc/src</outputDirectory> - </fileSet> - <!-- server --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/server/src</directory> - <outputDirectory>server/src</outputDirectory> - </fileSet> - <!-- jdbc --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/jdbc/src</directory> - <outputDirectory>jdbc/src</outputDirectory> - </fileSet> - <!-- hadoop --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/hadoop/src</directory> - <outputDirectory>hadoop/src</outputDirectory> - </fileSet> - <!-- grafana --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/grafana/src</directory> - <outputDirectory>grafana/src</outputDirectory> - </fileSet> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/grafana/src</directory> - <outputDirectory>grafana/src</outputDirectory> - </fileSet> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/grafana/img</directory> - <outputDirectory>grafana/img</outputDirectory> - </fileSet> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/grafana/conf</directory> - <outputDirectory>grafana/conf</outputDirectory> - </fileSet> - <!-- example --> - <!-- rocketmq --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/example/rocketmq/src</directory> - <outputDirectory>example/rocketmq/src</outputDirectory> - </fileSet> - <!-- kafka --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/example/kafka/src</directory> - <outputDirectory>example/kafka/src</outputDirectory> - </fileSet> - <!-- distribution --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/distribution/src</directory> - <outputDirectory>distribution/src</outputDirectory> - </fileSet> - <!-- client --> - <fileSet> - <directory>${maven.multiModuleProjectDirectory}/client/src</directory> - <outputDirectory>client/src</outputDirectory> - </fileSet> - </fileSets> -</assembly>