This is an automated email from the ASF dual-hosted git repository.
vernedeng pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/branch-1.8 by this push:
new 1b11a2fcc9 [INLONG-8481][Sort] Fix unit test for sort-core in
flink-1.15 (#8483)
1b11a2fcc9 is described below
commit 1b11a2fcc940c3b63a6979aa5c76ccc536563dd8
Author: Sting <[email protected]>
AuthorDate: Mon Jul 10 16:48:03 2023 +0800
[INLONG-8481][Sort] Fix unit test for sort-core in flink-1.15 (#8483)
---
.github/workflows/ci_ut_flink15.yml | 5 +++--
inlong-sort/sort-core/pom.xml | 14 ++++++++++++++
inlong-sort/sort-formats/format-json-v1.15/pom.xml | 2 +-
.../sort/formats/json/utils/FormatJsonUtil.java | 2 +-
inlong-sort/sort-formats/pom.xml | 20 ++++++++++++++++++--
5 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci_ut_flink15.yml
b/.github/workflows/ci_ut_flink15.yml
index 9c433efad5..f40e941775 100644
--- a/.github/workflows/ci_ut_flink15.yml
+++ b/.github/workflows/ci_ut_flink15.yml
@@ -15,7 +15,8 @@
# limitations under the License.
#
-name: InLong Unit Test For Flink 1.15
+name:
+ InLong Unit Test For Flink 1.15
on:
push:
@@ -59,7 +60,7 @@ jobs:
CI: false
- name: Unit test for Flink 1.15 with Maven
- run: mvn --update-snapshots -e -V test -Dtest="*" -pl
inlong-sort/sort-core
+ run: mvn --update-snapshots -e -V clean test -am -pl
inlong-sort/sort-core -Pv1.15
env:
CI: false
diff --git a/inlong-sort/sort-core/pom.xml b/inlong-sort/sort-core/pom.xml
index eca01553fb..b4146f39ca 100644
--- a/inlong-sort/sort-core/pom.xml
+++ b/inlong-sort/sort-core/pom.xml
@@ -252,6 +252,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${plugin.surefire.version}</version>
+ <configuration>
+ <includes>
+
<include>org.apache.inlong.sort.function.*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
diff --git a/inlong-sort/sort-formats/format-json-v1.15/pom.xml
b/inlong-sort/sort-formats/format-json-v1.15/pom.xml
index fd9fc5ec81..928619db0c 100644
--- a/inlong-sort/sort-formats/format-json-v1.15/pom.xml
+++ b/inlong-sort/sort-formats/format-json-v1.15/pom.xml
@@ -32,7 +32,7 @@
<properties>
<inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir>
<flink.version>1.15.4</flink.version>
- <flink.shaded.guava.version>18.0-13.0</flink.shaded.guava.version>
+
<flink.shaded.guava.version>30.1.1-jre-15.0</flink.shaded.guava.version>
</properties>
<dependencies>
diff --git
a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java
b/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java
index 95db53d218..7da129f323 100644
---
a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java
+++
b/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java
@@ -21,7 +21,7 @@ import org.apache.flink.formats.common.TimestampFormat;
import org.apache.flink.formats.json.JsonFormatOptions.MapNullKeyMode;
import org.apache.flink.formats.json.RowDataToJsonConverters;
import
org.apache.flink.formats.json.RowDataToJsonConverters.RowDataToJsonConverter;
-import org.apache.flink.shaded.guava18.com.google.common.collect.ImmutableMap;
+import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableMap;
import org.apache.flink.table.types.DataType;
import org.apache.flink.table.types.logical.BigIntType;
import org.apache.flink.table.types.logical.BinaryType;
diff --git a/inlong-sort/sort-formats/pom.xml b/inlong-sort/sort-formats/pom.xml
index c698e80f14..eb505081a6 100644
--- a/inlong-sort/sort-formats/pom.xml
+++ b/inlong-sort/sort-formats/pom.xml
@@ -37,9 +37,7 @@
<module>format-kv</module>
<module>format-inlongmsg-base</module>
<module>format-inlongmsg-csv</module>
- <module>format-json-v1.13</module>
<module>format-inlongmsg-pb</module>
- <module>format-json-v1.15</module>
</modules>
<properties>
@@ -212,4 +210,22 @@
<url>https://git.code.oa.com/flink/flink-formats</url>
</scm>
+ <profiles>
+ <profile>
+ <id>v1.13</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>format-json-v1.13</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>v1.15</id>
+ <modules>
+ <module>format-json-v1.15</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
