Migrate metadata pkg into common pkg

It should be a simple common pkg, as only be used in few places. Change-Id: If5b03f2ae46bd52b4cad6cb92513bcbd5682e319 Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
hyperledger · Dec 19, 2016 · 153a57a · 153a57a
1 parent 0eadb03
commit 153a57a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -47,7 +47,7 @@ PROJECT_VERSION=$(BASE_VERSION)
 endif
 
 PKGNAME = github.com/$(PROJECT_NAME)
-GO_LDFLAGS = -X $(PKGNAME)/metadata.Version=$(PROJECT_VERSION)
+GO_LDFLAGS = -X $(PKGNAME)/common/metadata.Version=$(PROJECT_VERSION)
 CGO_FLAGS = CGO_CFLAGS=" "
 ARCH=$(shell uname -m)
 CHAINTOOL_RELEASE=v0.10.0

diff --git a/metadata/metadata.go → common/metadata/metadata.go b/metadata/metadata.go → common/metadata/metadata.go
diff --git a/core/container/util/dockerutil.go b/core/container/util/dockerutil.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/fsouza/go-dockerclient"
-	"github.com/hyperledger/fabric/metadata"
+	"github.com/hyperledger/fabric/common/metadata"
 	"github.com/spf13/viper"
 )
 

diff --git a/core/container/util/dockerutil_test.go b/core/container/util/dockerutil_test.go
@@ -19,7 +19,7 @@ package util
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/metadata"
+	"github.com/hyperledger/fabric/common/metadata"
 )
 
 func TestUtil_DockerfileTemplateParser(t *testing.T) {

diff --git a/peer/version/version.go b/peer/version/version.go
@@ -19,7 +19,7 @@ package version
 import (
 	"fmt"
 
-	"github.com/hyperledger/fabric/metadata"
+	"github.com/hyperledger/fabric/common/metadata"
 	"github.com/spf13/cobra"
 )