This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.10 by this push:
new d99cd73 use pom.xml's version as IoTDB server and CLI's version
d99cd73 is described below
commit d99cd736f73d642ac7a71c7f22c642b3049378a4
Author: xiangdong huang <[email protected]>
AuthorDate: Mon Jun 15 17:21:21 2020 +0800
use pom.xml's version as IoTDB server and CLI's version
---
cli/pom.xml | 6 ++++++
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
.../java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 11 +++++++++--
pom.xml | 12 +++++++++---
server/pom.xml | 6 ++++++
.../main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 8 ++++----
.../main/java/org/apache/iotdb/db/conf/IoTDBConstant.java | 5 ++++-
.../main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 1 +
service-rpc/pom.xml | 2 +-
10 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/cli/pom.xml b/cli/pom.xml
index 11af643..031d0e7 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/grafana/pom.xml b/grafana/pom.xml
index b16c58d..47da672 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -165,7 +165,7 @@
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass>
</transformer>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 6bac74b..b89e405 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -223,7 +223,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
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 db70d27..2ea16f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
<!-- Exclude all generated code -->
<sonar.exclusions>**/generated-sources</sonar.exclusions>
<!-- By default, the argLine is empty-->
- <argLine />
+ <argLine/>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim
@@ -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>
@@ -1006,7 +1012,7 @@
<id>enforce-version-convergence</id>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -1052,7 +1058,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/pom.xml b/server/pom.xml
index a9dffb3..a1e2152 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -231,6 +231,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 f61bd6b..37a8f6a 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
@@ -70,7 +70,7 @@ public class IoTDBConfigCheck {
private static boolean enablePartition =
IoTDBDescriptor.getInstance().getConfig().isEnablePartition();
private static final String IOTDB_VERSION_STRING = "iotdb_version";
- private static String iotdbVersion = "0.10.0";
+
public static IoTDBConfigCheck getInstance() {
return IoTDBConfigCheckHolder.INSTANCE;
@@ -81,7 +81,7 @@ public class IoTDBConfigCheck {
}
private IoTDBConfigCheck() {
- logger.info("Starting IoTDB " + iotdbVersion);
+ logger.info("Starting IoTDB " + IoTDBConstant.VERSION);
// check whether SCHEMA_DIR exists, create if not exists
File dir = SystemFileFactory.INSTANCE.getFile(SCHEMA_DIR);
@@ -116,7 +116,7 @@ public class IoTDBConfigCheck {
systemProperties.put(PARTITION_INTERVAL_STRING,
String.valueOf(partitionInterval));
systemProperties.put(TSFILE_FILE_SYSTEM_STRING, tsfileFileSystem);
systemProperties.put(ENABLE_PARTITION_STRING,
String.valueOf(enablePartition));
- systemProperties.put(IOTDB_VERSION_STRING, iotdbVersion);
+ systemProperties.put(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
}
@@ -193,7 +193,7 @@ public class IoTDBConfigCheck {
try (FileOutputStream tmpFOS = new
FileOutputStream(tmpPropertiesFile.toString())) {
properties.setProperty(PARTITION_INTERVAL_STRING,
String.valueOf(partitionInterval));
properties.setProperty(TSFILE_FILE_SYSTEM_STRING, tsfileFileSystem);
- properties.setProperty(IOTDB_VERSION_STRING, iotdbVersion);
+ properties.setProperty(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
properties.setProperty(ENABLE_PARTITION_STRING,
String.valueOf(enablePartition));
properties.store(tmpFOS, SYSTEM_PROPERTIES_STRING);
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 58e3154..a06f52e 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 IOTDB_JMX_PORT = "iotdb.jmx.port";
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 b2d2137..95b5d21 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
@@ -1053,6 +1053,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);
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index ba03e40..8c9170f 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -208,7 +208,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
