This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch remove_incubating
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/remove_incubating by this push:
new 620b7ca update the website because of graduation
620b7ca is described below
commit 620b7ca2aa15134c210d2d6e8f7b58c9773e90fc
Author: Xiangdong Huang <[email protected]>
AuthorDate: Thu Sep 24 08:37:37 2020 +0800
update the website because of graduation
---
DISCLAIMER | 6 ------
distribution/pom.xml | 4 ++--
docker/src/main/Dockerfile | 4 ++--
docs/Development/VoteRelease.md | 12 ++----------
docs/Download/README.md | 2 ++
docs/UserGuide/Server/Download.md | 2 +-
docs/zh/Development/VoteRelease.md | 12 ++----------
docs/zh/Download/README.md | 1 +
pom.xml | 2 +-
site/iotdb-doap.rdf | 14 +++++++-------
site/src/main/.vuepress/theme/components/Page.vue | 3 ++-
site/src/main/.vuepress/theme/global-components/IoTDB.vue | 13 ++++++-------
.../src/main/.vuepress/theme/global-components/IoTDBZH.vue | 14 +++++++-------
site/src/main/package.json | 4 ++--
thrift/src/pypi/setup.py | 2 +-
tools/download_staged_release.sh | 4 ++--
16 files changed, 40 insertions(+), 59 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 191db94..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache IoTDB is an effort undergoing incubation at The Apache Software
Foundation (ASF).
-Incubation is required of all newly accepted projects until a further review
indicates that the
-infrastructure, communications, and decision making process have stabilized in
a manner consistent
-with other successful ASF projects. While incubation status is not necessarily
a reflection of the
-completeness or stability of the code, it does indicate that the project has
yet to be fully
-endorsed by the ASF.
\ No newline at end of file
diff --git a/distribution/pom.xml b/distribution/pom.xml
index ac83668..bab0851 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -47,7 +47,7 @@
<descriptors>
<descriptor>src/assembly/distribution.xml</descriptor>
</descriptors>
-
<finalName>apache-iotdb-${project.version}-incubating</finalName>
+
<finalName>apache-iotdb-${project.version}</finalName>
</configuration>
</execution>
</executions>
@@ -74,7 +74,7 @@
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
-
<include>apache-iotdb-${project.version}-incubating-bin.zip</include>
+
<include>apache-iotdb-${project.version}-bin.zip</include>
</includes>
</fileSet>
</fileSets>
diff --git a/docker/src/main/Dockerfile b/docker/src/main/Dockerfile
index 611d9cd..0601e2e 100644
--- a/docker/src/main/Dockerfile
+++ b/docker/src/main/Dockerfile
@@ -32,9 +32,9 @@ RUN apt update \
&& cd incubator-iotdb-master \
&& 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.11.0-SNAPSHOT-incubating-bin.zip \
+ && unzip apache-iotdb-0.11.0-SNAPSHOT-bin.zip \
&& mkdir /iotdb \
- && mv apache-iotdb-0.11.0-SNAPSHOT-incubating/* /iotdb/ \
+ && mv apache-iotdb-0.11.0-SNAPSHOT/* /iotdb/ \
&& cd ../../ \
&& mvn clean \
&& ls -lh ~/.m2 \
diff --git a/docs/Development/VoteRelease.md b/docs/Development/VoteRelease.md
index a244500..15c6e7e 100644
--- a/docs/Development/VoteRelease.md
+++ b/docs/Development/VoteRelease.md
@@ -75,9 +75,7 @@ gpg2 --import key.asc
## Verify the source distribution
-* (Incubation stage) Verify if `incubating`
-
-* Verify that there are DISCLAIMER, NOTICE, LICENSE, and the content is
correct.
+* Verify that there are NOTICE, LICENSE, and the content is correct.
* Verify README, RELEASE_NOTES
@@ -109,9 +107,7 @@ Should end up all SUCCESS
## Verifying the binary release
-* (Incubation stage) Verify if `incubating`
-
-* Verify that there are DISCLAIMER, NOTICE, LICENSE, and the content is
correct.
+* Verify that there are NOTICE, LICENSE, and the content is correct.
* Verify README, RELEASE_NOTES
@@ -162,16 +158,12 @@ Hi,
+1 (PMC could binding)
The source release:
-Incubating in name [ok]
-Has DISCLAIMER [ok]
LICENSE and NOTICE [ok]
signatures and hashes [ok]
All files have ASF header [ok]
could compile from source: ./mvnw.sh clean install [ok]
The binary distribution:
-Incubating in name [ok]
-Has DISCLAIMER [ok]
LICENSE and NOTICE [ok]
signatures and hashes [ok]
Could run with the following statements [ok]
diff --git a/docs/Download/README.md b/docs/Download/README.md
index 0869e5e..c1ef62c 100644
--- a/docs/Download/README.md
+++ b/docs/Download/README.md
@@ -62,6 +62,8 @@
</table>
**<font color=red>Attention</font>**:
+- <font color=red>Data File Formats (i.e., TsFile) between v0.10.1 and v0.10.0
are not compatible.
+We will fix it in the next release.</fomt>
- How to upgrade a minor version (e.g., from v0.9.0 to v0.9.3)?
* versions which have the same major version are compatible.
diff --git a/docs/UserGuide/Server/Download.md
b/docs/UserGuide/Server/Download.md
index d927fc4..a5d4f12 100644
--- a/docs/UserGuide/Server/Download.md
+++ b/docs/UserGuide/Server/Download.md
@@ -57,7 +57,7 @@ Under the root path of incubator-iotdb:
> mvn clean package -DskipTests
```
-Then the binary version (including both server and client) can be found at
**distribution/target/apache-iotdb-{project.version}-incubating-bin.zip**
+Then the binary version (including both server and client) can be found at
**distribution/target/apache-iotdb-{project.version}-bin.zip**
> NOTE: Directories "thrift/target/generated-sources/thrift" and
> "antlr/target/generated-sources/antlr4" need to be added to sources roots to
> avoid compilation errors in IDE.
diff --git a/docs/zh/Development/VoteRelease.md
b/docs/zh/Development/VoteRelease.md
index ffeec96..8f8edd8 100644
--- a/docs/zh/Development/VoteRelease.md
+++ b/docs/zh/Development/VoteRelease.md
@@ -75,9 +75,7 @@ gpg2 --import key.asc
## 验证源码发布版
-* （孵化阶段）验证是否名字中有 ```incubating```
-
-* 验证是否有 DISCLAIMER、NOTICE、LICENSE，以及内容是否正确。
+* 验证是否有 NOTICE、LICENSE，以及内容是否正确。
* 验证 README、RELEASE_NOTES
@@ -109,9 +107,7 @@ mvnw.sh install
## 验证二进制发布版
-* （孵化阶段）验证是否名字中有 ```incubating```
-
-* 验证是否有 DISCLAIMER、NOTICE、LICENSE，以及内容是否正确。
+* 验证是否有 NOTICE、LICENSE，以及内容是否正确。
* 验证 README、RELEASE_NOTES
@@ -162,16 +158,12 @@ Hi,
+1 (PMC could binding)
The source release:
-Incubating in name [ok]
-Has DISCLAIMER [ok]
LICENSE and NOTICE [ok]
signatures and hashes [ok]
All files have ASF header [ok]
could compile from source: ./mvnw.sh clean install [ok]
The binary distribution:
-Incubating in name [ok]
-Has DISCLAIMER [ok]
LICENSE and NOTICE [ok]
signatures and hashes [ok]
Could run with the following statements [ok]
diff --git a/docs/zh/Download/README.md b/docs/zh/Download/README.md
index d1f587e..0300b01 100644
--- a/docs/zh/Download/README.md
+++ b/docs/zh/Download/README.md
@@ -62,6 +62,7 @@
**<font color=red>升级注意事项</font>**:
+<font color=red>v0.10.0和v0.10.1版本的数据文件不兼容。该问题会在下一个版本修复。 </font>
- 如何升级小版本 (例如，从 v0.9.0 to v0.9.3)?
* 同一个大版本下的多个小版本是互相兼容的。
* 只需要下载新的小版本， 然后修改其配置文件，使其与原有版本的设置一致。
diff --git a/pom.xml b/pom.xml
index aa941a0..03fa12e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<artifactId>iotdb-parent</artifactId>
<version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache IoTDB (incubating) Project Parent POM</name>
+ <name>Apache IoTDB Project Parent POM</name>
<description>This is the top level project that builds, packages the
tsfile, iotdb engine, jdbc, and integration libs.</description>
<licenses>
<license>
diff --git a/site/iotdb-doap.rdf b/site/iotdb-doap.rdf
index 2efcab9..9e0eb20 100644
--- a/site/iotdb-doap.rdf
+++ b/site/iotdb-doap.rdf
@@ -38,11 +38,11 @@
<Project rdf:about="http://iotdb.apache.org";>
<created>2020-07-11</created>
<license rdf:resource="http://spdx.org/licenses/Apache-2.0"; />
- <name>Apache IoTDB (incubating)</name>
+ <name>Apache IoTDB</name>
<homepage rdf:resource="http://iotdb.apache.org"; />
<asfext:pmc rdf:resource="http://incubator.apache.org"; />
- <shortdesc>Apache IoTDB (incubating) is a database for managing time
series data in Internet of Things</shortdesc>
- <description>Apache IoTDB (incubating) (Database for Internet of Things)
is an integrated data management engine designed for time series data. It
provides users with services for data collection, storage and analysis. Due to
its light-weight architecture, high performance and rich feature set together
with its deep integration with Apache Hadoop, Spark and Flink. Apache IoTDB
(incubating) can meet the requirements of massive data storage, high-speed data
ingestion and complex data a [...]
+ <shortdesc>Apache IoTDB is an IoT native database with high performance
for data management and analysis, on the edge and the cloud.</shortdesc>
+ <description>Apache IoTDB (Database for Internet of Things) is an
integrated data management engine designed for time series data. It provides
users with services for data collection, storage and analysis. Due to its
light-weight architecture, high performance and rich feature set together with
its deep integration with Apache Hadoop, Spark and Flink. Apache IoTDB can meet
the requirements of massive data storage, high-speed data ingestion and complex
data analysis in the IoT industr [...]
<bug-database rdf:resource="https://issues.apache.org/jira/projects/IOTDB";
/>
<mailing-list
rdf:resource="https://iotdb.apache.org/Development/ContributeGuide.html"; />
<download-page rdf:resource="http://iotdb.apache.org/Download/"; />
@@ -57,9 +57,9 @@
<release>
<Version>
- <name>apache-iotdb-0.10.0-incubating</name>
- <created>2020-06-28</created>
- <revision>0.10.0</revision>
+ <name>apache-iotdb-0.10.1-incubating</name>
+ <created>2020-08-23</created>
+ <revision>0.10.1</revision>
</Version>
</release>
@@ -71,7 +71,7 @@
</repository>
<maintainer>
<foaf:Person>
- <foaf:name>IoTDB PPMC</foaf:name>
+ <foaf:name>IoTDB PMC</foaf:name>
<foaf:mbox rdf:resource="mailto:[email protected]"/>
</foaf:Person>
</maintainer>
diff --git a/site/src/main/.vuepress/theme/components/Page.vue
b/site/src/main/.vuepress/theme/components/Page.vue
index 2ef23af..84d5930 100644
--- a/site/src/main/.vuepress/theme/components/Page.vue
+++ b/site/src/main/.vuepress/theme/components/Page.vue
@@ -77,9 +77,10 @@
<!-- <slot name="bottom"/> -->
<p style="text-align: center;">Copyright © 2020 The Apache Software
Foundation.<br>
Apache and the Apache feather logo are trademarks of The Apache
Software Foundation</p>
- <p
style="text-align:justify!important;paddingLeft:10px;paddingRight:10px;">
+ <!-- <p
style="text-align:justify!important;paddingLeft:10px;paddingRight:10px;">
Disclaimer: Apache IoTDB (incubating) is an effort undergoing
incubation at The Apache Software Foundation (ASF), sponsored by the Apache
Incubator. Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it [...]
</p>
+ -->
</main>
</template>
diff --git a/site/src/main/.vuepress/theme/global-components/IoTDB.vue
b/site/src/main/.vuepress/theme/global-components/IoTDB.vue
index a7f7a72..a3d1308 100644
--- a/site/src/main/.vuepress/theme/global-components/IoTDB.vue
+++ b/site/src/main/.vuepress/theme/global-components/IoTDB.vue
@@ -30,11 +30,10 @@
text-align: center;"
>Database for Internet of Things</p>
<p style="font-size: 20px;margin: 50px 0 10px
0;text-align:justify!important;">
- Apache IoTDB (incubating) (Database for Internet of Things) is an
integrated data
- management engine designed for timeseries data. It provides users with
services for
- data collection, storage and analysis. Due to its light-weight
architecture, high
- performance and rich feature set together with its deep integration
with Apache
- Hadoop, Spark and Flink, Apache IoTDB (incubating) can meet the
requirements of massive
+ Apache IoTDB (Database for Internet of Things) is an IoT native
database with high performance
+ for data management and analysis, deployable on the edge and the
cloud. Due to its light-weight architecture,
+ high performance and rich feature set together with its deep
integration with Apache
+ Hadoop, Spark and Flink, Apache IoTDB can meet the requirements of
massive
data storage, high-speed data ingestion and complex data analysis in
the IoT
industrial fields.
</p>
@@ -79,7 +78,7 @@
title="High-throughput read and write"
width="350"
trigger="hover"
- content="Apache IoTDB (incubating) can support high-speed write
access for millions of low-power and intelligently networked devices. It also
provides lightning read access for retrieving data."
+ content="Apache IoTDB can support high-speed write access for
millions of low-power and intelligently networked devices. It also provides
lightning read access for retrieving data."
>
<el-button slot="reference" style="text-align:center;width:100%;">
<img src="/img/home-icon1.png" style="width:40px;height:40px;">
@@ -93,7 +92,7 @@
title="Efficient directory structure"
width="350"
trigger="hover"
- content="Apache IoTDB (incubating) can efficiently organize
complex data structure from IoT devices and large size of timeseries data with
fuzzy searching strategy for complex directory of timeseries data."
+ content="Apache IoTDB can efficiently organize complex data
structure from IoT devices and large size of timeseries data with fuzzy
searching strategy for complex directory of timeseries data."
>
<el-button slot="reference" style="text-align:center;width:100%;">
<img src="/img/home-icon2.png" style="width:40px;height:40px;">
diff --git a/site/src/main/.vuepress/theme/global-components/IoTDBZH.vue
b/site/src/main/.vuepress/theme/global-components/IoTDBZH.vue
index f2b06b5..bdcfb19 100644
--- a/site/src/main/.vuepress/theme/global-components/IoTDBZH.vue
+++ b/site/src/main/.vuepress/theme/global-components/IoTDBZH.vue
@@ -30,7 +30,7 @@
text-align: center;"
>物联网数据库</p>
<p style="font-size: 20px;margin: 50px 0 10px
0;text-align:justify!important;">
-Apache IoTDB （incubating）（物联网数据库）是一体化收集、存储、管理与分析物联网时序数据的软件系统。
+Apache IoTDB（物联网数据库）是一体化收集、存储、管理与分析物联网时序数据的软件系统。
Apache IoTDB 采用轻量式架构，具有高性能和丰富的功能，并与Apache
Hadoop、Spark和Flink等进行了深度集成，可以满足工业物联网领域的海量数据存储、高速数据读取和复杂数据分析需求。
</p>
<el-row style="margin-top:40px;text-align: center;">
@@ -72,7 +72,7 @@ Apache IoTDB 采用轻量式架构，具有高性能和丰富的功能，并与A
title="高吞吐量读写"
width="350"
trigger="hover"
- content="Apache IoTDB（孵化中）可以支持数百万个低功耗和智能联网设备的高速写访问。
它还提供数据快速读取访问以查询。"
+ content="Apache IoTDB中可以支持数百万个低功耗和智能联网设备的高速写访问。 它还提供数据快速读取访问以查询。"
>
<el-button slot="reference" style="text-align:center;width:100%;">
<img src="/img/home-icon1.png" style="width:40px;height:40px;">
@@ -86,7 +86,7 @@ Apache IoTDB 采用轻量式架构，具有高性能和丰富的功能，并与A
title="高效的目录结构"
width="350"
trigger="hover"
- content="Apache
IoTDB（孵化中）可以对拥有复杂组织关系的物联网设备进行树形结构管理，并使用通配符对这些元数据进行模糊匹配。"
+ content="Apache IoTDB可以对拥有复杂组织关系的物联网设备进行树形结构管理，并使用通配符对这些元数据进行模糊匹配。"
>
<el-button slot="reference" style="text-align:center;width:100%;">
<img src="/img/home-icon2.png" style="width:40px;height:40px;">
@@ -99,7 +99,7 @@ Apache IoTDB 采用轻量式架构，具有高性能和丰富的功能，并与A
title="丰富的查询语义"
width="400"
trigger="hover"
- content="Apache IoTDB（孵化中）可以支持跨设备和传感器的时间对齐查询，在时间维度上的聚合（降采样）等。"
+ content="Apache IoTDB可以支持跨设备和传感器的时间对齐查询，在时间维度上的聚合（降采样）等。"
>
<el-button slot="reference" style="text-align:center;width:100%;">
<img src="/img/home-icon3.png" style="width:40px;height:40px;">
@@ -115,7 +115,7 @@ Apache IoTDB 采用轻量式架构，具有高性能和丰富的功能，并与A
title="硬件成本低"
width="400"
trigger="hover"
- content="Apache IoTDB（孵化中）可以实现磁盘存储的高压缩率。"
+ content="Apache IoTDB可以实现磁盘存储的高压缩率。"
>
<el-button slot="reference" style="text-align:center;width:100%;">
<img src="/img/home-icon4.png" style="width:40px;height:40px;">
@@ -128,7 +128,7 @@ Apache IoTDB 采用轻量式架构，具有高性能和丰富的功能，并与A
title="灵活的部署"
width="400"
trigger="hover"
- content="Apache
IoTDB（孵化中）可以为用户提供云上的一键式安装、终端访问工具以及边-云之间的协同（数据同步工具）。"
+ content="Apache IoTDB可以为用户提供云上的一键式安装、终端访问工具以及边-云之间的协同（数据同步工具）。"
>
<el-button slot="reference" style="text-align:center;width:100%;">
<img src="/img/home-icon5.png" style="width:40px;height:40px;">
@@ -141,7 +141,7 @@ Apache IoTDB 采用轻量式架构，具有高性能和丰富的功能，并与A
title="与开源生态系统的紧密集成"
width="400"
trigger="hover"
- content="Apache
IoTDB（孵化中）支持许多大数据软件生态系统，例如Hadoop、Spark、Flink和Grafana（可视化工具）。"
+ content="Apache
IoTDB支持许多大数据软件生态系统，例如Hadoop、Spark、Flink和Grafana（可视化工具）。"
>
<el-button slot="reference" style="text-align:center;width:100%;">
<img src="/img/home-icon6.png" style="width:40px;height:40px;">
diff --git a/site/src/main/package.json b/site/src/main/package.json
index c0040da..794fcbe 100644
--- a/site/src/main/package.json
+++ b/site/src/main/package.json
@@ -1,7 +1,7 @@
{
"name": "IoTDB",
"version": "1.0.0",
- "description": "Apache IoTDB (incubating) Website",
+ "description": "Apache IoTDB Website",
"main": "index.js",
"scripts": {
"dev": "node --max_old_space_size=8000 ./node_modules/vuepress/cli.js dev
src",
@@ -20,7 +20,7 @@
"TSDB",
"Time Series Database"
],
- "author": "Apache IoTDB (incubating)",
+ "author": "Apache IoTDB",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/apache/incubator-iotdb";
diff --git a/thrift/src/pypi/setup.py b/thrift/src/pypi/setup.py
index 29b0124..1223ff9 100644
--- a/thrift/src/pypi/setup.py
+++ b/thrift/src/pypi/setup.py
@@ -34,7 +34,7 @@ setuptools.setup(
version="0.11.0",
author=" Apache Software Foundation",
author_email="[email protected]",
- description="Apache IoTDB (incubating) client API",
+ description="Apache IoTDB client API",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/apache/incubator-iotdb";,
diff --git a/tools/download_staged_release.sh b/tools/download_staged_release.sh
index eee2265..3c6aeeb 100755
--- a/tools/download_staged_release.sh
+++ b/tools/download_staged_release.sh
@@ -119,8 +119,8 @@ mkdir -p ${DST_VER_DIR}
cd ${DST_VER_DIR}
mywget ${URL}/README.md
mywget ${URL}/RELEASE_NOTES.md
-getSignedBundle ${URL}/apache-iotdb-${VER}-incubating-source-release.zip
-getSignedBundle ${URL}/apache-iotdb-${VER}-incubating-bin.zip
+getSignedBundle ${URL}/apache-iotdb-${VER}-source-release.zip
+getSignedBundle ${URL}/apache-iotdb-${VER}-bin.zip
echo
echo Done Downloading to ${DST_BASE_DIR}
