Migrate metadata pkg into common pkg

yeasy · yeasy · commit 153a57a310a1 · 2016-12-19T10:05:39.000+08:00
It should be a simple common pkg, as only be used in few places.

Change-Id: If5b03f2ae46bd52b4cad6cb92513bcbd5682e319
Signed-off-by: Baohua Yang &lt;baohyang@cn.ibm.com&gt;
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/common/metadata/metadata.go b/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"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"strings"`
`22`	`22`
`23`	`23`	`"github.com/fsouza/go-dockerclient"`
`24`		`- "github.com/hyperledger/fabric/metadata"`
	`24`	`+ "github.com/hyperledger/fabric/common/metadata"`
`25`	`25`	`"github.com/spf13/viper"`
`26`	`26`	`)`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package util`
`19`	`19`	`import (`
`20`	`20`	`"testing"`
`21`	`21`
`22`		`- "github.com/hyperledger/fabric/metadata"`
	`22`	`+ "github.com/hyperledger/fabric/common/metadata"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func TestUtil_DockerfileTemplateParser(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package version`
`19`	`19`	`import (`
`20`	`20`	`"fmt"`
`21`	`21`
`22`		`- "github.com/hyperledger/fabric/metadata"`
	`22`	`+ "github.com/hyperledger/fabric/common/metadata"`
`23`	`23`	`"github.com/spf13/cobra"`
`24`	`24`	`)`
`25`	`25`