From ba432af8b1111fda1416c66ae37f5ff1508a773d Mon Sep 17 00:00:00 2001 From: "liugaoji.lgj" Date: Thu, 7 Nov 2024 17:35:27 +0800 Subject: [PATCH] fix pom version --- .../common/utils/version/InstanceVersion.java | 2 +- .../common/utils/version/Version.java | 2 +- polardbx-executor/pom.xml | 10 ++++----- .../executor/gsi/utils/Transformer.java | 6 +++--- polardbx-test/pom.xml | 21 +++++-------------- .../sharding/gsi/group1/CreateGsiTest.java | 2 +- pom.xml | 8 ++++++- 7 files changed, 23 insertions(+), 28 deletions(-) diff --git a/polardbx-common/src/main/java/com/alibaba/polardbx/common/utils/version/InstanceVersion.java b/polardbx-common/src/main/java/com/alibaba/polardbx/common/utils/version/InstanceVersion.java index 916e05759..4f5ce7b1c 100644 --- a/polardbx-common/src/main/java/com/alibaba/polardbx/common/utils/version/InstanceVersion.java +++ b/polardbx-common/src/main/java/com/alibaba/polardbx/common/utils/version/InstanceVersion.java @@ -29,7 +29,7 @@ public class InstanceVersion { private static final String regex = "\\d+\\.\\d+\\.\\d+"; private static final String VERSION_PREFIX_56 = "5.6.29"; private static final String VERSION_PREFIX_57 = "5.7.25"; - private static final String VERSION_PREFIX_8 = "8.0.3"; + private static final String VERSION_PREFIX_8 = "8.0.32"; private static final String DEFAULT_VERSION_PREFIX = VERSION_PREFIX_56; static volatile InstanceVersion instanceVersion = new InstanceVersion(); /** diff --git a/polardbx-common/src/main/java/com/alibaba/polardbx/common/utils/version/Version.java b/polardbx-common/src/main/java/com/alibaba/polardbx/common/utils/version/Version.java index 393a90f89..9134a1b22 100644 --- a/polardbx-common/src/main/java/com/alibaba/polardbx/common/utils/version/Version.java +++ b/polardbx-common/src/main/java/com/alibaba/polardbx/common/utils/version/Version.java @@ -35,7 +35,7 @@ private Version() { } // TODO get product version from config property - public static final String PRODUCT_VERSION = "2.5.0"; + public static final String PRODUCT_VERSION = "2.4.1"; private static final Logger logger = LoggerFactory.getLogger(Version.class); private static final Package myPackage = VersionAnnotation.class.getPackage(); diff --git a/polardbx-executor/pom.xml b/polardbx-executor/pom.xml index fae526ba7..d1cfb057d 100644 --- a/polardbx-executor/pom.xml +++ b/polardbx-executor/pom.xml @@ -236,11 +236,11 @@ aircompressor ${aircompressor.version} - - com.alibaba.polardbx - airlift-all-shade - ${airlift.shade.version} - + + + + + javax.validation validation-api diff --git a/polardbx-executor/src/main/java/com/alibaba/polardbx/executor/gsi/utils/Transformer.java b/polardbx-executor/src/main/java/com/alibaba/polardbx/executor/gsi/utils/Transformer.java index 70a9ab01f..c5eb8e48f 100644 --- a/polardbx-executor/src/main/java/com/alibaba/polardbx/executor/gsi/utils/Transformer.java +++ b/polardbx-executor/src/main/java/com/alibaba/polardbx/executor/gsi/utils/Transformer.java @@ -23,9 +23,9 @@ import com.google.common.base.Preconditions; import com.google.common.io.BaseEncoding; import com.mysql.jdbc.StringUtils; -import com.mysql.jdbc.ZeroDate; -import com.mysql.jdbc.ZeroTime; -import com.mysql.jdbc.ZeroTimestamp; +import com.alibaba.polardbx.common.jdbc.ZeroDate; +import com.alibaba.polardbx.common.jdbc.ZeroTime; +import com.alibaba.polardbx.common.jdbc.ZeroTimestamp; import com.alibaba.polardbx.common.exception.TddlNestableRuntimeException; import com.alibaba.polardbx.common.jdbc.ParameterContext; import com.alibaba.polardbx.common.jdbc.ParameterMethod; diff --git a/polardbx-test/pom.xml b/polardbx-test/pom.xml index 579069a3a..5d4913493 100644 --- a/polardbx-test/pom.xml +++ b/polardbx-test/pom.xml @@ -15,7 +15,7 @@ polardbx-test - 5.1.40.12 + 5.1.49 8.0.26 1.4.0-SNAPSHOT none @@ -40,12 +40,6 @@ jcip-annotations ${jcip.version} - - com.alibaba.external - test.junit.hamcrest - ${test.junit.hamcrest.version} - test - ${project.groupId} polardbx-optimizer @@ -95,20 +89,15 @@ ${mysql_connector_v5} test + - com.aliyun - polardbx-java-connector - ${polardbx_connector} + org.hamcrest + hamcrest test - - - org.junit.jupiter - junit-jupiter - - + com.google.truth truth diff --git a/polardbx-test/src/test/java/com/alibaba/polardbx/qatest/ddl/sharding/gsi/group1/CreateGsiTest.java b/polardbx-test/src/test/java/com/alibaba/polardbx/qatest/ddl/sharding/gsi/group1/CreateGsiTest.java index 2c49f35ce..c83219ddb 100644 --- a/polardbx-test/src/test/java/com/alibaba/polardbx/qatest/ddl/sharding/gsi/group1/CreateGsiTest.java +++ b/polardbx-test/src/test/java/com/alibaba/polardbx/qatest/ddl/sharding/gsi/group1/CreateGsiTest.java @@ -38,7 +38,7 @@ import static com.alibaba.polardbx.qatest.validator.DataValidator.resultSetContentSameAssert; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.hamcrest.number.OrderingComparisons.greaterThan; +import static org.hamcrest.number.OrderingComparison.greaterThan; /** * @author chenmo.cm diff --git a/pom.xml b/pom.xml index a2a146066..1eb8622fd 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ 1.9.13 0.0.2-SNAPSHOT 1.0.2 - 1.1 + 2.2 0.2.8 1.4.01 9.4.20.v20190813 @@ -483,6 +483,12 @@ ${mockito.verison} test + + org.hamcrest + hamcrest + ${hamcrest.version} + test +