Skip to content

Commit 66e7777

Browse files
OxidanerCode-Fight
andauthored
fix: modified version to v2 (#1041)
* fix: modified version * fix: modified version * feat: remove coverage * fix: change integrate_test.sh * chore: 空提交,重新推送分支触发CI/CD --------- Co-authored-by: FengZhang <zfcode@qq.com>
1 parent 3ba877c commit 66e7777

File tree

347 files changed

+976
-976
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

347 files changed

+976
-976
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
# Output of the go coverage tool, specifically when used with LiteIDE
3232
*.out
33+
coverage
3334

3435
# build products
3536
dist/

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module seata.apache.org/seata-go
1+
module seata.apache.org/seata-go/v2
22

33
go 1.20
44

@@ -42,6 +42,7 @@ require (
4242
)
4343

4444
require (
45+
github.com/golang/snappy v0.0.4
4546
github.com/knadh/koanf v1.5.0
4647
github.com/robertkrimen/otto v0.4.0
4748
)
@@ -66,7 +67,6 @@ require (
6667
github.com/go-playground/locales v0.14.1 // indirect
6768
github.com/go-playground/universal-translator v0.18.1 // indirect
6869
github.com/gogo/protobuf v1.3.2 // indirect
69-
github.com/golang/snappy v0.0.4 // indirect
7070
github.com/gorilla/websocket v1.4.2 // indirect
7171
github.com/jinzhu/copier v0.3.5 // indirect
7272
github.com/json-iterator/go v1.1.12 // indirect

goimports.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# format go imports style
1919
go install golang.org/x/tools/cmd/goimports
20-
goimports -local seata.apache.org/seata-go -w .
20+
goimports -local seata.apache.org/seata-go/v2 -w .
2121

2222
# format licence style
2323
go install github.com/apache/skywalking-eyes/cmd/license-eye@latest

integrate_test.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ echo "github pull request head branch -> ${GITHUB_HEAD_REF}"
3838
echo "use seata-go-samples $3 branch for integration testing"
3939
git clone https://github.com/apache/incubator-seata-go-samples samples && cd samples
4040

41-
# update seata-go to current commit id
42-
43-
go mod edit -replace=seata.apache.org/seata-go="${ROOT_DIR}"
41+
# update seata-go to current dir
42+
go mod edit -replace=seata.apache.org/seata-go/v2="${ROOT_DIR}"
4443

4544
go mod tidy
4645

pkg/client/client.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ package client
2020
import (
2121
"sync"
2222

23-
"seata.apache.org/seata-go/pkg/datasource"
24-
at "seata.apache.org/seata-go/pkg/datasource/sql"
25-
"seata.apache.org/seata-go/pkg/datasource/sql/exec/config"
26-
"seata.apache.org/seata-go/pkg/discovery"
27-
"seata.apache.org/seata-go/pkg/integration"
28-
remoteConfig "seata.apache.org/seata-go/pkg/remoting/config"
29-
"seata.apache.org/seata-go/pkg/remoting/getty"
30-
"seata.apache.org/seata-go/pkg/remoting/processor/client"
31-
"seata.apache.org/seata-go/pkg/rm"
32-
"seata.apache.org/seata-go/pkg/rm/tcc"
33-
saga "seata.apache.org/seata-go/pkg/saga/rm"
34-
"seata.apache.org/seata-go/pkg/tm"
35-
"seata.apache.org/seata-go/pkg/util/log"
23+
"seata.apache.org/seata-go/v2/pkg/datasource"
24+
at "seata.apache.org/seata-go/v2/pkg/datasource/sql"
25+
"seata.apache.org/seata-go/v2/pkg/datasource/sql/exec/config"
26+
"seata.apache.org/seata-go/v2/pkg/discovery"
27+
"seata.apache.org/seata-go/v2/pkg/integration"
28+
remoteConfig "seata.apache.org/seata-go/v2/pkg/remoting/config"
29+
"seata.apache.org/seata-go/v2/pkg/remoting/getty"
30+
"seata.apache.org/seata-go/v2/pkg/remoting/processor/client"
31+
"seata.apache.org/seata-go/v2/pkg/rm"
32+
"seata.apache.org/seata-go/v2/pkg/rm/tcc"
33+
saga "seata.apache.org/seata-go/v2/pkg/saga/rm"
34+
"seata.apache.org/seata-go/v2/pkg/tm"
35+
"seata.apache.org/seata-go/v2/pkg/util/log"
3636
)
3737

3838
// Init seata client client

pkg/client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/stretchr/testify/assert"
2525

26-
"seata.apache.org/seata-go/pkg/tm"
26+
"seata.apache.org/seata-go/v2/pkg/tm"
2727
)
2828

2929
func TestInit(t *testing.T) {

pkg/client/config.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ import (
2626
"runtime"
2727
"strings"
2828

29-
"seata.apache.org/seata-go/pkg/saga"
29+
"seata.apache.org/seata-go/v2/pkg/saga"
3030

3131
"github.com/knadh/koanf"
3232
"github.com/knadh/koanf/parsers/json"
3333
"github.com/knadh/koanf/parsers/toml"
3434
"github.com/knadh/koanf/parsers/yaml"
3535
"github.com/knadh/koanf/providers/rawbytes"
3636

37-
"seata.apache.org/seata-go/pkg/discovery"
37+
"seata.apache.org/seata-go/v2/pkg/discovery"
3838

39-
"seata.apache.org/seata-go/pkg/datasource/sql"
40-
"seata.apache.org/seata-go/pkg/datasource/sql/undo"
41-
remoteConfig "seata.apache.org/seata-go/pkg/remoting/config"
42-
"seata.apache.org/seata-go/pkg/rm"
43-
"seata.apache.org/seata-go/pkg/rm/tcc"
44-
"seata.apache.org/seata-go/pkg/tm"
45-
"seata.apache.org/seata-go/pkg/util/flagext"
39+
"seata.apache.org/seata-go/v2/pkg/datasource/sql"
40+
"seata.apache.org/seata-go/v2/pkg/datasource/sql/undo"
41+
remoteConfig "seata.apache.org/seata-go/v2/pkg/remoting/config"
42+
"seata.apache.org/seata-go/v2/pkg/rm"
43+
"seata.apache.org/seata-go/v2/pkg/rm/tcc"
44+
"seata.apache.org/seata-go/v2/pkg/tm"
45+
"seata.apache.org/seata-go/v2/pkg/util/flagext"
4646
)
4747

4848
const (

pkg/compressor/deflate_compress.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"compress/flate"
2323
"io"
2424

25-
"seata.apache.org/seata-go/pkg/util/log"
25+
"seata.apache.org/seata-go/v2/pkg/util/log"
2626
)
2727

2828
type DeflateCompress struct{}

pkg/datasource/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package datasource
1919

2020
import (
21-
"seata.apache.org/seata-go/pkg/datasource/sql"
21+
"seata.apache.org/seata-go/v2/pkg/datasource/sql"
2222
)
2323

2424
func Init() {

pkg/datasource/sql/async_worker.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ import (
2222
"flag"
2323
"time"
2424

25-
"seata.apache.org/seata-go/pkg/rm"
25+
"seata.apache.org/seata-go/v2/pkg/rm"
2626

2727
"github.com/prometheus/client_golang/prometheus"
2828
"github.com/prometheus/client_golang/prometheus/promauto"
2929

30-
"seata.apache.org/seata-go/pkg/datasource/sql/datasource"
31-
"seata.apache.org/seata-go/pkg/datasource/sql/undo"
32-
"seata.apache.org/seata-go/pkg/protocol/branch"
33-
"seata.apache.org/seata-go/pkg/util/fanout"
34-
"seata.apache.org/seata-go/pkg/util/log"
30+
"seata.apache.org/seata-go/v2/pkg/datasource/sql/datasource"
31+
"seata.apache.org/seata-go/v2/pkg/datasource/sql/undo"
32+
"seata.apache.org/seata-go/v2/pkg/protocol/branch"
33+
"seata.apache.org/seata-go/v2/pkg/util/fanout"
34+
"seata.apache.org/seata-go/v2/pkg/util/log"
3535
)
3636

3737
type phaseTwoContext struct {

0 commit comments

Comments
 (0)