This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 5fe7fd4 use pom.xml's version as IoTDB server and CLI's version
(#1363)
5fe7fd4 is described below
commit 5fe7fd40f5cea273eecf62a5b38f186b28af156f
Author: Xiangdong Huang <[email protected]>
AuthorDate: Fri Jun 19 16:59:16 2020 +0800
use pom.xml's version as IoTDB server and CLI's version (#1363)
Co-authored-by: xiangdong huang <[email protected]>
Co-authored-by: qiaojialin <[email protected]>
---
cli/pom.xml | 6 ++++++
.../java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 11 +++++++++--
pom.xml | 6 ++++++
server/pom.xml | 6 ++++++
.../main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 1 -
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java | 5 ++++-
.../main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 1 +
7 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/cli/pom.xml b/cli/pom.xml
index b5f5e31..b98a497 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -102,6 +102,12 @@
<descriptor>src/assembly/cli.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
</configuration>
</execution>
</executions>
diff --git
a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
index e6438a5..b81aeda 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
@@ -18,7 +18,11 @@
*/
package org.apache.iotdb.jdbc;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.RowIdLifetime;
+import java.sql.SQLException;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.service.rpc.thrift.TSFetchMetadataReq;
@@ -35,7 +39,10 @@ public class IoTDBDatabaseMetadata implements
DatabaseMetaData {
private static final Logger logger = LoggerFactory
.getLogger(IoTDBDatabaseMetadata.class);
private static final String METHOD_NOT_SUPPORTED_STRING = "Method not
supported";
- private static final String DATABASE_VERSION = "0.10.0-SNAPSHOT";
+ //when running the program in IDE, we can not get the version info using
getImplementationVersion()
+ private static final String DATABASE_VERSION =
+ IoTDBDatabaseMetadata.class.getPackage().getImplementationVersion() !=
null
+ ?
IoTDBDatabaseMetadata.class.getPackage().getImplementationVersion() : "UNKNOWN";
private long sessionId;
IoTDBDatabaseMetadata(IoTDBConnection connection, TSIService.Iface client,
long sessionId) {
diff --git a/pom.xml b/pom.xml
index d47c840..32ddffe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -956,6 +956,12 @@
-->
<configuration combine.self="append">
<finalName>apache-iotdb-${project.version}-incubating</finalName>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
</configuration>
</execution>
</executions>
diff --git a/server/pom.xml b/server/pom.xml
index 85968df..f6dbab4 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -241,6 +241,12 @@
<descriptor>src/assembly/server.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
</configuration>
</execution>
</executions>
diff --git
a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
index 807c5e2..e8831a1 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
@@ -80,7 +80,6 @@ public class IoTDBConfigCheck {
private static final String ERROR_LOG = "Wrong %s, please set as: %s !";
-
public static IoTDBConfigCheck getInstance() {
return IoTDBConfigCheckHolder.INSTANCE;
}
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 2373f0d..5a7f5d9 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,10 @@ 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.10.0-SNAPSHOT";
+ //when running the program in IDE, we can not get the version info using
getImplementationVersion()
+ public static final String VERSION =
+ IoTDBConstant.class.getPackage().getImplementationVersion() != null ?
IoTDBConstant.class
+ .getPackage().getImplementationVersion() : "UNKNOWN";
public static final String AUDIT_LOGGER_NAME = "IoTDB_AUDIT_LOGGER";
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index ae468cd..0d04c59 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -1050,6 +1050,7 @@ public class TSServiceImpl implements TSIService.Iface,
ServerContext {
public ServerProperties getProperties() {
ServerProperties properties = new ServerProperties();
properties.setVersion(IoTDBConstant.VERSION);
+ logger.info("IoTDB server version: {}", IoTDBConstant.VERSION);
properties.setSupportedTimeAggregationOperations(new ArrayList<>());
properties.getSupportedTimeAggregationOperations().add(IoTDBConstant.MAX_TIME);
properties.getSupportedTimeAggregationOperations().add(IoTDBConstant.MIN_TIME);
