You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by jf...@apache.org on 2019/08/06 13:33:38 UTC
[incubator-iotdb] branch rel/0.8 updated: Fixed minor issues after
merge of PR 332
This is an automated email from the ASF dual-hosted git repository.
jfeinauer 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 266f087 Fixed minor issues after merge of PR 332
266f087 is described below
commit 266f0872cdceae86b8d9a873601cc27ac4e8f684
Author: julian <j....@pragmaticminds.de>
AuthorDate: Tue Aug 6 15:33:28 2019 +0200
Fixed minor issues after merge of PR 332
---
distribution/pom.xml | 4 ++--
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 3 ++-
pom.xml | 2 +-
service-rpc/pom.xml | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 084908f..b0aa1f9 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -87,13 +87,13 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-server</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-client</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<type>zip</type>
</dependency>
</dependencies>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index a085358..5e7e845 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -159,7 +159,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 8017a45..7485c3b 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -126,7 +126,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
index bc511b0..ed587e5 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
@@ -82,8 +82,9 @@ public class IoTDBConnectionTest {
add("min_time");
}
};
+ final String timestampPrecision = "ms";
when(client.getProperties())
- .thenReturn(new ServerProperties(version, supportedAggregationTime));
+ .thenReturn(new ServerProperties(version, supportedAggregationTime, timestampPrecision));
connection.client = client;
assertEquals(connection.getServerProperties().getVersion(), version);
for (int i = 0; i < supportedAggregationTime.size(); i++) {
diff --git a/pom.xml b/pom.xml
index 24b1a3a..2fb7df3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -528,7 +528,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/service-rpc/pom.xml b/service-rpc/pom.xml
index c0b33cd..d6d8ffb 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -100,7 +100,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>