Skip to content

Commit 077c3bc

Browse files
authored
Bump netty version to 4.1.119.Final
1 parent 95ed457 commit 077c3bc

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/multi-language-client.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
max-parallel: 15
4747
matrix:
48-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-2019, windows-2022, macos-latest]
48+
os: [ubuntu-22.04, ubuntu-24.04, windows-2019, windows-2022, macos-latest]
4949
runs-on: ${{ matrix.os}}
5050

5151
steps:
@@ -137,8 +137,8 @@ jobs:
137137
fail-fast: false
138138
max-parallel: 15
139139
matrix:
140-
python: [ '3.6', '3.x']
141-
runs-on: ${{ (matrix.python == '3.6' && 'ubuntu-20.04') || 'ubuntu-latest' }}
140+
python: ['3.x']
141+
runs-on: ${{ 'ubuntu-latest' }}
142142

143143
steps:
144144
- uses: actions/setup-python@v5

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/AbstractCompactionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.iotdb.commons.path.PartialPath;
3030
import org.apache.iotdb.db.conf.IoTDBDescriptor;
3131
import org.apache.iotdb.db.exception.StorageEngineException;
32-
import org.apache.iotdb.db.protocol.rest.StringUtil;
3332
import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext;
3433
import org.apache.iotdb.db.storageengine.buffer.BloomFilterCache;
3534
import org.apache.iotdb.db.storageengine.buffer.ChunkCache;
@@ -52,6 +51,7 @@
5251
import org.apache.iotdb.db.utils.constant.TestConstant;
5352

5453
import org.apache.commons.io.FileUtils;
54+
import org.apache.commons.lang3.StringUtils;
5555
import org.apache.tsfile.common.conf.TSFileConfig;
5656
import org.apache.tsfile.common.conf.TSFileDescriptor;
5757
import org.apache.tsfile.common.constant.TsFileConstant;
@@ -765,7 +765,7 @@ protected void resetFileName(TsFileResource resource, int version) {
765765
File file = resource.getTsFile();
766766
String[] fileInfo = file.getPath().split(FILE_NAME_SEPARATOR);
767767
fileInfo[1] = String.valueOf(version);
768-
String newFileName = StringUtil.join(fileInfo, FILE_NAME_SEPARATOR);
768+
String newFileName = StringUtils.join(fileInfo, FILE_NAME_SEPARATOR);
769769
file.renameTo(new File(newFileName));
770770

771771
resource.setVersion(version);

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<!-- This was the last version to support Java 8 -->
130130
<!--mockito.version>4.11.0</mockito.version-->
131131
<moquette.version>0.18.0</moquette.version>
132-
<netty.version>4.1.115.Final</netty.version>
132+
<netty.version>4.1.119.Final</netty.version>
133133
<nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
134134
<oauth2-oidc-sdk.version>10.15</oauth2-oidc-sdk.version>
135135
<!-- This was the last version to support Java 8 -->

0 commit comments

Comments
 (0)