Skip to content

Commit 54e54ac

Browse files
committed
Merge branch 'master' into alter_column_datatype_draft
2 parents f5ca57d + 9d9902f commit 54e54ac

File tree

940 files changed

+32298
-11072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

940 files changed

+32298
-11072
lines changed

.github/workflows/cluster-it-1c1d1a.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ jobs:
4141

4242
steps:
4343
- uses: actions/checkout@v4
44-
- name: Build AINode
45-
shell: bash
46-
run: mvn clean package -DskipTests -P with-ainode
4744
- name: IT Test
4845
shell: bash
4946
run: |

LICENSE

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,4 +339,14 @@ LMax Disruptor is open source software licensed under the Apache License 2.0 and
339339
Project page: https://github.com/LMAX-Exchange/disruptor
340340
License: https://github.com/LMAX-Exchange/disruptor/blob/master/LICENCE.txt
341341

342+
--------------------------------------------------------------------------------
343+
344+
The following files include code modified from chronos-forecasting project.
345+
346+
./iotdb-core/ainode/iotdb/ainode/core/model/chronos2/*
347+
348+
The chronos-forecasting is open source software licensed under the Apache License 2.0
349+
Project page: https://github.com/amazon-science/chronos-forecasting
350+
License: https://github.com/amazon-science/chronos-forecasting/blob/main/LICENSE
351+
342352
--------------------------------------------------------------------------------

LICENSE-binary

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ conditions of the following licenses.
213213
The binary distribution of this product bundles these dependencies under the
214214
following license. See licenses/ for text of these licenses.
215215

216-
Apache Software Foundation License 2.0
216+
Apache License 2.0
217217
--------------------------------------
218218
commons-cli:commons-cli:1.5.0
219219
com.nimbusds:content-type:2.2
@@ -223,7 +223,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.16.2
223223
com.fasterxml.jackson.core:jackson-core:2.16.2
224224
com.fasterxml.jackson.core:jackson-databind:2.16.2
225225
jakarta.inject:jakarta.inject:2.6.1
226-
org.lz4:lz4-java:1.8.0
226+
at.yawk.lz4:lz4-java:1.10.0
227227
com.github.stephenc.jcip:jcip-annotations:1.0-1
228228
com.github.ben-manes.caffeine:caffeine:2.9.3
229229
org.eclipse.jetty:jetty-http:9.4.57.v20241219

code-coverage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-parent</artifactId>
27-
<version>2.0.6-SNAPSHOT</version>
27+
<version>2.0.7-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>iotdb-code-coverage</artifactId>
3030
<packaging>pom</packaging>

dependencies.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"dependencies": [
3+
"at.yawk.lz4:lz4-java",
34
"cglib:cglib",
45
"ch.qos.logback:logback-classic",
56
"ch.qos.logback:logback-core",
@@ -155,7 +156,6 @@
155156
"org.jline:jline",
156157
"org.jvnet.mimepull:mimepull",
157158
"org.latencyutils:LatencyUtils",
158-
"org.lz4:lz4-java",
159159
"org.ops4j.pax.jdbc:pax-jdbc-common",
160160
"org.osgi:osgi.cmpn",
161161
"org.osgi:osgi.core",

distribution/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-parent</artifactId>
27-
<version>2.0.6-SNAPSHOT</version>
27+
<version>2.0.7-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>iotdb-distribution</artifactId>
3030
<packaging>pom</packaging>
@@ -33,25 +33,25 @@
3333
<dependency>
3434
<groupId>org.apache.iotdb</groupId>
3535
<artifactId>iotdb-server</artifactId>
36-
<version>2.0.6-SNAPSHOT</version>
36+
<version>2.0.7-SNAPSHOT</version>
3737
<type>zip</type>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.apache.iotdb</groupId>
4141
<artifactId>iotdb-cli</artifactId>
42-
<version>2.0.6-SNAPSHOT</version>
42+
<version>2.0.7-SNAPSHOT</version>
4343
<type>zip</type>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.iotdb</groupId>
4747
<artifactId>iotdb-confignode</artifactId>
48-
<version>2.0.6-SNAPSHOT</version>
48+
<version>2.0.7-SNAPSHOT</version>
4949
<type>zip</type>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.apache.iotdb</groupId>
5353
<artifactId>library-udf</artifactId>
54-
<version>2.0.6-SNAPSHOT</version>
54+
<version>2.0.7-SNAPSHOT</version>
5555
</dependency>
5656
</dependencies>
5757
<build>
@@ -174,7 +174,7 @@
174174
<dependency>
175175
<groupId>org.apache.iotdb</groupId>
176176
<artifactId>iotdb-ainode</artifactId>
177-
<version>2.0.6-SNAPSHOT</version>
177+
<version>2.0.7-SNAPSHOT</version>
178178
</dependency>
179179
</dependencies>
180180
<build>

example/client-cpp-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.6-SNAPSHOT</version>
27+
<version>2.0.7-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>client-cpp-example</artifactId>
3030
<name>IoTDB: Example: CPP Client</name>

example/jdbc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.6-SNAPSHOT</version>
27+
<version>2.0.7-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>jdbc-example</artifactId>
3030
<name>IoTDB: Example: JDBC</name>

example/mqtt-customize/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.6-SNAPSHOT</version>
27+
<version>2.0.7-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>customize-mqtt-example</artifactId>
3030
<name>IoTDB: Example: Customized MQTT</name>

example/mqtt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.6-SNAPSHOT</version>
27+
<version>2.0.7-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>mqtt-example</artifactId>
3030
<name>IoTDB: Example: MQTT</name>

0 commit comments

Comments
 (0)