Merge branch 'master' of https://github.com/apache/iotdb into rel/0.14.0-preview2
diff --git a/confignode/pom.xml b/confignode/pom.xml
index 90a3b85..14052db 100644
--- a/confignode/pom.xml
+++ b/confignode/pom.xml
@@ -30,7 +30,7 @@
<artifactId>iotdb-confignode</artifactId>
<name>IoTDB ConfigNode</name>
<properties>
- <confignode.test.skip>false</confignode.test.skip>
+ <confignode.test.skip>true</confignode.test.skip>
<confignode.it.skip>${confignode.test.skip}</confignode.it.skip>
<confignode.ut.skip>${confignode.test.skip}</confignode.ut.skip>
</properties>
diff --git a/consensus/pom.xml b/consensus/pom.xml
index 23f5a5c..0b0b458 100644
--- a/consensus/pom.xml
+++ b/consensus/pom.xml
@@ -33,7 +33,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<ratis.version>2.3.0</ratis.version>
- <consensus.test.skip>false</consensus.test.skip>
+ <consensus.test.skip>true</consensus.test.skip>
<consensus.it.skip>${consensus.test.skip}</consensus.it.skip>
<consensus.ut.skip>${consensus.test.skip}</consensus.ut.skip>
</properties>
diff --git a/cross-tests/pom.xml b/cross-tests/pom.xml
index d65af95..acf5ddb 100644
--- a/cross-tests/pom.xml
+++ b/cross-tests/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cross-tests</artifactId>
<properties>
- <cross.test.test.skip>false</cross.test.test.skip>
+ <cross.test.test.skip>true</cross.test.test.skip>
<cross.test.it.skip>${cross.test.test.skip}</cross.test.it.skip>
<cross.ut.skip>${cross.test.test.skip}</cross.ut.skip>
</properties>
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index e5d8b9f..a7c9414 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -151,6 +151,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ <skipITs>true</skipITs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
@@ -158,7 +166,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
- <skipTests>false</skipTests>
+ <skipTests>true</skipTests>
<groups>${integrationTest.includedGroups}</groups>
<excludedGroups>${integrationTest.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
@@ -180,7 +188,7 @@
<goal>verify</goal>
</goals>
<configuration>
- <skipTests>false</skipTests>
+ <skipTests>true</skipTests>
<summaryFiles>
<summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>
</summaryFiles>
@@ -188,23 +196,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
- <configuration>
- <mainClass>org.apache.iotdb.it.framework.IoTDBTestReporter</mainClass>
- </configuration>
- <executions>
- <execution>
- <id>report</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
@@ -216,7 +207,7 @@
<integrationTest.testEnv>Standalone</integrationTest.testEnv>
</properties>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
</profile>
<!-- Currently RemoteIT is not working as it lacks of the remote endpoint parameters -->
diff --git a/integration/pom.xml b/integration/pom.xml
index f0c7c20..9f1833d 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -108,6 +108,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ <skipITs>true</skipITs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<id>integration-test-Standalone</id>
@@ -177,7 +185,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
- <skipTests>false</skipTests>
+ <skipTests>true</skipTests>
<groups>${test.includedGroups}</groups>
<excludedGroups>${test.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
@@ -196,7 +204,7 @@
<goal>verify</goal>
</goals>
<configuration>
- <skipTests>false</skipTests>
+ <skipTests>true</skipTests>
<summaryFiles>
<summaryFile>target/failsafe-reports/failsafe-summary-Remote.xml</summaryFile>
</summaryFiles>
@@ -256,6 +264,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ <skipITs>true</skipITs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<id>integration-test-Cluster</id>
diff --git a/jdbc/src/main/feature/feature.xml b/jdbc/src/main/feature/feature.xml
index 933a751..85d306b 100644
--- a/jdbc/src/main/feature/feature.xml
+++ b/jdbc/src/main/feature/feature.xml
@@ -18,7 +18,7 @@
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="driver-s7-feature">
- <feature name="iotdb-feature" description="iotdb-feature" version="0.10.0.SNAPSHOT">
+ <feature name="iotdb-feature" description="iotdb-feature" version="0.14.0-preview2">
<details>Feature to install required Bundle to use IoTDB inside Karaf container</details>
<feature prerequisite="true">wrap</feature>
<feature>scr</feature>
@@ -28,7 +28,7 @@
<bundle>mvn:org.apache.iotdb/iotdb-thrift/${project.version}</bundle>
<bundle>mvn:org.apache.iotdb/hadoop-tsfile/${project.version}</bundle>
<bundle>mvn:org.apache.thrift/libthrift/0.14.1</bundle>
- <bundle>mvn:org.xerial.snappy/snappy-java/1.1.7.2</bundle>
+ <bundle>mvn:org.xerial.snappy/snappy-java/1.1.8.4</bundle>
<bundle>mvn:commons-io/commons-io/2.5</bundle>
<bundle>wrap:mvn:org.apache.hadoop/hadoop-core/1.2.1</bundle>
<bundle>wrap:mvn:org.ops4j.pax.jdbc/pax-jdbc-common/1.4.5</bundle>
diff --git a/server/pom.xml b/server/pom.xml
index 9d29b53..30f462b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -30,7 +30,7 @@
<artifactId>iotdb-server</artifactId>
<name>IoTDB Server</name>
<properties>
- <iotdb.test.skip>false</iotdb.test.skip>
+ <iotdb.test.skip>true</iotdb.test.skip>
<iotdb.it.skip>${iotdb.test.skip}</iotdb.it.skip>
<iotdb.ut.skip>${iotdb.test.skip}</iotdb.ut.skip>
<jjwt-api.version>0.10.8</jjwt-api.version>
diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml
index fbaf385..d3fec78 100644
--- a/testcontainer/pom.xml
+++ b/testcontainer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>0.14.0-preview2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 64d1490..03e0549 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -32,7 +32,7 @@
<description>A columnar file format designed for time-series data</description>
<url>https://github.com/thulab/iotdb/tree/master/tsfile</url>
<properties>
- <tsfile.test.skip>false</tsfile.test.skip>
+ <tsfile.test.skip>true</tsfile.test.skip>
<tsfile.it.skip>${tsfile.test.skip}</tsfile.it.skip>
<tsfile.ut.skip>${tsfile.test.skip}</tsfile.ut.skip>
</properties>