Skip to content

Commit 5e930e7

Browse files
authored
Merge pull request #531 from tapdata/develop
Develop
2 parents 94cb053 + ca3eee7 commit 5e930e7

File tree

119 files changed

+1590
-637
lines changed

Some content is hidden

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

119 files changed

+1590
-637
lines changed

connectors-common/connector-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>io.tapdata</groupId>
3535
<artifactId>tapdata-pdk-runner</artifactId>
36-
<version>1.10-SNAPSHOT</version>
36+
<version>2.0-SNAPSHOT</version>
3737
<scope>test</scope>
3838
</dependency>
3939

connectors-common/connector-core/src/main/java/io/tapdata/kit/StringKit.java

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.tapdata.kit;
22

3+
import org.apache.commons.lang3.StringUtils;
4+
35
import java.security.MessageDigest;
46
import java.security.NoSuchAlgorithmException;
57
import java.util.Arrays;
@@ -31,12 +33,30 @@ public static String copyString(String copied, Integer count, String combiner) {
3133
return sb.delete(sb.length() - combiner.length(), sb.length()).toString();
3234
}
3335

34-
//replace first
35-
public static String replaceOnce(String text, String searchString, String replacement) {
36+
//replace
37+
public static String replace(String text, String searchString, String replacement) {
3638
if (EmptyKit.isEmpty(text)) {
3739
return "";
3840
}
39-
return text.replace(searchString, replacement);
41+
return StringUtils.replace(text, searchString, replacement);
42+
}
43+
44+
public static String replaceEscape(String input, char[] replacements) {
45+
char[] chars = input.toCharArray();
46+
StringBuilder sb = new StringBuilder();
47+
int i = 0;
48+
while (i < chars.length) {
49+
char c = chars[i];
50+
for (char replacement : replacements) {
51+
if (c == replacement) {
52+
sb.append("\\");
53+
break;
54+
}
55+
}
56+
sb.append(c);
57+
i++;
58+
}
59+
return sb.toString();
4060
}
4161

4262
/**

connectors-common/file-connector-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<packaging>jar</packaging>
1414

1515
<properties>
16-
<tapdata.api.version>1.4.4-SNAPSHOT</tapdata.api.version>
17-
<tapdata.pdk.api.version>1.4.4-SNAPSHOT</tapdata.pdk.api.version>
16+
<tapdata.api.version>2.0.0-SNAPSHOT</tapdata.api.version>
17+
<tapdata.pdk.api.version>2.0.0-SNAPSHOT</tapdata.pdk.api.version>
1818
<java.version>8</java.version>
1919
</properties>
2020

connectors-common/hive-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<properties>
1919
<java.version>8</java.version>
2020
<sql.core.version>1.0-SNAPSHOT</sql.core.version>
21-
<tapdata.pdk.api.verison>1.4.4-SNAPSHOT</tapdata.pdk.api.verison>
21+
<tapdata.pdk.api.verison>2.0.0-SNAPSHOT</tapdata.pdk.api.verison>
2222

2323
</properties>
2424
<dependencyManagement>

connectors-common/js-connector-core-plus/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<java.version>8</java.version>
17-
<tapdata.pdk.api.version>1.4.4-SNAPSHOT</tapdata.pdk.api.version>
17+
<tapdata.pdk.api.version>2.0.0-SNAPSHOT</tapdata.pdk.api.version>
1818
</properties>
1919

2020
<dependencies>

connectors-common/js-connector-core/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<java.version>8</java.version>
17-
<tapdata.pdk.api.version>1.4.4-SNAPSHOT</tapdata.pdk.api.version>
17+
<tapdata.pdk.api.version>2.0.0-SNAPSHOT</tapdata.pdk.api.version>
1818
</properties>
1919

2020
<dependencies>
@@ -65,13 +65,14 @@
6565
<dependency>
6666
<groupId>org.graalvm.js</groupId>
6767
<artifactId>js</artifactId>
68-
<version>21.3.0</version>
68+
<version>24.1.2</version>
69+
<type>pom</type>
6970
<scope>test</scope>
7071
</dependency>
7172
<dependency>
7273
<groupId>org.graalvm.js</groupId>
7374
<artifactId>js-scriptengine</artifactId>
74-
<version>21.3.0</version>
75+
<version>24.1.2</version>
7576
<scope>test</scope>
7677
</dependency>
7778
<dependency>

connectors-common/kafka-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<dependency>
197197
<groupId>io.tapdata</groupId>
198198
<artifactId>script-engine-module</artifactId>
199-
<version>1.0-SNAPSHOT</version>
199+
<version>2.0-SNAPSHOT</version>
200200
<scope>test</scope>
201201
</dependency>
202202
<!-- Test Dependencies -->

0 commit comments

Comments
 (0)