!359 update version

Merge pull request !359 from AE86/v_2.0

dbsyncer-connector/dbsyncer-connector-base/pom.xml

@@ -75,12 +75,6 @@
             <version>${project.parent.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-connector/dbsyncer-connector-elasticsearch/pom.xml

@@ -39,12 +39,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-connector/dbsyncer-connector-file/pom.xml

@@ -20,12 +20,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-connector/dbsyncer-connector-kafka/pom.xml

@@ -26,12 +26,6 @@
             <artifactId>kafka-clients</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-connector/dbsyncer-connector-mysql/pom.xml

@@ -37,12 +37,6 @@
             <artifactId>mysql-binlog-connector-java</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/binlog/BinaryLogRemoteClient.java

@@ -11,6 +11,7 @@ import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream;
 import com.github.shyiko.mysql.binlog.network.*;
 import com.github.shyiko.mysql.binlog.network.protocol.*;
 import com.github.shyiko.mysql.binlog.network.protocol.command.*;
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.mysql.deserializer.DeleteDeserializer;
 import org.dbsyncer.connector.mysql.deserializer.UpdateDeserializer;
 import org.dbsyncer.connector.mysql.deserializer.WriteDeserializer;
@@ -96,7 +97,7 @@ public class BinaryLogRemoteClient implements BinaryLogClient {
     private boolean useBinlogFilenamePositionInGtidMode;
     private Boolean isMariaDB;
 
-    private static final int MYSQL_VERSION_8_4 = 840000;
+    private static final long MYSQL_VERSION_8_4 = 8400000000L;
     private final List<BinaryLogRemoteClient.EventListener> eventListeners = new CopyOnWriteArrayList<>();
     private final List<BinaryLogRemoteClient.LifecycleListener> lifecycleListeners = new CopyOnWriteArrayList<>();
 
@@ -426,15 +427,15 @@ public class BinaryLogRemoteClient implements BinaryLogClient {
 
     }
 
-    private Integer getVersion() throws IOException {
+    private Long getVersion() throws IOException {
         channel.write(new QueryCommand("SELECT VERSION()"));
         ResultSetRowPacket[] resultSet = readResultSet();
         if (resultSet.length == 0) {
             throw new IOException("Failed to getVersion, command SELECT VERSION()");
         }
         ResultSetRowPacket resultSetRow = resultSet[0];
-        String version = resultSetRow.getValue(0).replace(".", "");
-        return Integer.parseInt(String.format("%-6s", version).replace(" ", "0")) ;
+        String version = resultSetRow.getValue(0).replace(StringUtil.POINT, StringUtil.EMPTY).replace(StringUtil.HORIZONTAL, StringUtil.EMPTY);
+        return Long.parseLong(String.format("%-10s", version).replace(StringUtil.SPACE, "0"));
     }
 
     private void fetchBinlogFilenameAndPosition() throws IOException {

dbsyncer-connector/dbsyncer-connector-oracle/pom.xml

@@ -37,12 +37,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-connector/dbsyncer-connector-postgresql/pom.xml

@@ -30,12 +30,6 @@
             <artifactId>postgis-jdbc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-connector/dbsyncer-connector-sqlite/pom.xml

@@ -26,12 +26,6 @@
             <artifactId>sqlite-jdbc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-connector/dbsyncer-connector-sqlserver/pom.xml

@@ -26,12 +26,6 @@
             <artifactId>mssql-jdbc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/ParserConsumer.java

@@ -37,7 +37,6 @@ public final class ParserConsumer implements Watcher {
 
     @Override
     public void changeEvent(ChangedEvent event) {
-        event.getChangedOffset().setMetaId(metaId);
         bufferActuatorRouter.execute(metaId, event);
     }
 

dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/BufferActuatorRouter.java

@@ -49,6 +49,7 @@ public final class BufferActuatorRouter implements DisposableBean {
     private final Map<String, Map<String, TableGroupBufferActuator>> router = new ConcurrentHashMap<>();
 
     public void execute(String metaId, ChangedEvent event) {
+        event.getChangedOffset().setMetaId(metaId);
         if (router.containsKey(metaId)) {
             router.computeIfPresent(metaId, (k, processor) -> {
                 processor.computeIfPresent(event.getSourceTableName(), (x, actuator) -> {

dbsyncer-storage/pom.xml

@@ -30,37 +30,6 @@
             <artifactId>lucene-analyzers-smartcn</artifactId>
         </dependency>
 
-        <!-- elasticsearch -->
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.elasticsearch</groupId>
-                    <artifactId>jna</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-        </dependency>
-
-        <!-- oracle-driver -->
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- postgresql -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

dbsyncer-web/src/main/java/org/dbsyncer/web/Version.java

@@ -17,7 +17,7 @@ public class Version {
 
     public static final Version V_2_0_5 = new Version(20_00_05_2025_02_19_00L);
     public static final Version V_2_0_6 = new Version(20_00_06_2025_00_00_00L);
-    public static final Version CURRENT = new Version(20_00_06_2025_03_14_00L);
+    public static final Version CURRENT = new Version(20_00_06_2025_04_01_00L);
 
     public Version(long version) {
         this.version = version;
@@ -31,4 +31,4 @@ public class Version {
     public String toString() {
         return String.valueOf(version);
     }
-}
+}