You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/03/24 07:38:38 UTC
[iotdb] branch rc/1.1.0 updated (cb851d1158 -> 6b5cba34a6)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch rc/1.1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from cb851d1158 remove aligned time series id in nonAligned measurement iterator (#9411)
new 05f65767ec update version number and disable tests
new 6b5cba34a6 update version number and disable tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
client-py/setup.py | 2 +-
confignode/pom.xml | 2 +-
consensus/pom.xml | 2 +-
integration-test/pom.xml | 216 +++++++++++++++++++-------------------
integration/pom.xml | 20 +++-
jdbc/src/main/feature/feature.xml | 2 +-
pom.xml | 2 +-
server/pom.xml | 2 +-
testcontainer/pom.xml | 2 +-
tsfile/pom.xml | 2 +-
10 files changed, 134 insertions(+), 118 deletions(-)
[iotdb] 02/02: update version number and disable tests
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rc/1.1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6b5cba34a66fb46a4fb49ed6b9ce0a36c3a27ecf
Author: HTHou <hh...@outlook.com>
AuthorDate: Fri Mar 24 15:02:31 2023 +0800
update version number and disable tests
---
server/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/pom.xml b/server/pom.xml
index e562a5d509..3b6a5d7b7e 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>
[iotdb] 01/02: update version number and disable tests
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rc/1.1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 05f65767ec15304eb28ad6b25343eae520ed3bfc
Author: HTHou <hh...@outlook.com>
AuthorDate: Fri Mar 24 14:34:00 2023 +0800
update version number and disable tests
---
client-py/setup.py | 2 +-
confignode/pom.xml | 2 +-
consensus/pom.xml | 2 +-
integration-test/pom.xml | 216 +++++++++++++++++++-------------------
integration/pom.xml | 20 +++-
jdbc/src/main/feature/feature.xml | 2 +-
pom.xml | 2 +-
testcontainer/pom.xml | 2 +-
tsfile/pom.xml | 2 +-
9 files changed, 133 insertions(+), 117 deletions(-)
diff --git a/client-py/setup.py b/client-py/setup.py
index 6cbdf12c1c..aaf110d4f6 100644
--- a/client-py/setup.py
+++ b/client-py/setup.py
@@ -31,7 +31,7 @@ print(long_description)
setuptools.setup(
name="apache-iotdb", # Replace with your own username
- version="1.0.0",
+ version="1.1.0",
author=" Apache Software Foundation",
author_email="dev@iotdb.apache.org",
description="Apache IoTDB client API",
diff --git a/confignode/pom.xml b/confignode/pom.xml
index 11aec2de6f..ba7355a8d1 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 58019df452..d75b14f797 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.4.2-ebba77d-SNAPSHOT</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/integration-test/pom.xml b/integration-test/pom.xml
index 05f3dd2fef..1979797ef1 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -140,113 +140,113 @@
<build>
<plugins>
<!-- skip default-test -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>default-test</id>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- If the test starts separate processes, we should package first -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.version}</version>
- <configuration>
- <skipAssembly>${integrationTest.launchNodeInSameJVM}</skipAssembly>
- </configuration>
- <executions>
- <!-- Package binaries-->
- <execution>
- <id>cluster-test-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/mpp-test.xml</descriptor>
- </descriptors>
- <finalName>template-node</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- <execution>
- <id>cluster-test-assembly-share</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/mpp-share.xml</descriptor>
- </descriptors>
- <finalName>template-node-share</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Run integration tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <groups>${integrationTest.includedGroups}</groups>
- <excludedGroups>${integrationTest.excludedGroups}</excludedGroups>
- <useSystemClassLoader>false</useSystemClassLoader>
- <parallel>none</parallel>
- <forkCount>${integrationTest.forkCount}</forkCount>
- <reuseForks>false</reuseForks>
- <systemPropertyVariables>
- <TestEnv>${integrationTest.testEnv}</TestEnv>
- <RandomSelectWriteNode>${integrationTest.randomSelectWriteNode}</RandomSelectWriteNode>
- <ReadAndVerifyWithMultiNode>${integrationTest.readAndVerifyWithMultiNode}</ReadAndVerifyWithMultiNode>
- </systemPropertyVariables>
- <summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>
- </configuration>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <summaryFiles>
- <summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>
- </summaryFiles>
- </configuration>
- </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>
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-surefire-plugin</artifactId>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>default-test</id>-->
+<!-- <configuration>-->
+<!-- <skip>true</skip>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- <!– If the test starts separate processes, we should package first –>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-assembly-plugin</artifactId>-->
+<!-- <version>${maven.assembly.version}</version>-->
+<!-- <configuration>-->
+<!-- <skipAssembly>${integrationTest.launchNodeInSameJVM}</skipAssembly>-->
+<!-- </configuration>-->
+<!-- <executions>-->
+<!-- <!– Package binaries–>-->
+<!-- <execution>-->
+<!-- <id>cluster-test-assembly</id>-->
+<!-- <phase>package</phase>-->
+<!-- <goals>-->
+<!-- <goal>single</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <descriptors>-->
+<!-- <descriptor>src/assembly/mpp-test.xml</descriptor>-->
+<!-- </descriptors>-->
+<!-- <finalName>template-node</finalName>-->
+<!-- <appendAssemblyId>false</appendAssemblyId>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- <execution>-->
+<!-- <id>cluster-test-assembly-share</id>-->
+<!-- <phase>package</phase>-->
+<!-- <goals>-->
+<!-- <goal>single</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <descriptors>-->
+<!-- <descriptor>src/assembly/mpp-share.xml</descriptor>-->
+<!-- </descriptors>-->
+<!-- <finalName>template-node-share</finalName>-->
+<!-- <appendAssemblyId>false</appendAssemblyId>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- <!– Run integration tests –>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-failsafe-plugin</artifactId>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>integration-test</id>-->
+<!-- <goals>-->
+<!-- <goal>integration-test</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <groups>${integrationTest.includedGroups}</groups>-->
+<!-- <excludedGroups>${integrationTest.excludedGroups}</excludedGroups>-->
+<!-- <useSystemClassLoader>false</useSystemClassLoader>-->
+<!-- <parallel>none</parallel>-->
+<!-- <forkCount>${integrationTest.forkCount}</forkCount>-->
+<!-- <reuseForks>false</reuseForks>-->
+<!-- <systemPropertyVariables>-->
+<!-- <TestEnv>${integrationTest.testEnv}</TestEnv>-->
+<!-- <RandomSelectWriteNode>${integrationTest.randomSelectWriteNode}</RandomSelectWriteNode>-->
+<!-- <ReadAndVerifyWithMultiNode>${integrationTest.readAndVerifyWithMultiNode}</ReadAndVerifyWithMultiNode>-->
+<!-- </systemPropertyVariables>-->
+<!-- <summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- <execution>-->
+<!-- <id>verify</id>-->
+<!-- <goals>-->
+<!-- <goal>verify</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <summaryFiles>-->
+<!-- <summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>-->
+<!-- </summaryFiles>-->
+<!-- </configuration>-->
+<!-- </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>
@@ -261,7 +261,7 @@
<integrationTest.readAndVerifyWithMultiNode>false</integrationTest.readAndVerifyWithMultiNode>
</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 15f57ded4c..53e54f5c6a 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -105,6 +105,14 @@
</execution>
</executions>
</plugin>
+ <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>
@@ -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>
@@ -253,6 +261,14 @@
</execution>
</executions>
</plugin>
+ <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>
diff --git a/jdbc/src/main/feature/feature.xml b/jdbc/src/main/feature/feature.xml
index 8f37dae5f8..afddc8ac35 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="1.0.0">
+ <feature name="iotdb-feature" description="iotdb-feature" version="1.1.0">
<details>Feature to install required Bundle to use IoTDB inside Karaf container</details>
<feature prerequisite="true">wrap</feature>
<feature>scr</feature>
diff --git a/pom.xml b/pom.xml
index 36f770645e..9bcc1b34c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<module>metrics</module>
<!-- Will remove integration at 2023.1.23-->
<module>integration</module>
- <module>integration-test</module>
+<!-- <module>integration-test</module>-->
<module>consensus</module>
<module>external-pipe-api</module>
<module>library-udf</module>
diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml
index 3ec304c2aa..d55f2a9a77 100644
--- a/testcontainer/pom.xml
+++ b/testcontainer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 880e97f971..e3e4af3c91 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>