Merge pull request #145 from wongoo/fix-packages

fix hessian2 package after transferring to apache
apache · Jul 31, 2019 · 887a3f6 · 887a3f6
2 parents 414bb0c + e665b55
commit 887a3f6
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 19 deletions.
diff --git a/examples/dubbo/go-client/app/client.go b/examples/dubbo/go-client/app/client.go
@@ -27,7 +27,7 @@ import (
 )
 
 import (
-	"github.com/dubbogo/hessian2"
+	"github.com/apache/dubbo-go-hessian2"
 )
 
 import (

diff --git a/examples/dubbo/go-client/app/user.go b/examples/dubbo/go-client/app/user.go
@@ -25,7 +25,7 @@ import (
 )
 
 import (
-	hessian "github.com/dubbogo/hessian2"
+	hessian "github.com/apache/dubbo-go-hessian2"
 )
 
 import (

diff --git a/examples/dubbo/go-server/app/server.go b/examples/dubbo/go-server/app/server.go
@@ -26,7 +26,7 @@ import (
 )
 
 import (
-	hessian "github.com/dubbogo/hessian2"
+	hessian "github.com/apache/dubbo-go-hessian2"
 )
 
 import (

diff --git a/examples/dubbo/go-server/app/user.go b/examples/dubbo/go-server/app/user.go
@@ -25,8 +25,8 @@ import (
 )
 
 import (
-	"github.com/dubbogo/hessian2"
-	"github.com/dubbogo/hessian2/java_exception"
+	"github.com/apache/dubbo-go-hessian2"
+	"github.com/apache/dubbo-go-hessian2/java_exception"
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/examples/dubbo/with-configcenter-go-client/app/client.go b/examples/dubbo/with-configcenter-go-client/app/client.go
@@ -27,7 +27,7 @@ import (
 )
 
 import (
-	"github.com/dubbogo/hessian2"
+	"github.com/apache/dubbo-go-hessian2"
 )
 
 import (

diff --git a/examples/dubbo/with-configcenter-go-client/app/user.go b/examples/dubbo/with-configcenter-go-client/app/user.go
@@ -25,7 +25,7 @@ import (
 )
 
 import (
-	hessian "github.com/dubbogo/hessian2"
+	hessian "github.com/apache/dubbo-go-hessian2"
 )
 
 import (

diff --git a/examples/dubbo/with-configcenter-go-server/app/server.go b/examples/dubbo/with-configcenter-go-server/app/server.go
@@ -26,7 +26,7 @@ import (
 )
 
 import (
-	hessian "github.com/dubbogo/hessian2"
+	hessian "github.com/apache/dubbo-go-hessian2"
 )
 
 import (

diff --git a/examples/dubbo/with-configcenter-go-server/app/user.go b/examples/dubbo/with-configcenter-go-server/app/user.go
@@ -29,9 +29,9 @@ import (
 )
 
 import (
+	hessian "github.com/apache/dubbo-go-hessian2"
+	"github.com/apache/dubbo-go-hessian2/java_exception"
 	"github.com/apache/dubbo-go/config"
-	hessian "github.com/dubbogo/hessian2"
-	"github.com/dubbogo/hessian2/java_exception"
 )
 
 type Gender hessian.JavaEnum

diff --git a/go.mod b/go.mod
@@ -1,9 +1,9 @@
 module github.com/apache/dubbo-go
 
 require (
+	github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190731020727-1697039810c8
 	github.com/dubbogo/getty v1.2.0
 	github.com/dubbogo/gost v1.1.1
-	github.com/dubbogo/hessian2 v1.2.0
 	github.com/magiconair/properties v1.8.1
 	github.com/pkg/errors v0.8.1
 	github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec

diff --git a/go.sum b/go.sum
@@ -1,3 +1,6 @@
+github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190731020727-1697039810c8 h1:7zJlM+8bpCAUhv03TZnXkT4MLlLWng1s7An8CLuN73E=
+github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190731020727-1697039810c8/go.mod h1:LWnndnrFXZmJLAzoyNAPNHSIJ1KOHVkTSsHgC3YYWlo=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -6,8 +9,6 @@ github.com/dubbogo/getty v1.2.0/go.mod h1:p9Pyk18a+5Aa0GZ546aCzlehEfvEof0jAF0+QQ
 github.com/dubbogo/gost v1.0.1-0.20190706005735-65c3ecbba418/go.mod h1:R7wZm1DrmrKGr50mBZVcg6C9ekG8aL5hP+sgWcIDwQg=
 github.com/dubbogo/gost v1.1.1 h1:JCM7vx5edPIjDA5ovJTuzEEXuw2t7xLyrlgi2mi5jHI=
 github.com/dubbogo/gost v1.1.1/go.mod h1:R7wZm1DrmrKGr50mBZVcg6C9ekG8aL5hP+sgWcIDwQg=
-github.com/dubbogo/hessian2 v1.2.0 h1:5wFYuMzzRhneUAPbVBVKubIknrEjUM/B76vievYD0Vw=
-github.com/dubbogo/hessian2 v1.2.0/go.mod h1:7EohF3mE7xmZcj43nP172sapRHOEifcV/jwyHhG4SaY=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=

diff --git a/protocol/dubbo/client.go b/protocol/dubbo/client.go
@@ -24,8 +24,8 @@ import (
 )
 
 import (
+	"github.com/apache/dubbo-go-hessian2"
 	"github.com/dubbogo/getty"
-	"github.com/dubbogo/hessian2"
 	perrors "github.com/pkg/errors"
 	"go.uber.org/atomic"
 	"gopkg.in/yaml.v2"

diff --git a/protocol/dubbo/client_test.go b/protocol/dubbo/client_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 import (
-	"github.com/dubbogo/hessian2"
+	"github.com/apache/dubbo-go-hessian2"
 	perrors "github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/protocol/dubbo/codec.go b/protocol/dubbo/codec.go
@@ -25,7 +25,7 @@ import (
 )
 
 import (
-	"github.com/dubbogo/hessian2"
+	"github.com/apache/dubbo-go-hessian2"
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/protocol/dubbo/codec_test.go b/protocol/dubbo/codec_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	hessian "github.com/dubbogo/hessian2"
+	hessian "github.com/apache/dubbo-go-hessian2"
 )
 
 func TestDubboPackage_MarshalAndUnmarshal(t *testing.T) {

diff --git a/protocol/dubbo/listener.go b/protocol/dubbo/listener.go
@@ -27,8 +27,8 @@ import (
 )
 
 import (
+	"github.com/apache/dubbo-go-hessian2"
 	"github.com/dubbogo/getty"
-	"github.com/dubbogo/hessian2"
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/protocol/dubbo/readwriter.go b/protocol/dubbo/readwriter.go
@@ -23,8 +23,8 @@ import (
 )
 
 import (
+	hessian "github.com/apache/dubbo-go-hessian2"
 	"github.com/dubbogo/getty"
-	hessian "github.com/dubbogo/hessian2"
 	perrors "github.com/pkg/errors"
 )
 import (