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 086240c declare that JDK8 is needed for release; remove 0.8.1 tag 086240c is described below commit 086240c95648c74745357922af9e5a0e30a91a64 Author: xiangdong huang <saint...@gmail.com> AuthorDate: Tue Dec 3 17:41:51 2019 +0800 declare that JDK8 is needed for release; remove 0.8.1 tag --- docker/src/main/Dockerfile | 49 ---------------------- docker/src/main/binary/Dockerfile | 12 +++--- example/kafka/pom.xml | 2 +- hadoop/pom.xml | 4 +- .../main/java/org/apache/iotdb/jdbc/Constant.java | 2 +- pom.xml | 7 ++-- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +- 7 files changed, 15 insertions(+), 63 deletions(-) diff --git a/docker/src/main/Dockerfile b/docker/src/main/Dockerfile deleted file mode 100644 index 6ae4893..0000000 --- a/docker/src/main/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -# -# 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. -# - -#This file allow you compile the IoTDB from source codes. - -FROM openjdk:11-jre-slim -RUN apt update \ - # procps is for `free` command - && apt install wget unzip lsof procps maven thrift-compiler=0.9.1-2.1 -y \ - && wget https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip \ - && unzip 0.8.zip \ - && rm 0.8.zip \ - && cd incubator-iotdb-rel-0.8 \ - && mvn package -pl server,client -am -Papache-release -DskipTests -Dthrift.download-url="http://www.apache.org/licenses/LICENSE-2.0.txt" -Dthrift.exec.absolute.path="/usr/bin/thrift" \ - && cd target/ \ - && unzip apache-iotdb-0.8.1-SNAPSHOT-incubating-bin.zip \ - && mkdir /iotdb \ - && mv apache-iotdb-0.8.1-SNAPSHOT-incubating/* /iotdb/ \ - && cd ../../ \ - && mvn clean \ - && ls -lh ~/.m2 \ - && rm -rf ~/.m2 \ - && rm -rf /incubator-iotdb-rel-0.8 \ - && sed -i '119d' /iotdb/conf/logback.xml \ - && apt remove wget maven unzip thrift-compiler -y \ - && apt autoremove -y \ - && apt purge --auto-remove -y \ - && apt clean -y -EXPOSE 6667 -EXPOSE 31999 -VOLUME /iotdb/data -VOLUME /iotdb/logs -#ENTRYPOINT ["/iotdb/bin/start-server.sh"] diff --git a/docker/src/main/binary/Dockerfile b/docker/src/main/binary/Dockerfile index 39c10ca..38e67e1 100644 --- a/docker/src/main/binary/Dockerfile +++ b/docker/src/main/binary/Dockerfile @@ -24,12 +24,12 @@ FROM openjdk:11-jre-slim RUN apt update \ ## procps is for `free` command && apt install wget unzip lsof procps -y \ - && wget http://mirrors.tuna.tsinghua.edu.cn/apache/incubator/iotdb/0.8.1-incubating/apache-iotdb-0.8.1-incubating-bin.zip \ + && wget http://mirrors.tuna.tsinghua.edu.cn/apache/incubator/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip \ ##if you are not in China, please use the following url - #&& wget https://www-us.apache.org/dist/incubator/iotdb/0.8.1-incubating/apache-iotdb-0.8.1-incubating-bin.zip \ - && unzip apache-iotdb-0.8.1-incubating-bin.zip \ - && mv apache-iotdb-0.8.1-incubating/* /iotdb/ \ - && rm apache-iotdb-0.8.1-incubating-bin.zip \ + #&& wget https://www-us.apache.org/dist/incubator/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip \ + && unzip apache-iotdb-0.8.2-incubating-bin.zip \ + && mv apache-iotdb-0.8.2-incubating/* /iotdb/ \ + && rm apache-iotdb-0.8.2-incubating-bin.zip \ && apt remove wget unzip -y \ && apt autoremove -y \ && apt purge --auto-remove -y \ @@ -38,4 +38,4 @@ EXPOSE 6667 EXPOSE 31999 VOLUME /iotdb/data VOLUME /iotdb/logs -#ENTRYPOINT ["/iotdb/sbin/start-server.sh"] +ENTRYPOINT ["/iotdb/sbin/start-server.sh"] diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml index e5fbd73..1e76d4a 100644 --- a/example/kafka/pom.xml +++ b/example/kafka/pom.xml @@ -24,7 +24,7 @@ <!-- 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.8.1</version> + <version>0.8.2</version> --> <parent> <groupId>org.apache.iotdb</groupId> diff --git a/hadoop/pom.xml b/hadoop/pom.xml index 4c02a15..6c6de0a 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.8.1</version> + <version>0.8.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.iotdb.tsfile</groupId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>tsfile</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java index 0dc46d5..5fce741 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java @@ -24,7 +24,7 @@ public class Constant { public static final String GLOBAL_DB_NAME = "IoTDB"; - public static final String GLOBAL_DB_VERSION = "0.8.1"; + public static final String GLOBAL_DB_VERSION = "0.8.2"; public static final String GLOBAL_COLUMN_REQ = "COLUMN"; diff --git a/pom.xml b/pom.xml index dbf08cb..6bf1c1f 100644 --- a/pom.xml +++ b/pom.xml @@ -42,12 +42,13 @@ <connection>scm:git:ssh://g...@github.com/apache/incubator-iotdb.git</connection> <developerConnection>scm:git:ssh://g...@github.com/apache/incubator-iotdb.git</developerConnection> <url>ssh://g...@github.com:apache/incubator-iotdb.git</url> - <tag>release/0.8.1</tag> + <tag>release/0.8.2</tag> </scm> <!-- Properties Management --> <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> @@ -486,7 +487,7 @@ <id>enforce-version-convergence</id> <configuration> <rules> - <dependencyConvergence /> + <dependencyConvergence/> </rules> </configuration> <goals> @@ -532,7 +533,7 @@ </requireJavaVersion> <!-- Disabled for now as it breaks the ability to build single modules --> <!--reactorModuleConvergence/--> - <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" /> + <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/> </rules> </configuration> </execution> diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java index 5ce11ac..f34f834 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java @@ -26,7 +26,7 @@ public class IoTDBConstant { public static final String ENV_FILE_NAME = "iotdb-env"; public static final String IOTDB_CONF = "IOTDB_CONF"; public static final String GLOBAL_DB_NAME = "IoTDB"; - public static final String VERSION = "0.8.1"; + public static final String VERSION = "0.8.2"; public static final String REMOTE_JMX_PORT_NAME = "com.sun.management.jmxremote.port"; public static final String IOTDB_LOCAL_JMX_PORT_NAME = "iotdb.jmx.local.port"; public static final String IOTDB_REMOTE_JMX_PORT_NAME = "iotdb.jmx.remote.port";