You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ma...@apache.org on 2019/10/15 01:28:03 UTC

[servicecomb-kie] branch master updated: upgrade go chassis

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

mabin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-kie.git


The following commit(s) were added to refs/heads/master by this push:
     new 38d9030  upgrade go chassis
     new 52d8ab7  Merge pull request #39 from tianxiaoliang/master
38d9030 is described below

commit 38d9030d06bc1ec5a858cbfec0adad3b599fd03f
Author: tian <xi...@gmail.com>
AuthorDate: Mon Oct 14 20:06:58 2019 +0800

    upgrade go chassis
---
 go.mod                  | 11 +++--------
 server/config/config.go |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/go.mod b/go.mod
index 3ad8c09..fb3220e 100644
--- a/go.mod
+++ b/go.mod
@@ -3,19 +3,14 @@ module github.com/apache/servicecomb-kie
 require (
 	github.com/emicklei/go-restful v2.8.0+incompatible
 	github.com/go-chassis/foundation v0.0.0-20190621030543-c3b63f787f4c
-	github.com/go-chassis/go-archaius v0.20.0
-	github.com/go-chassis/go-chassis v1.7.1-0.20190903133217-e4a22c998fe1
+	github.com/go-chassis/go-archaius v0.23.0
+	github.com/go-chassis/go-chassis v1.7.2
 	github.com/go-chassis/paas-lager v1.0.2-0.20190328010332-cf506050ddb2
-	github.com/go-mesh/openlogging v1.0.1-0.20181205082104-3d418c478b2d
-	github.com/golang/snappy v0.0.1 // indirect
-	github.com/google/go-cmp v0.3.0 // indirect
+	github.com/go-mesh/openlogging v1.0.1
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
 	github.com/stretchr/testify v1.3.0
-	github.com/tidwall/pretty v1.0.0 // indirect
 	github.com/urfave/cli v1.20.0
-	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
-	github.com/xdg/stringprep v1.0.0 // indirect
 	go.mongodb.org/mongo-driver v1.0.3
 	gopkg.in/yaml.v2 v2.2.1
 )
diff --git a/server/config/config.go b/server/config/config.go
index 1e85097..de573d0 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -19,7 +19,7 @@ package config
 
 import (
 	"github.com/go-chassis/go-archaius"
-	"github.com/go-chassis/go-archaius/sources/utils"
+	"github.com/go-chassis/go-archaius/source/util"
 	"gopkg.in/yaml.v2"
 	"path/filepath"
 )
@@ -29,7 +29,7 @@ var Configurations *Config
 
 //Init initiate config files
 func Init(file string) error {
-	if err := archaius.AddFile(file, archaius.WithFileHandler(utils.UseFileNameAsKeyContentAsValue)); err != nil {
+	if err := archaius.AddFile(file, archaius.WithFileHandler(util.UseFileNameAsKeyContentAsValue)); err != nil {
 		return err
 	}
 	_, filename := filepath.Split(file)