You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/09/26 17:19:11 UTC
[incubator-iotdb] 11/12: solve the conflict;
fix compile issue for ChunkGroupMetaData
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 143529f9b7f595e5c5ed46cfa3ada6325f487923
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Fri Sep 27 01:08:54 2019 +0800
solve the conflict;
fix compile issue for ChunkGroupMetaData
---
.../test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java | 3 +--
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
pom.xml | 4 ++--
service-rpc/pom.xml | 2 +-
.../org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java | 1 +
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/client/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java b/client/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java
index e4ed965..85fdcd8 100644
--- a/client/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java
+++ b/client/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java
@@ -60,8 +60,7 @@ public class StartClientScriptIT extends AbstractScript {
@Override
protected void testOnUnix() throws IOException {
- final String[] output = {"---------------------", "Starting IoTDB Client",
- "---------------------",
+ final String[] output = {
"IoTDB> Connection Error, please check whether the network is available or the server has started. Host is 127.0.0.1, port is 6668."};
String dir = getCliPath();
ProcessBuilder builder = new ProcessBuilder("sh",
diff --git a/grafana/pom.xml b/grafana/pom.xml
index f1612a7..725fa27 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 cf800b3..3de4f80 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -126,7 +126,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index f30eb18..c876a30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -482,7 +482,7 @@
<id>enforce-version-convergence</id>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -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 5c175bc..40511b8 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -100,7 +100,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
index b869274..5cb7e00 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.tsfile.file.metadata;
+import java.util.Collections;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;