Skip to content

Commit 8fb49b6

Browse files
committed
Bump tsfile version to 2.3.1-260519-SNAPSHOT
1 parent cf78568 commit 8fb49b6

9 files changed

Lines changed: 14 additions & 14 deletions

File tree

distribution/src/assembly/all.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<exclude>ainode-env.*</exclude>
6666
<exclude>**/ainode-env.*</exclude>
6767
<exclude>iotdb-common.sh</exclude>
68-
<exclude>**/iotdb-locale.*</exclude>
68+
<exclude>**/iotdb-common.bat</exclude>
6969
</excludes>
7070
<fileMode>0755</fileMode>
7171
</fileSet>
@@ -74,7 +74,7 @@
7474
<directory>${project.basedir}/../scripts/conf</directory>
7575
<includes>
7676
<include>iotdb-common.sh</include>
77-
<include>windows/iotdb-locale.bat</include>
77+
<include>windows/iotdb-common.bat</include>
7878
</includes>
7979
<filtered>true</filtered>
8080
<fileMode>0755</fileMode>

distribution/src/assembly/confignode.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<outputDirectory>conf</outputDirectory>
6060
<includes>
6161
<include>iotdb-common.sh</include>
62-
<include>windows/iotdb-locale.bat</include>
62+
<include>windows/iotdb-common.bat</include>
6363
</includes>
6464
<filtered>true</filtered>
6565
<fileMode>0755</fileMode>

integration-test/src/assembly/mpp-test.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<directory>${project.basedir}/../scripts/conf</directory>
5252
<excludes>
5353
<exclude>iotdb-common.sh</exclude>
54-
<exclude>**/iotdb-locale.*</exclude>
54+
<exclude>**/iotdb-common.bat</exclude>
5555
</excludes>
5656
<fileMode>0755</fileMode>
5757
</fileSet>
@@ -60,7 +60,7 @@
6060
<directory>${project.basedir}/../scripts/conf</directory>
6161
<includes>
6262
<include>iotdb-common.sh</include>
63-
<include>windows/iotdb-locale.bat</include>
63+
<include>windows/iotdb-common.bat</include>
6464
</includes>
6565
<filtered>true</filtered>
6666
<fileMode>0755</fileMode>

iotdb-core/confignode/src/assembly/confignode.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<directory>${project.basedir}/../../scripts/conf</directory>
5050
<outputDirectory>conf</outputDirectory>
5151
<includes>
52-
<include>windows/iotdb-locale.bat</include>
52+
<include>windows/iotdb-common.bat</include>
5353
</includes>
5454
<filtered>true</filtered>
5555
<fileMode>0755</fileMode>

iotdb-core/datanode/src/assembly/server.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<directory>${project.basedir}/../../scripts/conf</directory>
5050
<outputDirectory>conf</outputDirectory>
5151
<includes>
52-
<include>windows/iotdb-locale.bat</include>
52+
<include>windows/iotdb-common.bat</include>
5353
</includes>
5454
<filtered>true</filtered>
5555
<fileMode>0755</fileMode>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<thrift.version>0.14.1</thrift.version>
165165
<xz.version>1.9</xz.version>
166166
<zstd-jni.version>1.5.6-3</zstd-jni.version>
167-
<tsfile.version>2.3.0-260422-SNAPSHOT</tsfile.version>
167+
<tsfile.version>2.3.1-260519-SNAPSHOT</tsfile.version>
168168
<i18n.locale>en</i18n.locale>
169169
<tsfile.locale.opt></tsfile.locale.opt>
170170
</properties>

scripts/conf/windows/confignode-env.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ IF "%JAVA_VERSION%" == "8" (
153153
)
154154

155155
@REM Apply tsfile locale option populated by Maven at package time
156-
@REM (see conf\windows\iotdb-locale.bat; empty in default build, -Dtsfile.locale=zh under with-zh-locale).
157-
IF EXIST "%CONFIGNODE_CONF%\windows\iotdb-locale.bat" (
158-
CALL "%CONFIGNODE_CONF%\windows\iotdb-locale.bat"
156+
@REM (see conf\windows\iotdb-common.bat; empty in default build, -Dtsfile.locale=zh under with-zh-locale).
157+
IF EXIST "%CONFIGNODE_CONF%\windows\iotdb-common.bat" (
158+
CALL "%CONFIGNODE_CONF%\windows\iotdb-common.bat"
159159
IF NOT "%TSFILE_LOCALE_JVM_OPT%"=="" (
160160
set CONFIGNODE_JMX_OPTS=%CONFIGNODE_JMX_OPTS% %TSFILE_LOCALE_JVM_OPT%
161161
)

scripts/conf/windows/datanode-env.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ IF "%JAVA_VERSION%" == "8" (
184184
)
185185

186186
@REM Apply tsfile locale option populated by Maven at package time
187-
@REM (see conf\windows\iotdb-locale.bat; empty in default build, -Dtsfile.locale=zh under with-zh-locale).
188-
IF EXIST "%IOTDB_CONF%\windows\iotdb-locale.bat" (
189-
CALL "%IOTDB_CONF%\windows\iotdb-locale.bat"
187+
@REM (see conf\windows\iotdb-common.bat; empty in default build, -Dtsfile.locale=zh under with-zh-locale).
188+
IF EXIST "%IOTDB_CONF%\windows\iotdb-common.bat" (
189+
CALL "%IOTDB_CONF%\windows\iotdb-common.bat"
190190
IF NOT "%TSFILE_LOCALE_JVM_OPT%"=="" (
191191
set IOTDB_JMX_OPTS=%IOTDB_JMX_OPTS% %TSFILE_LOCALE_JVM_OPT%
192192
)

0 commit comments

Comments
 (0)