fix pom version

polardb · Nov 11, 2024 · ba432af · ba432af
1 parent 97171d7
commit ba432af
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 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
@@ -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
@@ -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
@@ -236,11 +236,11 @@
             <artifactId>aircompressor</artifactId>
             <version>${aircompressor.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.polardbx</groupId>
-            <artifactId>airlift-all-shade</artifactId>
-            <version>${airlift.shade.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.polardbx</groupId>-->
+<!--            <artifactId>airlift-all-shade</artifactId>-->
+<!--            <version>${airlift.shade.version}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>

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
@@ -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
@@ -15,7 +15,7 @@
     <artifactId>polardbx-test</artifactId>
 
     <properties>
-        <mysql_connector_v5>5.1.40.12</mysql_connector_v5>
+        <mysql_connector_v5>5.1.49</mysql_connector_v5>
         <mysql_connector_v8>8.0.26</mysql_connector_v8>
         <polardbx_connector>1.4.0-SNAPSHOT</polardbx_connector>
         <mvn_parallel>none</mvn_parallel>
@@ -40,12 +40,6 @@
             <artifactId>jcip-annotations</artifactId>
             <version>${jcip.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.external</groupId>
-            <artifactId>test.junit.hamcrest</artifactId>
-            <version>${test.junit.hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>polardbx-optimizer</artifactId>
@@ -95,20 +89,15 @@
             <version>${mysql_connector_v5}</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>polardbx-java-connector</artifactId>
-            <version>${polardbx_connector}</version>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.jupiter</groupId>
-                    <artifactId>junit-jupiter</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
 
+
         <dependency>
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>

diff --git a/...test/src/test/java/com/alibaba/polardbx/qatest/ddl/sharding/gsi/group1/CreateGsiTest.java b/...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
@@ -142,7 +142,7 @@
         <jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
         <dtafEx.version>0.0.2-SNAPSHOT</dtafEx.version>
         <ddl-parser.version>1.0.2</ddl-parser.version>
-        <test.junit.hamcrest.version>1.1</test.junit.hamcrest.version>
+        <hamcrest.version>2.2</hamcrest.version>
         <sshtester.version>0.2.8</sshtester.version>
         <xml-apis.version>1.4.01</xml-apis.version>
         <jetty.version>9.4.20.v20190813</jetty.version>
@@ -483,6 +483,12 @@
                 <version>${mockito.verison}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest</artifactId>
+                <version>${hamcrest.version}</version>
+                <scope>test</scope>
+            </dependency>
             <!--            <dependency>-->
             <!--                <groupId>org.apache.arrow</groupId>-->
             <!--                <artifactId>arrow-vector</artifactId>-->