diff --git a/connectors/flink-iotdb-connector/pom.xml b/connectors/flink-iotdb-connector/pom.xml index 4ed9fe78..7895abc5 100644 --- a/connectors/flink-iotdb-connector/pom.xml +++ b/connectors/flink-iotdb-connector/pom.xml @@ -20,7 +20,7 @@ org.apache.iotdb connectors - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT flink-iotdb-connector IoTDB: Connector: Apache Flink diff --git a/connectors/flink-sql-iotdb-connector/pom.xml b/connectors/flink-sql-iotdb-connector/pom.xml index 2e5416bc..bfe60d05 100644 --- a/connectors/flink-sql-iotdb-connector/pom.xml +++ b/connectors/flink-sql-iotdb-connector/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb connectors - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT flink-sql-iotdb-connector IoTDB: Connector: Apache Flink SQL diff --git a/connectors/flink-tsfile-connector/pom.xml b/connectors/flink-tsfile-connector/pom.xml index 6bbcf232..8c563370 100644 --- a/connectors/flink-tsfile-connector/pom.xml +++ b/connectors/flink-tsfile-connector/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb connectors - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT flink-tsfile-connector IoTDB: Connector: Apache Flink TSFile @@ -54,7 +54,7 @@ org.apache.iotdb hadoop-tsfile - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT - - all-bin - - single - - package - - - src/assembly/spark-connector.xml - src/assembly/flink-sql-connector.xml - src/assembly/mybatis-generator-plugin.xml - src/assembly/iotdb-spring-boot-starter.xml - - apache-iotdb-${project.version} - - - - - - - net.nicoulaj.maven.plugins - checksum-maven-plugin - - - sign-source-release - - files - - package - - - SHA-512 - - - - - ${project.build.directory} - - apache-iotdb-${project.version}-spark-connector-bin.zip - apache-iotdb-${project.version}-flink-sql-connector-bin.zip - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-ban-duplicate-classes - - - - - - org.apache.iotdb.spark.db.* - - - - true - - - - - - - with-grafana-plugin + with-spark org.apache.iotdb - iotdb-grafana-plugin + spark-iotdb-connector_2.11 + ${project.version} + + + org.apache.iotdb + spark-iotdb-connector_2.12 ${project.version} - pom @@ -167,9 +58,87 @@ package - - src/assembly/grafana-plugin.xml + + src/assembly/spark-connector.xml + + apache-iotdb-${project.version} + + + + + + + net.nicoulaj.maven.plugins + checksum-maven-plugin + + + sign-source-release + + files + + package + + + SHA-512 + + + + + ${project.build.directory} + + apache-iotdb-${project.version}-spark-connector-bin.zip + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-ban-duplicate-classes + + + + + + org.apache.iotdb.spark.db.* + + + + true + + + + + + + + + with-flink + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + all-bin + + single + + package + + + src/assembly/flink-sql-connector.xml + apache-iotdb-${project.version} @@ -188,10 +157,15 @@ package + + SHA-512 + + - - apache-iotdb-${project.version}-grafana-plugin-bin.zip + ${project.build.directory} + + apache-iotdb-${project.version}-flink-sql-connector-bin.zip diff --git a/examples/flink-sql/pom.xml b/examples/flink-sql/pom.xml index 6620fa69..20a74080 100644 --- a/examples/flink-sql/pom.xml +++ b/examples/flink-sql/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb examples - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT flink-sql-example IoTDB: Example: Apache Flink SQL @@ -35,7 +35,7 @@ org.apache.iotdb flink-sql-iotdb-connector - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT org.apache.flink @@ -95,4 +95,15 @@ test + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/examples/flink/pom.xml b/examples/flink/pom.xml index 5204449e..5cfef97f 100644 --- a/examples/flink/pom.xml +++ b/examples/flink/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb examples - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT flink-example IoTDB: Example: Apache Flink @@ -32,7 +32,7 @@ org.apache.iotdb flink-iotdb-connector - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT @@ -50,7 +50,7 @@ org.apache.iotdb flink-tsfile-connector - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT org.apache.flink @@ -58,4 +58,15 @@ ${flink.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/examples/hadoop/pom.xml b/examples/hadoop/pom.xml index 4a23d400..38a1f660 100644 --- a/examples/hadoop/pom.xml +++ b/examples/hadoop/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb examples - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT hadoop-example IoTDB: Example: Apache Hadoop @@ -32,7 +32,18 @@ org.apache.iotdb hadoop-tsfile - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/examples/iotdb-spring-boot-start/pom.xml b/examples/iotdb-spring-boot-start/pom.xml index 71efaf02..c2a8b3ca 100644 --- a/examples/iotdb-spring-boot-start/pom.xml +++ b/examples/iotdb-spring-boot-start/pom.xml @@ -53,7 +53,7 @@ org.apache.iotdb iotdb-spring-boot-starter - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT @@ -89,6 +89,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + diff --git a/examples/iotdb-spring-boot-start/readme.md b/examples/iotdb-spring-boot-start/readme.md index ba434182..b9653f64 100644 --- a/examples/iotdb-spring-boot-start/readme.md +++ b/examples/iotdb-spring-boot-start/readme.md @@ -18,15 +18,17 @@ under the License. --> + # IoTDB-Spring-Boot-Starter Demo + ## Introduction This demo shows how to use iotdb-spring-boot-starter ### Version usage - IoTDB: 2.0.1-beta - iotdb-spring-boot-starter: 2.0.2-SNAPSHOT + IoTDB: 2.0.3 + iotdb-spring-boot-starter: 2.0.3 ### 1. Install IoTDB @@ -35,7 +37,7 @@ ### 2. Startup IoTDB please refer to [Quick Start](http://iotdb.apache.org/UserGuide/Master/Get%20Started/QuickStart.html) - + Then we need to create a database 'wind' by cli in table model ``` create database wind; @@ -65,7 +67,7 @@ org.springframework.boot spring-boot-starter - + org.springframework.boot spring-boot-starter-test @@ -74,13 +76,13 @@ org.apache.iotdb iotdb-spring-boot-starter - 2.0.2-SNAPSHOT + 2.0.3 ``` ### 4、Use The target Bean with @Autowired - + You can use the target Bean in your Project,like: ``` @Autowired diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml index 26eb4c4a..47d2c381 100644 --- a/examples/kafka/pom.xml +++ b/examples/kafka/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb examples - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT kafka-example IoTDB: Example: Apache Kafka @@ -45,4 +45,15 @@ 2.8.2 + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/examples/mybatis-generator/pom.xml b/examples/mybatis-generator/pom.xml index 39c714d6..7e2f4556 100644 --- a/examples/mybatis-generator/pom.xml +++ b/examples/mybatis-generator/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb iotdb-extras-parent - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT ../../pom.xml mybatis-generator-example @@ -77,7 +77,7 @@ org.apache.iotdb mybatis-generator-plugin - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT @@ -96,6 +96,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + diff --git a/examples/mybatis-generator/src/main/resources/generatorConfigByExample.xml b/examples/mybatis-generator/src/main/resources/generatorConfigByExample.xml index 63b45598..7170ceb4 100644 --- a/examples/mybatis-generator/src/main/resources/generatorConfigByExample.xml +++ b/examples/mybatis-generator/src/main/resources/generatorConfigByExample.xml @@ -18,13 +18,15 @@ --> - + - - + + diff --git a/examples/mybatisplus-generator/pom.xml b/examples/mybatisplus-generator/pom.xml index 729e2de8..75ffb633 100644 --- a/examples/mybatisplus-generator/pom.xml +++ b/examples/mybatisplus-generator/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb iotdb-extras-parent - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT ../../pom.xml org.apache.iotdb @@ -107,6 +107,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + diff --git a/examples/pom.xml b/examples/pom.xml index 3c99c7f2..c68bef40 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb iotdb-extras-parent - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT examples pom @@ -48,6 +48,39 @@ mybatisplus-generator + + with-all-connectors + + flink + flink-sql + hadoop + kafka + pulsar + rabbitmq + rocketmq + spark-table + mybatis-generator + + + + with-flink + + flink + flink-sql + + + + with-hadoop + + hadoop + + + + with-spark + + spark-table + + diff --git a/examples/pulsar/pom.xml b/examples/pulsar/pom.xml index c9b5cc41..99135abd 100644 --- a/examples/pulsar/pom.xml +++ b/examples/pulsar/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb examples - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT pulsar-example IoTDB: Example: Apache Pulsar @@ -52,4 +52,15 @@ ${iotdb.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/examples/rabbitmq/pom.xml b/examples/rabbitmq/pom.xml index fd3789e3..dd10aa88 100644 --- a/examples/rabbitmq/pom.xml +++ b/examples/rabbitmq/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb examples - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT rabbitmq-example IoTDB: Example: RabbitMQ @@ -44,4 +44,15 @@ amqp-client + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/examples/rocketmq/pom.xml b/examples/rocketmq/pom.xml index 50fb7d07..b880681c 100644 --- a/examples/rocketmq/pom.xml +++ b/examples/rocketmq/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb examples - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT rocketmq-example IoTDB: Example: Apache RocketMQ @@ -45,4 +45,15 @@ + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/examples/spark-table/pom.xml b/examples/spark-table/pom.xml index 762f3186..eb5d4c64 100644 --- a/examples/spark-table/pom.xml +++ b/examples/spark-table/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb examples - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT table-spark-connector-example IoTDB: Example: IoTDB Table Spark Connector @@ -32,7 +32,7 @@ org.apache.iotdb spark-iotdb-table-connector-3.5 - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT org.apache.spark @@ -67,6 +67,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + diff --git a/iotdb-collector/collector-core/pom.xml b/iotdb-collector/collector-core/pom.xml index a0e45028..61826115 100644 --- a/iotdb-collector/collector-core/pom.xml +++ b/iotdb-collector/collector-core/pom.xml @@ -24,15 +24,16 @@ org.apache.iotdb iotdb-collector - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT collector-core IoTDB: Collector: Core + 2.0.4-SNAPSHOT org.apache.iotdb collector-openapi - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT org.eclipse.jetty diff --git a/iotdb-collector/collector-distribution/pom.xml b/iotdb-collector/collector-distribution/pom.xml index 4bc94ffd..488d5d63 100644 --- a/iotdb-collector/collector-distribution/pom.xml +++ b/iotdb-collector/collector-distribution/pom.xml @@ -24,16 +24,17 @@ org.apache.iotdb iotdb-collector - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT collector-distribution pom IoTDB: Collector: Distribution + 2.0.4-SNAPSHOT org.apache.iotdb collector-core - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT zip @@ -64,6 +65,7 @@ net.nicoulaj.maven.plugins checksum-maven-plugin + 1.11 sign-source-release diff --git a/iotdb-collector/collector-openapi/pom.xml b/iotdb-collector/collector-openapi/pom.xml index e58a51d6..6fbd450f 100644 --- a/iotdb-collector/collector-openapi/pom.xml +++ b/iotdb-collector/collector-openapi/pom.xml @@ -24,10 +24,11 @@ org.apache.iotdb iotdb-collector - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT collector-openapi IoTDB: Collector: OpenAPI + 2.0.4-SNAPSHOT io.swagger diff --git a/iotdb-collector/pom.xml b/iotdb-collector/pom.xml index f3154913..f2212129 100644 --- a/iotdb-collector/pom.xml +++ b/iotdb-collector/pom.xml @@ -24,7 +24,7 @@ org.apache.iotdb iotdb-extras-parent - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT iotdb-collector pom diff --git a/iotdb-spring-boot-starter/README.md b/iotdb-spring-boot-starter/README.md index 20860e1e..d3ab8af9 100644 --- a/iotdb-spring-boot-starter/README.md +++ b/iotdb-spring-boot-starter/README.md @@ -18,11 +18,12 @@ under the License. --> + # iotdb-spring-boot-starter -* After 'clone' the project, execute 'mvn clean install'. This step is not necessary as it has already been uploaded to the Maven central repository +- After 'clone' the project, execute 'mvn clean install'. This step is not necessary as it has already been uploaded to the Maven central repository -* Add the following configuration to the 'pom' file of the project to be generated: +- Add the following configuration to the 'pom' file of the project to be generated: ``` @@ -38,12 +39,13 @@ org.apache.iotdb iotdb-spring-boot-starter - 2.0.2-SNAPSHOT + 2.0.3 ``` -* Use The target Bean with @Autowired like: +- Use The target Bean with @Autowired like: + ```java @Autowired private ITableSessionPool ioTDBSessionPool; @@ -60,4 +62,4 @@ System.out.println(); } } -``` \ No newline at end of file +``` diff --git a/iotdb-spring-boot-starter/pom.xml b/iotdb-spring-boot-starter/pom.xml index cd2ad444..892a1f25 100644 --- a/iotdb-spring-boot-starter/pom.xml +++ b/iotdb-spring-boot-starter/pom.xml @@ -24,12 +24,12 @@ org.apache.iotdb iotdb-extras-parent - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT org.apache.iotdb iotdb-spring-boot-starter IoTDB Extras: SpringBoot Starter - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT 17 17 diff --git a/mybatis-generator/README-zh.md b/mybatis-generator/README-zh.md index b8b2b3f4..c91e773a 100644 --- a/mybatis-generator/README-zh.md +++ b/mybatis-generator/README-zh.md @@ -18,11 +18,12 @@ under the License. --> + # mybatis-generator-plugin -* 把该项目 `clone` 下来之后,在本地执行 `mvn clean install` 或者 `mvn clean deploy` (`deploy` 需要修改 `pom` 中的 `distributionManagement`)【已经上传 `Maven` 中央仓库,所以此步骤不在需要】 +- 把该项目 `clone` 下来之后,在本地执行 `mvn clean install` 或者 `mvn clean deploy` (`deploy` 需要修改 `pom` 中的 `distributionManagement`)【已经上传 `Maven` 中央仓库,所以此步骤不在需要】 -* 在要生成的项目的 `pom` 文件中添加如下配置: +- 在要生成的项目的 `pom` 文件中添加如下配置: ```xml @@ -35,7 +36,7 @@ org.apache.iotdb mybatis-generator-plugin - 2.0.2-SNAPSHOT + 2.0.3 @@ -48,8 +49,8 @@ ``` -* `configurationFile` 配置 `generatorConfig.xml` 文件的位置,其内容在本项目的 `src/main/resources` 有一个模板供参考,`copy` 其内容放到相应的位置 +- `configurationFile` 配置 `generatorConfig.xml` 文件的位置,其内容在本项目的 `src/main/resources` 有一个模板供参考,`copy` 其内容放到相应的位置 -* 修改 `generatorConfig.xml` 中 想用的内容,主要是:`jdbcConnection`、`javaModelGenerator`、`sqlMapGenerator`、`javaClientGenerator`、`table` +- 修改 `generatorConfig.xml` 中 想用的内容,主要是:`jdbcConnection`、`javaModelGenerator`、`sqlMapGenerator`、`javaClientGenerator`、`table` -* 在项目的 `pom` 所在的地方执行命令:`mvn mybatis-generator:generate` 生成相应的 `Java` 类和 `mapper` 文件 \ No newline at end of file +- 在项目的 `pom` 所在的地方执行命令:`mvn mybatis-generator:generate` 生成相应的 `Java` 类和 `mapper` 文件 diff --git a/mybatis-generator/README.md b/mybatis-generator/README.md index efc9df55..4f60b9c2 100644 --- a/mybatis-generator/README.md +++ b/mybatis-generator/README.md @@ -1,4 +1,3 @@ - - + - - + + diff --git a/pom.xml b/pom.xml index 06acb417..149c1a3e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,19 +28,19 @@ org.apache.iotdb iotdb-extras-parent - 2.0.2-SNAPSHOT + 2.0.4-SNAPSHOT pom Apache IoTDB Project Extras Parent POM This is the secondary repository that builds the examples and integration modules for IoTDB. connectors distributions - examples iotdb-collector mybatis-generator - + 1.7 206 @@ -49,9 +49,9 @@ 4.9.3 - + 4.2.0 - + 2.9.3 3.3.0 @@ -90,7 +90,7 @@ https://github.com/apache/iotdb-bin-resources/tree/main/iotdb-tools-thrift --> 0.14.1.0 - 2.0.2 + 2.0.3 2.16.2 4.0.4 @@ -173,7 +173,7 @@ 1.6.14 chmod - + true - + false @@ -1542,7 +1544,8 @@ **/.png **/.jpg **/.jpeg - + local-snapshots-dir/** **/*.plan @@ -1574,7 +1577,7 @@ org.apache.iotdb,,javax,java,\# - + UNIX @@ -1648,6 +1651,11 @@ openapi-generator-maven-plugin ${openapi.generator.version} + + org.codehaus.mojo + build-helper-maven-plugin + 3.4.0 + @@ -1693,7 +1701,7 @@ validate - + @@ -1772,7 +1780,7 @@ io.atomix @@ -1815,7 +1823,8 @@ net.revelc.code.formatter formatter-maven-plugin - + org.apache.maven.plugins maven-checkstyle-plugin @@ -1998,6 +2007,7 @@ scm:git:ssh://git@github.com/apache/iotdb-extras.git scm:git:ssh://git@github.com/apache/iotdb-extras.git ssh://git@github.com:apache/iotdb-extras.git + HEAD Jira @@ -2068,6 +2078,12 @@ iotdb-spring-boot-starter + + with-examples + + examples + + apache-release @@ -2127,6 +2143,7 @@ net.nicoulaj.maven.plugins checksum-maven-plugin + 1.11 sign-source-release