This is an automated email from the ASF dual-hosted git repository.

djwang pushed a commit to branch sync-with-upstream
in repository https://gitbox.apache.org/repos/asf/cloudberry-gpbackup.git


The following commit(s) were added to refs/heads/sync-with-upstream by this 
push:
     new 10d4482a deps: Update cloudberry-go-libs to Apache repository
10d4482a is described below

commit 10d4482aff400b8b7f15721cd48bb5fbeb01ba63
Author: Robert Mu <[email protected]>
AuthorDate: Wed Sep 10 10:35:07 2025 +0800

    deps: Update cloudberry-go-libs to Apache repository
    
    Migrate dependency from github.com/cloudberrydb/gp-common-go-libs
    to github.com/apache/cloudberry-go-libs 
v1.0.12-0.20250910014224-fc376e8a1056
---
 backup/backup.go                               |  8 ++++----
 backup/backup_internal_test.go                 |  2 +-
 backup/backup_suite_test.go                    |  2 +-
 backup/data.go                                 |  4 ++--
 backup/dependencies.go                         |  4 ++--
 backup/dependencies_test.go                    |  2 +-
 backup/global_variables.go                     |  4 ++--
 backup/incremental.go                          |  4 ++--
 backup/incremental_test.go                     |  6 +++---
 backup/metadata_globals.go                     |  2 +-
 backup/metadata_globals_test.go                |  2 +-
 backup/postdata.go                             |  2 +-
 backup/predata_acl_test.go                     |  4 ++--
 backup/predata_externals_test.go               |  2 +-
 backup/predata_functions.go                    |  2 +-
 backup/predata_functions_test.go               |  2 +-
 backup/predata_relations.go                    |  4 ++--
 backup/predata_relations_other_test.go         |  4 ++--
 backup/predata_relations_tables_test.go        |  2 +-
 backup/predata_shared.go                       |  2 +-
 backup/predata_types.go                        |  2 +-
 backup/queries_acl.go                          |  4 ++--
 backup/queries_acl_test.go                     |  2 +-
 backup/queries_externals.go                    |  4 ++--
 backup/queries_functions.go                    |  4 ++--
 backup/queries_functions_test.go               |  2 +-
 backup/queries_globals.go                      |  4 ++--
 backup/queries_incremental.go                  |  4 ++--
 backup/queries_operators.go                    |  4 ++--
 backup/queries_postdata.go                     |  4 ++--
 backup/queries_postdata_test.go                |  2 +-
 backup/queries_relation_test.go                |  2 +-
 backup/queries_relations.go                    |  4 ++--
 backup/queries_shared.go                       |  4 ++--
 backup/queries_shared_test.go                  |  2 +-
 backup/queries_statistics.go                   |  4 ++--
 backup/queries_table_defs.go                   |  4 ++--
 backup/queries_textsearch.go                   |  4 ++--
 backup/queries_types.go                        |  4 ++--
 backup/snapshot.go                             |  4 ++--
 backup/validate.go                             |  4 ++--
 backup/validate_test.go                        |  2 +-
 backup/wrappers.go                             |  6 +++---
 end_to_end/end_to_end_suite_test.go            | 12 ++++++------
 end_to_end/filtered_test.go                    |  4 ++--
 end_to_end/incremental_test.go                 |  4 ++--
 end_to_end/locks_test.go                       |  2 +-
 end_to_end/plugin_test.go                      |  8 ++++----
 end_to_end/signal_handler_test.go              |  2 +-
 end_to_end/special_characters_test.go          |  2 +-
 filepath/filepath.go                           |  8 ++++----
 filepath/filepath_test.go                      |  6 +++---
 go.mod                                         |  2 +-
 go.sum                                         |  4 ++--
 helper/helper.go                               |  4 ++--
 history/history.go                             |  4 ++--
 history/history_test.go                        |  6 +++---
 integration/agent_remote_test.go               |  2 +-
 integration/data_backup_test.go                |  4 ++--
 integration/dependency_queries_test.go         |  2 +-
 integration/gpexpand_not_running_test.go       |  6 +++---
 integration/helper_test.go                     |  2 +-
 integration/incremental_queries_test.go        |  2 +-
 integration/inheritance_test.go                |  4 ++--
 integration/integration_suite_test.go          |  8 ++++----
 integration/metadata_globals_create_test.go    |  4 ++--
 integration/metadata_globals_queries_test.go   |  4 ++--
 integration/options_integration_test.go        |  2 +-
 integration/parallel_queries_test.go           |  4 ++--
 integration/postdata_create_test.go            |  4 ++--
 integration/postdata_queries_test.go           |  4 ++--
 integration/predata_acl_create_test.go         |  4 ++--
 integration/predata_acl_queries_test.go        |  4 ++--
 integration/predata_externals_create_test.go   |  4 ++--
 integration/predata_externals_queries_test.go  |  4 ++--
 integration/predata_functions_create_test.go   |  4 ++--
 integration/predata_functions_queries_test.go  |  4 ++--
 integration/predata_operators_create_test.go   |  4 ++--
 integration/predata_operators_queries_test.go  |  4 ++--
 integration/predata_relations_create_test.go   |  4 ++--
 integration/predata_relations_queries_test.go  |  6 +++---
 integration/predata_shared_create_test.go      |  4 ++--
 integration/predata_shared_queries_test.go     |  4 ++--
 integration/predata_table_defs_queries_test.go |  4 ++--
 integration/predata_textsearch_create_test.go  |  4 ++--
 integration/predata_textsearch_queries_test.go |  4 ++--
 integration/predata_types_create_test.go       |  4 ++--
 integration/predata_types_queries_test.go      |  4 ++--
 integration/statistics_create_test.go          |  4 ++--
 integration/statistics_queries_test.go         |  4 ++--
 integration/utils_test.go                      |  4 ++--
 integration/wrappers_test.go                   |  4 ++--
 options/flag.go                                |  2 +-
 options/flag_test.go                           |  2 +-
 options/options.go                             |  6 +++---
 options/options_suite_test.go                  |  2 +-
 options/options_test.go                        |  4 ++--
 report/report.go                               | 10 +++++-----
 report/report_test.go                          | 12 ++++++------
 restore/data.go                                |  6 +++---
 restore/data_test.go                           |  2 +-
 restore/global_variables.go                    |  4 ++--
 restore/parallel.go                            |  2 +-
 restore/remote.go                              |  6 +++---
 restore/remote_test.go                         |  6 +++---
 restore/restore.go                             |  6 +++---
 restore/restore_internal_test.go               |  2 +-
 restore/restore_suite_test.go                  |  2 +-
 restore/validate.go                            |  4 ++--
 restore/validate_test.go                       |  2 +-
 restore/wrappers.go                            |  8 ++++----
 restore/wrappers_test.go                       |  4 ++--
 testutils/functions.go                         | 12 ++++++------
 toc/toc.go                                     |  2 +-
 utils/agent_remote.go                          |  8 ++++----
 utils/agent_remote_test.go                     |  8 ++++----
 utils/compression_test.go                      |  8 ++++----
 utils/gpexpand_sensor.go                       |  4 ++--
 utils/gpexpand_sensor_test.go                  |  2 +-
 utils/io.go                                    |  2 +-
 utils/io_test.go                               |  4 ++--
 utils/plugin.go                                |  8 ++++----
 utils/plugin_test.go                           |  8 ++++----
 utils/progress_bar.go                          |  2 +-
 utils/progress_bar_test.go                     |  6 +++---
 utils/util.go                                  |  6 +++---
 utils/util_test.go                             |  2 +-
 utils/utils_suite_test.go                      |  2 +-
 128 files changed, 263 insertions(+), 263 deletions(-)

diff --git a/backup/backup.go b/backup/backup.go
index f6c5762f..6595f3c3 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -11,10 +11,10 @@ import (
        "sync"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
diff --git a/backup/backup_internal_test.go b/backup/backup_internal_test.go
index ca2883ba..1fb8d814 100644
--- a/backup/backup_internal_test.go
+++ b/backup/backup_internal_test.go
@@ -1,7 +1,7 @@
 package backup
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
 
        . "github.com/onsi/ginkgo/v2"
        . "github.com/onsi/gomega"
diff --git a/backup/backup_suite_test.go b/backup/backup_suite_test.go
index 46128e04..f7a54b1b 100644
--- a/backup/backup_suite_test.go
+++ b/backup/backup_suite_test.go
@@ -9,7 +9,7 @@ import (
        "testing"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/dbconn"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/data.go b/backup/data.go
index bcd4c786..c4b3d315 100644
--- a/backup/data.go
+++ b/backup/data.go
@@ -12,8 +12,8 @@ import (
        "sync/atomic"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/jackc/pgconn"
diff --git a/backup/dependencies.go b/backup/dependencies.go
index eac546bb..4c0bb135 100644
--- a/backup/dependencies.go
+++ b/backup/dependencies.go
@@ -5,8 +5,8 @@ import (
        "sort"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
diff --git a/backup/dependencies_test.go b/backup/dependencies_test.go
index 00c133f9..85288b6c 100644
--- a/backup/dependencies_test.go
+++ b/backup/dependencies_test.go
@@ -4,7 +4,7 @@ import (
        "database/sql"
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
 
diff --git a/backup/global_variables.go b/backup/global_variables.go
index c34bcc64..f4107221 100644
--- a/backup/global_variables.go
+++ b/backup/global_variables.go
@@ -3,8 +3,8 @@ package backup
 import (
        "sync"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/report"
diff --git a/backup/incremental.go b/backup/incremental.go
index 25f3ca35..0a925ab2 100644
--- a/backup/incremental.go
+++ b/backup/incremental.go
@@ -4,8 +4,8 @@ import (
        "fmt"
        "path"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/incremental_test.go b/backup/incremental_test.go
index 059e5f9c..6bd28f35 100644
--- a/backup/incremental_test.go
+++ b/backup/incremental_test.go
@@ -3,9 +3,9 @@ package backup_test
 import (
        "os"
 
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/history"
diff --git a/backup/metadata_globals.go b/backup/metadata_globals.go
index c200c8ef..d9f1a90d 100644
--- a/backup/metadata_globals.go
+++ b/backup/metadata_globals.go
@@ -6,7 +6,7 @@ import (
        "strconv"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
 )
diff --git a/backup/metadata_globals_test.go b/backup/metadata_globals_test.go
index 7e223877..43d55a09 100644
--- a/backup/metadata_globals_test.go
+++ b/backup/metadata_globals_test.go
@@ -3,7 +3,7 @@ package backup_test
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/postdata.go b/backup/postdata.go
index 9da2141c..52492ef6 100644
--- a/backup/postdata.go
+++ b/backup/postdata.go
@@ -9,7 +9,7 @@ package backup
 import (
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
diff --git a/backup/predata_acl_test.go b/backup/predata_acl_test.go
index dbfda672..9248f0ec 100644
--- a/backup/predata_acl_test.go
+++ b/backup/predata_acl_test.go
@@ -5,8 +5,8 @@ import (
        "fmt"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/predata_externals_test.go b/backup/predata_externals_test.go
index 85c01c3e..ea4cf03e 100644
--- a/backup/predata_externals_test.go
+++ b/backup/predata_externals_test.go
@@ -3,7 +3,7 @@ package backup_test
 import (
        "database/sql"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/predata_functions.go b/backup/predata_functions.go
index f8f2ae1d..517b77f7 100644
--- a/backup/predata_functions.go
+++ b/backup/predata_functions.go
@@ -9,7 +9,7 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
 )
diff --git a/backup/predata_functions_test.go b/backup/predata_functions_test.go
index 16b69169..dc3fbbc4 100644
--- a/backup/predata_functions_test.go
+++ b/backup/predata_functions_test.go
@@ -4,7 +4,7 @@ import (
        "database/sql"
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/predata_relations.go b/backup/predata_relations.go
index 98257551..7e3b97ae 100644
--- a/backup/predata_relations.go
+++ b/backup/predata_relations.go
@@ -13,8 +13,8 @@ import (
 
        "github.com/pkg/errors"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
diff --git a/backup/predata_relations_other_test.go 
b/backup/predata_relations_other_test.go
index cbb2aa6d..f25636b3 100644
--- a/backup/predata_relations_other_test.go
+++ b/backup/predata_relations_other_test.go
@@ -6,8 +6,8 @@ import (
        "math"
        "sort"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/backup/predata_relations_tables_test.go 
b/backup/predata_relations_tables_test.go
index 2fef2e3d..6ce28658 100644
--- a/backup/predata_relations_tables_test.go
+++ b/backup/predata_relations_tables_test.go
@@ -3,7 +3,7 @@ package backup_test
 import (
        "database/sql"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/predata_shared.go b/backup/predata_shared.go
index 0c016bb1..8e3d96ea 100644
--- a/backup/predata_shared.go
+++ b/backup/predata_shared.go
@@ -7,7 +7,7 @@ package backup
  */
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
diff --git a/backup/predata_types.go b/backup/predata_types.go
index bc33226c..7eacd757 100644
--- a/backup/predata_types.go
+++ b/backup/predata_types.go
@@ -9,7 +9,7 @@ import (
        "fmt"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
diff --git a/backup/queries_acl.go b/backup/queries_acl.go
index 4163cb65..d1506fbb 100644
--- a/backup/queries_acl.go
+++ b/backup/queries_acl.go
@@ -10,8 +10,8 @@ import (
        "fmt"
        "sort"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
 )
 
diff --git a/backup/queries_acl_test.go b/backup/queries_acl_test.go
index 8266753d..4fea7fad 100644
--- a/backup/queries_acl_test.go
+++ b/backup/queries_acl_test.go
@@ -6,7 +6,7 @@ import (
        "regexp"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/toc"
 
diff --git a/backup/queries_externals.go b/backup/queries_externals.go
index d63f58e1..34370670 100644
--- a/backup/queries_externals.go
+++ b/backup/queries_externals.go
@@ -6,8 +6,8 @@ package backup
  */
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
 )
 
diff --git a/backup/queries_functions.go b/backup/queries_functions.go
index 7fad8a38..3b125089 100644
--- a/backup/queries_functions.go
+++ b/backup/queries_functions.go
@@ -11,8 +11,8 @@ import (
        "regexp"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
 )
diff --git a/backup/queries_functions_test.go b/backup/queries_functions_test.go
index 81730b3f..bde4b9dc 100644
--- a/backup/queries_functions_test.go
+++ b/backup/queries_functions_test.go
@@ -5,7 +5,7 @@ import (
        "database/sql/driver"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
        "github.com/greenplum-db/gpbackup/backup"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/backup/queries_globals.go b/backup/queries_globals.go
index 9be9d49d..092d7d27 100644
--- a/backup/queries_globals.go
+++ b/backup/queries_globals.go
@@ -8,8 +8,8 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
 )
diff --git a/backup/queries_incremental.go b/backup/queries_incremental.go
index 2ef45891..a1f0a8c4 100644
--- a/backup/queries_incremental.go
+++ b/backup/queries_incremental.go
@@ -3,8 +3,8 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
 )
 
diff --git a/backup/queries_operators.go b/backup/queries_operators.go
index 8b0e76bb..6e6d487e 100644
--- a/backup/queries_operators.go
+++ b/backup/queries_operators.go
@@ -8,8 +8,8 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
 )
diff --git a/backup/queries_postdata.go b/backup/queries_postdata.go
index c8abb890..11e99de1 100644
--- a/backup/queries_postdata.go
+++ b/backup/queries_postdata.go
@@ -10,8 +10,8 @@ import (
        "fmt"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
 )
diff --git a/backup/queries_postdata_test.go b/backup/queries_postdata_test.go
index 6b76236a..d3fcfa58 100644
--- a/backup/queries_postdata_test.go
+++ b/backup/queries_postdata_test.go
@@ -5,7 +5,7 @@ import (
        "database/sql/driver"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
        "github.com/greenplum-db/gpbackup/backup"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/backup/queries_relation_test.go b/backup/queries_relation_test.go
index 4640cd3d..93e8d2b1 100644
--- a/backup/queries_relation_test.go
+++ b/backup/queries_relation_test.go
@@ -6,7 +6,7 @@ import (
        "fmt"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
        "github.com/greenplum-db/gpbackup/backup"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/backup/queries_relations.go b/backup/queries_relations.go
index b7a1474e..74642d01 100644
--- a/backup/queries_relations.go
+++ b/backup/queries_relations.go
@@ -11,8 +11,8 @@ import (
        "strconv"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
diff --git a/backup/queries_shared.go b/backup/queries_shared.go
index 11d5fc6b..538ab061 100644
--- a/backup/queries_shared.go
+++ b/backup/queries_shared.go
@@ -10,8 +10,8 @@ import (
        "fmt"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
diff --git a/backup/queries_shared_test.go b/backup/queries_shared_test.go
index c376c38c..8ccadfce 100644
--- a/backup/queries_shared_test.go
+++ b/backup/queries_shared_test.go
@@ -5,7 +5,7 @@ import (
        "database/sql/driver"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
 
diff --git a/backup/queries_statistics.go b/backup/queries_statistics.go
index e4e0776b..854f68e0 100644
--- a/backup/queries_statistics.go
+++ b/backup/queries_statistics.go
@@ -8,8 +8,8 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/lib/pq"
 )
diff --git a/backup/queries_table_defs.go b/backup/queries_table_defs.go
index 6aa59493..6f5ad9a1 100644
--- a/backup/queries_table_defs.go
+++ b/backup/queries_table_defs.go
@@ -11,8 +11,8 @@ import (
        "strconv"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
 )
diff --git a/backup/queries_textsearch.go b/backup/queries_textsearch.go
index c86db823..8018cded 100644
--- a/backup/queries_textsearch.go
+++ b/backup/queries_textsearch.go
@@ -8,8 +8,8 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
 )
diff --git a/backup/queries_types.go b/backup/queries_types.go
index 23ad23df..cc6b663a 100644
--- a/backup/queries_types.go
+++ b/backup/queries_types.go
@@ -8,8 +8,8 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
 )
diff --git a/backup/snapshot.go b/backup/snapshot.go
index 49c05b71..145954f7 100644
--- a/backup/snapshot.go
+++ b/backup/snapshot.go
@@ -7,8 +7,8 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
 )
 
 const (
diff --git a/backup/validate.go b/backup/validate.go
index 47e41b54..a3bc2886 100644
--- a/backup/validate.go
+++ b/backup/validate.go
@@ -3,8 +3,8 @@ package backup
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
diff --git a/backup/validate_test.go b/backup/validate_test.go
index 0630e8a6..37d953ec 100644
--- a/backup/validate_test.go
+++ b/backup/validate_test.go
@@ -4,7 +4,7 @@ import (
        "strings"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/spf13/cobra"
diff --git a/backup/wrappers.go b/backup/wrappers.go
index fd0f39a7..4fc5e925 100644
--- a/backup/wrappers.go
+++ b/backup/wrappers.go
@@ -6,9 +6,9 @@ import (
        "path"
        "reflect"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/report"
diff --git a/end_to_end/end_to_end_suite_test.go 
b/end_to_end/end_to_end_suite_test.go
index 5e44c5a0..f027e203 100644
--- a/end_to_end/end_to_end_suite_test.go
+++ b/end_to_end/end_to_end_suite_test.go
@@ -18,13 +18,13 @@ import (
        "testing"
        "time"
 
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/blang/semver"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/end_to_end/filtered_test.go b/end_to_end/filtered_test.go
index f3aa7846..a8df4e86 100644
--- a/end_to_end/filtered_test.go
+++ b/end_to_end/filtered_test.go
@@ -3,8 +3,8 @@ package end_to_end_test
 import (
        "os"
 
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/utils"
        . "github.com/onsi/ginkgo/v2"
        . "github.com/onsi/gomega"
diff --git a/end_to_end/incremental_test.go b/end_to_end/incremental_test.go
index 0fb551c1..c6f1221b 100644
--- a/end_to_end/incremental_test.go
+++ b/end_to_end/incremental_test.go
@@ -6,9 +6,9 @@ import (
        "os/exec"
        "strconv"
 
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/blang/semver"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/history"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/end_to_end/locks_test.go b/end_to_end/locks_test.go
index a75ae34a..3a734d8d 100644
--- a/end_to_end/locks_test.go
+++ b/end_to_end/locks_test.go
@@ -5,7 +5,7 @@ import (
        "os/exec"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        . "github.com/onsi/ginkgo/v2"
diff --git a/end_to_end/plugin_test.go b/end_to_end/plugin_test.go
index 90d5077e..bec74024 100644
--- a/end_to_end/plugin_test.go
+++ b/end_to_end/plugin_test.go
@@ -6,10 +6,10 @@ import (
        "os/exec"
        path "path/filepath"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/utils"
diff --git a/end_to_end/signal_handler_test.go 
b/end_to_end/signal_handler_test.go
index fa7d84e2..e10c399e 100644
--- a/end_to_end/signal_handler_test.go
+++ b/end_to_end/signal_handler_test.go
@@ -5,7 +5,7 @@ import (
        "os/exec"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        . "github.com/onsi/ginkgo/v2"
        . "github.com/onsi/gomega"
        "golang.org/x/sys/unix"
diff --git a/end_to_end/special_characters_test.go 
b/end_to_end/special_characters_test.go
index 5b14e643..5b75df23 100644
--- a/end_to_end/special_characters_test.go
+++ b/end_to_end/special_characters_test.go
@@ -4,7 +4,7 @@ import (
        "fmt"
        "os/exec"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        . "github.com/onsi/ginkgo/v2"
        . "github.com/onsi/gomega"
 )
diff --git a/filepath/filepath.go b/filepath/filepath.go
index e2e096e0..818844ef 100644
--- a/filepath/filepath.go
+++ b/filepath/filepath.go
@@ -14,10 +14,10 @@ import (
        "strconv"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
 )
 
 type FilePathInfo struct {
diff --git a/filepath/filepath_test.go b/filepath/filepath_test.go
index 584835bf..83098de3 100644
--- a/filepath/filepath_test.go
+++ b/filepath/filepath_test.go
@@ -5,9 +5,9 @@ import (
        path "path/filepath"
        "testing"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/testhelper"
 
        . "github.com/greenplum-db/gpbackup/filepath"
        . "github.com/onsi/ginkgo/v2"
diff --git a/go.mod b/go.mod
index 3a07c3d8..d404fc70 100644
--- a/go.mod
+++ b/go.mod
@@ -4,9 +4,9 @@ go 1.21
 
 require (
        github.com/DATA-DOG/go-sqlmock v1.5.0
+       github.com/apache/cloudberry-go-libs 
v1.0.12-0.20250910014224-fc376e8a1056
        github.com/blang/semver v3.5.1+incompatible
        github.com/blang/vfs v1.0.0
-       github.com/cloudberrydb/gp-common-go-libs 
v1.0.12-0.20250725120259-928bc567da46
        github.com/jackc/pgconn v1.14.3
        github.com/jmoiron/sqlx v1.3.5
        github.com/klauspost/compress v1.15.15
diff --git a/go.sum b/go.sum
index f84c93dc..e7789e23 100644
--- a/go.sum
+++ b/go.sum
@@ -3,6 +3,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 
h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20O
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod 
h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Masterminds/semver/v3 v3.1.1 
h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod 
h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+github.com/apache/cloudberry-go-libs v1.0.12-0.20250910014224-fc376e8a1056 
h1:ycrFztmYATpidbSAU1rw60XuhuDxgBHtLD3Sueu947c=
+github.com/apache/cloudberry-go-libs 
v1.0.12-0.20250910014224-fc376e8a1056/go.mod 
h1:lfHWkNYsno/lV+Nee0OoCmlOlBz5yvT6EW8WQEOUI5c=
 github.com/blang/semver v3.5.1+incompatible 
h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod 
h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/vfs v1.0.0 h1:AUZUgulCDzbaNjTRWEP45X7m/J10brAptZpSRKRZBZc=
@@ -10,8 +12,6 @@ github.com/blang/vfs v1.0.0/go.mod 
h1:jjuNUc/IKcRNNWC9NUCvz4fR9PZLPIKxEygtPs/4tS
 github.com/chzyer/logex v1.1.10/go.mod 
h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod 
h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod 
h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cloudberrydb/gp-common-go-libs 
v1.0.12-0.20250725120259-928bc567da46 
h1:ufa7QvspWSLINrkZHJooGlmc/4ErLpuPKt9TmIZAO68=
-github.com/cloudberrydb/gp-common-go-libs 
v1.0.12-0.20250725120259-928bc567da46/go.mod 
h1:W9k5v2xUJLhDHJmYI/UktGdI0zNI71vPHZhAIot40Mw=
 github.com/cockroachdb/apd v1.1.0 
h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod 
h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod 
h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
diff --git a/helper/helper.go b/helper/helper.go
index 7475da63..f108c9ff 100644
--- a/helper/helper.go
+++ b/helper/helper.go
@@ -15,8 +15,8 @@ import (
 
        "golang.org/x/sys/unix"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/greenplum-db/gpbackup/utils"
 )
 
diff --git a/history/history.go b/history/history.go
index 2f7a3eb3..915066f9 100644
--- a/history/history.go
+++ b/history/history.go
@@ -7,8 +7,8 @@ import (
        "io/ioutil"
        "os"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/greenplum-db/gpbackup/utils"
        _ "github.com/mattn/go-sqlite3"
        "gopkg.in/yaml.v2"
diff --git a/history/history_test.go b/history/history_test.go
index a0b178fd..7cf95bc2 100644
--- a/history/history_test.go
+++ b/history/history_test.go
@@ -5,9 +5,9 @@ import (
        "testing"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/history"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/integration/agent_remote_test.go b/integration/agent_remote_test.go
index 72291fe5..cc045f27 100644
--- a/integration/agent_remote_test.go
+++ b/integration/agent_remote_test.go
@@ -3,7 +3,7 @@ package integration
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/cluster"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/utils"
 
diff --git a/integration/data_backup_test.go b/integration/data_backup_test.go
index e85a91c5..e9131d48 100644
--- a/integration/data_backup_test.go
+++ b/integration/data_backup_test.go
@@ -5,9 +5,9 @@ import (
        "os"
        "path"
 
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/blang/semver"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/dependency_queries_test.go 
b/integration/dependency_queries_test.go
index 624355dc..91744410 100644
--- a/integration/dependency_queries_test.go
+++ b/integration/dependency_queries_test.go
@@ -1,7 +1,7 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
 
diff --git a/integration/gpexpand_not_running_test.go 
b/integration/gpexpand_not_running_test.go
index 77809a40..78eb9525 100644
--- a/integration/gpexpand_not_running_test.go
+++ b/integration/gpexpand_not_running_test.go
@@ -5,9 +5,9 @@ import (
        "os"
        "path/filepath"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/restore"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/helper_test.go b/integration/helper_test.go
index 6c253a26..31a79299 100644
--- a/integration/helper_test.go
+++ b/integration/helper_test.go
@@ -13,7 +13,7 @@ import (
        "strings"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/klauspost/compress/zstd"
        "golang.org/x/sys/unix"
 
diff --git a/integration/incremental_queries_test.go 
b/integration/incremental_queries_test.go
index ba4a9ce0..3db4e9b2 100644
--- a/integration/incremental_queries_test.go
+++ b/integration/incremental_queries_test.go
@@ -3,7 +3,7 @@ package integration
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/inheritance_test.go b/integration/inheritance_test.go
index 1fc392c7..b7fd7815 100644
--- a/integration/inheritance_test.go
+++ b/integration/inheritance_test.go
@@ -3,8 +3,8 @@ package integration
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/testhelper"
 
        . "github.com/onsi/ginkgo/v2"
        . "github.com/onsi/gomega"
diff --git a/integration/integration_suite_test.go 
b/integration/integration_suite_test.go
index 583923c9..83180144 100644
--- a/integration/integration_suite_test.go
+++ b/integration/integration_suite_test.go
@@ -7,11 +7,11 @@ import (
        "os/exec"
        "testing"
 
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/blang/semver"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/restore"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/metadata_globals_create_test.go 
b/integration/metadata_globals_create_test.go
index f3bda727..ce490412 100644
--- a/integration/metadata_globals_create_test.go
+++ b/integration/metadata_globals_create_test.go
@@ -4,8 +4,8 @@ import (
        "fmt"
        "regexp"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/metadata_globals_queries_test.go 
b/integration/metadata_globals_queries_test.go
index db3e61ac..ff987eee 100644
--- a/integration/metadata_globals_queries_test.go
+++ b/integration/metadata_globals_queries_test.go
@@ -3,8 +3,8 @@ package integration
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
 
diff --git a/integration/options_integration_test.go 
b/integration/options_integration_test.go
index a8bb190b..7e7f13a3 100644
--- a/integration/options_integration_test.go
+++ b/integration/options_integration_test.go
@@ -4,7 +4,7 @@ import (
        "fmt"
        "sort"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
 
diff --git a/integration/parallel_queries_test.go 
b/integration/parallel_queries_test.go
index 3de84668..06847ad8 100644
--- a/integration/parallel_queries_test.go
+++ b/integration/parallel_queries_test.go
@@ -5,8 +5,8 @@ import (
        "regexp"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/restore"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/postdata_create_test.go 
b/integration/postdata_create_test.go
index 4ae980e7..9b3881f7 100644
--- a/integration/postdata_create_test.go
+++ b/integration/postdata_create_test.go
@@ -4,8 +4,8 @@ import (
        "database/sql"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/postdata_queries_test.go 
b/integration/postdata_queries_test.go
index 89a11716..203d9ade 100644
--- a/integration/postdata_queries_test.go
+++ b/integration/postdata_queries_test.go
@@ -4,8 +4,8 @@ import (
        "database/sql"
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_acl_create_test.go 
b/integration/predata_acl_create_test.go
index f119cd85..eccc984f 100644
--- a/integration/predata_acl_create_test.go
+++ b/integration/predata_acl_create_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_acl_queries_test.go 
b/integration/predata_acl_queries_test.go
index 525d3be5..83084ee3 100644
--- a/integration/predata_acl_queries_test.go
+++ b/integration/predata_acl_queries_test.go
@@ -3,8 +3,8 @@ package integration
 import (
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_externals_create_test.go 
b/integration/predata_externals_create_test.go
index 8165970e..80cd2c94 100644
--- a/integration/predata_externals_create_test.go
+++ b/integration/predata_externals_create_test.go
@@ -4,8 +4,8 @@ import (
        "database/sql"
        "os"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
 
diff --git a/integration/predata_externals_queries_test.go 
b/integration/predata_externals_queries_test.go
index ab7b67fc..7f71bd36 100644
--- a/integration/predata_externals_queries_test.go
+++ b/integration/predata_externals_queries_test.go
@@ -3,8 +3,8 @@ package integration
 import (
        "database/sql"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
 
diff --git a/integration/predata_functions_create_test.go 
b/integration/predata_functions_create_test.go
index a0614f29..a83eeb4e 100644
--- a/integration/predata_functions_create_test.go
+++ b/integration/predata_functions_create_test.go
@@ -4,8 +4,8 @@ import (
        "database/sql"
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_functions_queries_test.go 
b/integration/predata_functions_queries_test.go
index cf3cd3d2..ef4ea45f 100644
--- a/integration/predata_functions_queries_test.go
+++ b/integration/predata_functions_queries_test.go
@@ -4,8 +4,8 @@ import (
        "database/sql"
        "fmt"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_operators_create_test.go 
b/integration/predata_operators_create_test.go
index 682916bf..22eacd59 100644
--- a/integration/predata_operators_create_test.go
+++ b/integration/predata_operators_create_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_operators_queries_test.go 
b/integration/predata_operators_queries_test.go
index a746d04f..ff84f275 100644
--- a/integration/predata_operators_queries_test.go
+++ b/integration/predata_operators_queries_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_relations_create_test.go 
b/integration/predata_relations_create_test.go
index 7f36da97..46f99e7e 100644
--- a/integration/predata_relations_create_test.go
+++ b/integration/predata_relations_create_test.go
@@ -5,8 +5,8 @@ import (
        "fmt"
        "math"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_relations_queries_test.go 
b/integration/predata_relations_queries_test.go
index 84523829..4a22c6ad 100644
--- a/integration/predata_relations_queries_test.go
+++ b/integration/predata_relations_queries_test.go
@@ -6,9 +6,9 @@ import (
        "sort"
        "strconv"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_shared_create_test.go 
b/integration/predata_shared_create_test.go
index 31e71fa4..c0b405fa 100644
--- a/integration/predata_shared_create_test.go
+++ b/integration/predata_shared_create_test.go
@@ -3,8 +3,8 @@ package integration
 import (
        "database/sql"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_shared_queries_test.go 
b/integration/predata_shared_queries_test.go
index 9157bb56..a2444104 100644
--- a/integration/predata_shared_queries_test.go
+++ b/integration/predata_shared_queries_test.go
@@ -3,8 +3,8 @@ package integration
 import (
        "database/sql"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_table_defs_queries_test.go 
b/integration/predata_table_defs_queries_test.go
index b67f4919..63d08c49 100644
--- a/integration/predata_table_defs_queries_test.go
+++ b/integration/predata_table_defs_queries_test.go
@@ -5,8 +5,8 @@ import (
        "fmt"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_textsearch_create_test.go 
b/integration/predata_textsearch_create_test.go
index 8d23fcaa..97523b06 100644
--- a/integration/predata_textsearch_create_test.go
+++ b/integration/predata_textsearch_create_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_textsearch_queries_test.go 
b/integration/predata_textsearch_queries_test.go
index 6c8e19c9..5138a2cd 100644
--- a/integration/predata_textsearch_queries_test.go
+++ b/integration/predata_textsearch_queries_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
 
diff --git a/integration/predata_types_create_test.go 
b/integration/predata_types_create_test.go
index ab63b11e..65ac9352 100644
--- a/integration/predata_types_create_test.go
+++ b/integration/predata_types_create_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_types_queries_test.go 
b/integration/predata_types_queries_test.go
index ec5a3c51..d125d418 100644
--- a/integration/predata_types_queries_test.go
+++ b/integration/predata_types_queries_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/statistics_create_test.go 
b/integration/statistics_create_test.go
index 8cf03ae1..c7dc6c39 100644
--- a/integration/statistics_create_test.go
+++ b/integration/statistics_create_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
 
diff --git a/integration/statistics_queries_test.go 
b/integration/statistics_queries_test.go
index c55d0fbe..5ba7cc96 100644
--- a/integration/statistics_queries_test.go
+++ b/integration/statistics_queries_test.go
@@ -3,8 +3,8 @@ package integration
 import (
        "sort"
 
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/testutils"
 
diff --git a/integration/utils_test.go b/integration/utils_test.go
index ecef44ec..d1619c30 100644
--- a/integration/utils_test.go
+++ b/integration/utils_test.go
@@ -7,8 +7,8 @@ import (
        "path/filepath"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        fp "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/greenplum-db/gpbackup/utils"
diff --git a/integration/wrappers_test.go b/integration/wrappers_test.go
index 36f4b1ad..bb3205b1 100644
--- a/integration/wrappers_test.go
+++ b/integration/wrappers_test.go
@@ -1,8 +1,8 @@
 package integration
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/spf13/cobra"
diff --git a/options/flag.go b/options/flag.go
index cb757d0d..3618a259 100644
--- a/options/flag.go
+++ b/options/flag.go
@@ -8,7 +8,7 @@ import (
        "regexp"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/pkg/errors"
        "github.com/spf13/pflag"
 )
diff --git a/options/flag_test.go b/options/flag_test.go
index 45edde35..4e04e38a 100644
--- a/options/flag_test.go
+++ b/options/flag_test.go
@@ -3,7 +3,7 @@ package options_test
 import (
        "flag"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/spf13/pflag"
 
diff --git a/options/options.go b/options/options.go
index dc73ec47..ac29563f 100644
--- a/options/options.go
+++ b/options/options.go
@@ -5,9 +5,9 @@ import (
        "regexp"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/iohelper"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
        "github.com/spf13/pflag"
diff --git a/options/options_suite_test.go b/options/options_suite_test.go
index c09df76e..dd53020e 100644
--- a/options/options_suite_test.go
+++ b/options/options_suite_test.go
@@ -3,7 +3,7 @@ package options_test
 import (
        "testing"
 
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
 
        . "github.com/onsi/ginkgo/v2"
        . "github.com/onsi/gomega"
diff --git a/options/options_test.go b/options/options_test.go
index f55c6893..68ab6c33 100644
--- a/options/options_test.go
+++ b/options/options_test.go
@@ -5,8 +5,8 @@ import (
        "os"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/spf13/pflag"
 
diff --git a/report/report.go b/report/report.go
index 69273808..4c5edc9a 100644
--- a/report/report.go
+++ b/report/report.go
@@ -9,12 +9,12 @@ import (
        "strings"
        "time"
 
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/blang/semver"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
diff --git a/report/report_test.go b/report/report_test.go
index ca47d49f..99e6747d 100644
--- a/report/report_test.go
+++ b/report/report_test.go
@@ -9,13 +9,13 @@ import (
        "testing"
        "time"
 
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/blang/semver"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/history"
diff --git a/restore/data.go b/restore/data.go
index 2709af18..9e362b1a 100644
--- a/restore/data.go
+++ b/restore/data.go
@@ -9,9 +9,9 @@ import (
        "sync"
        "sync/atomic"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
diff --git a/restore/data_test.go b/restore/data_test.go
index ce340c65..e736b8e9 100644
--- a/restore/data_test.go
+++ b/restore/data_test.go
@@ -7,7 +7,7 @@ import (
        "strings"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/cluster"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
diff --git a/restore/global_variables.go b/restore/global_variables.go
index 613e6494..98b53ed1 100644
--- a/restore/global_variables.go
+++ b/restore/global_variables.go
@@ -3,8 +3,8 @@ package restore
 import (
        "sync"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
diff --git a/restore/parallel.go b/restore/parallel.go
index ac8ae7a1..4bcb17e1 100644
--- a/restore/parallel.go
+++ b/restore/parallel.go
@@ -10,7 +10,7 @@ import (
        "sync"
        "sync/atomic"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
diff --git a/restore/remote.go b/restore/remote.go
index a7bf0f11..42357f5e 100644
--- a/restore/remote.go
+++ b/restore/remote.go
@@ -6,9 +6,9 @@ import (
        "strconv"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/iohelper"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/pkg/errors"
 )
diff --git a/restore/remote_test.go b/restore/remote_test.go
index a4c63863..8912bfdd 100644
--- a/restore/remote_test.go
+++ b/restore/remote_test.go
@@ -3,9 +3,9 @@ package restore_test
 import (
        "os/user"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
diff --git a/restore/restore.go b/restore/restore.go
index 6fcb3abe..9d0d250a 100644
--- a/restore/restore.go
+++ b/restore/restore.go
@@ -10,9 +10,9 @@ import (
        "sync"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
diff --git a/restore/restore_internal_test.go b/restore/restore_internal_test.go
index 0acf4fc7..e6d35baf 100644
--- a/restore/restore_internal_test.go
+++ b/restore/restore_internal_test.go
@@ -1,7 +1,7 @@
 package restore
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/dbconn"
        "github.com/greenplum-db/gpbackup/toc"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/restore/restore_suite_test.go b/restore/restore_suite_test.go
index 3d1eadb3..992eb840 100644
--- a/restore/restore_suite_test.go
+++ b/restore/restore_suite_test.go
@@ -9,7 +9,7 @@ import (
        "testing"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/dbconn"
        "github.com/greenplum-db/gpbackup/restore"
        "github.com/greenplum-db/gpbackup/testutils"
        "github.com/spf13/pflag"
diff --git a/restore/validate.go b/restore/validate.go
index adb7021e..188ec77f 100644
--- a/restore/validate.go
+++ b/restore/validate.go
@@ -5,8 +5,8 @@ import (
        "strconv"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/toc"
        "github.com/greenplum-db/gpbackup/utils"
diff --git a/restore/validate_test.go b/restore/validate_test.go
index 015c5031..452de81d 100644
--- a/restore/validate_test.go
+++ b/restore/validate_test.go
@@ -4,7 +4,7 @@ import (
        "strings"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/restore"
diff --git a/restore/wrappers.go b/restore/wrappers.go
index b8f38f8d..bc764e66 100644
--- a/restore/wrappers.go
+++ b/restore/wrappers.go
@@ -5,10 +5,10 @@ import (
        path "path/filepath"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
diff --git a/restore/wrappers_test.go b/restore/wrappers_test.go
index 5911d1f8..384a6fe3 100644
--- a/restore/wrappers_test.go
+++ b/restore/wrappers_test.go
@@ -6,8 +6,8 @@ import (
        "path/filepath"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/history"
        "github.com/greenplum-db/gpbackup/options"
        "github.com/greenplum-db/gpbackup/restore"
diff --git a/testutils/functions.go b/testutils/functions.go
index 416f1114..a0387053 100644
--- a/testutils/functions.go
+++ b/testutils/functions.go
@@ -8,12 +8,12 @@ import (
        "strings"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/backup"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/restore"
diff --git a/toc/toc.go b/toc/toc.go
index 7ca8eece..b560ecd9 100644
--- a/toc/toc.go
+++ b/toc/toc.go
@@ -7,7 +7,7 @@ import (
        "regexp"
        "strings"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/greenplum-db/gpbackup/utils"
        "gopkg.in/yaml.v2"
 )
diff --git a/utils/agent_remote.go b/utils/agent_remote.go
index 80064408..66f63e4b 100644
--- a/utils/agent_remote.go
+++ b/utils/agent_remote.go
@@ -10,10 +10,10 @@ import (
        "sync"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/pkg/errors"
 )
diff --git a/utils/agent_remote_test.go b/utils/agent_remote_test.go
index 0001aae2..7b068464 100644
--- a/utils/agent_remote_test.go
+++ b/utils/agent_remote_test.go
@@ -5,10 +5,10 @@ import (
        "io"
        "os"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
diff --git a/utils/compression_test.go b/utils/compression_test.go
index 2238c4bb..09238bf0 100644
--- a/utils/compression_test.go
+++ b/utils/compression_test.go
@@ -3,10 +3,10 @@ package utils_test
 import (
        "os/user"
 
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/structmatcher"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/utils"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/utils/gpexpand_sensor.go b/utils/gpexpand_sensor.go
index 9f844418..f6bb5d21 100644
--- a/utils/gpexpand_sensor.go
+++ b/utils/gpexpand_sensor.go
@@ -5,9 +5,9 @@ import (
        "os"
        "path/filepath"
 
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "github.com/blang/vfs"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
        "github.com/pkg/errors"
 )
 
diff --git a/utils/gpexpand_sensor_test.go b/utils/gpexpand_sensor_test.go
index cc486f14..49093fd3 100644
--- a/utils/gpexpand_sensor_test.go
+++ b/utils/gpexpand_sensor_test.go
@@ -5,9 +5,9 @@ import (
        "regexp"
 
        "github.com/DATA-DOG/go-sqlmock"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/blang/vfs"
        "github.com/blang/vfs/memfs"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
 
diff --git a/utils/io.go b/utils/io.go
index 040c000c..0985d588 100644
--- a/utils/io.go
+++ b/utils/io.go
@@ -11,7 +11,7 @@ import (
        "io/ioutil"
        "os"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
 )
 
 /*
diff --git a/utils/io_test.go b/utils/io_test.go
index f0ded124..93b64f5a 100644
--- a/utils/io_test.go
+++ b/utils/io_test.go
@@ -4,8 +4,8 @@ import (
        "io/ioutil"
        "os"
 
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/utils"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/utils/plugin.go b/utils/plugin.go
index bf035abd..9d5ed6a8 100644
--- a/utils/plugin.go
+++ b/utils/plugin.go
@@ -9,11 +9,11 @@ import (
        "strings"
        "time"
 
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/blang/semver"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/pkg/errors"
        "gopkg.in/yaml.v2"
diff --git a/utils/plugin_test.go b/utils/plugin_test.go
index 832b8e36..624d4b77 100644
--- a/utils/plugin_test.go
+++ b/utils/plugin_test.go
@@ -9,11 +9,11 @@ import (
        "strconv"
        "strings"
 
+       "github.com/apache/cloudberry-go-libs/cluster"
+       "github.com/apache/cloudberry-go-libs/iohelper"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/blang/semver"
-       "github.com/cloudberrydb/gp-common-go-libs/cluster"
-       "github.com/cloudberrydb/gp-common-go-libs/iohelper"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/utils"
        "github.com/pkg/errors"
 
diff --git a/utils/progress_bar.go b/utils/progress_bar.go
index 02844437..6f96ee6f 100644
--- a/utils/progress_bar.go
+++ b/utils/progress_bar.go
@@ -8,7 +8,7 @@ import (
        "sync"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/gplog"
        "gopkg.in/cheggaaa/pb.v1"
 )
 
diff --git a/utils/progress_bar_test.go b/utils/progress_bar_test.go
index 581a5a37..f6733cc6 100644
--- a/utils/progress_bar_test.go
+++ b/utils/progress_bar_test.go
@@ -6,9 +6,9 @@ import (
        "os/user"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/utils"
        "gopkg.in/cheggaaa/pb.v1"
 
diff --git a/utils/util.go b/utils/util.go
index 9da47572..ad43554d 100644
--- a/utils/util.go
+++ b/utils/util.go
@@ -16,9 +16,9 @@ import (
        "strings"
        "time"
 
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
-       "github.com/cloudberrydb/gp-common-go-libs/gplog"
-       "github.com/cloudberrydb/gp-common-go-libs/operating"
+       "github.com/apache/cloudberry-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/gplog"
+       "github.com/apache/cloudberry-go-libs/operating"
        "github.com/greenplum-db/gpbackup/filepath"
        "github.com/pkg/errors"
        "golang.org/x/sys/unix"
diff --git a/utils/util_test.go b/utils/util_test.go
index 6303a64d..4de722af 100644
--- a/utils/util_test.go
+++ b/utils/util_test.go
@@ -1,7 +1,7 @@
 package utils_test
 
 import (
-       "github.com/cloudberrydb/gp-common-go-libs/testhelper"
+       "github.com/apache/cloudberry-go-libs/testhelper"
        "github.com/greenplum-db/gpbackup/utils"
 
        . "github.com/onsi/ginkgo/v2"
diff --git a/utils/utils_suite_test.go b/utils/utils_suite_test.go
index feb9011e..28d299ce 100644
--- a/utils/utils_suite_test.go
+++ b/utils/utils_suite_test.go
@@ -4,7 +4,7 @@ import (
        "testing"
 
        "github.com/DATA-DOG/go-sqlmock"
-       "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+       "github.com/apache/cloudberry-go-libs/dbconn"
        "github.com/greenplum-db/gpbackup/testutils"
 
        . "github.com/onsi/ginkgo/v2"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to