From 153a57a310a1df744f150a7c00e6ff4ca0bdfd3e Mon Sep 17 00:00:00 2001
From: Baohua Yang <baohyang@cn.ibm.com>
Date: Thu, 15 Dec 2016 18:32:38 +0800
Subject: [PATCH] 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>
---
 Makefile                                  | 2 +-
 {metadata => common/metadata}/metadata.go | 0
 core/container/util/dockerutil.go         | 2 +-
 core/container/util/dockerutil_test.go    | 2 +-
 peer/version/version.go                   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {metadata => common/metadata}/metadata.go (100%)

diff --git a/Makefile b/Makefile
index a17b053fea2..fec28f90a13 100644
--- 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 b/common/metadata/metadata.go
similarity index 100%
rename from metadata/metadata.go
rename to common/metadata/metadata.go
diff --git a/core/container/util/dockerutil.go b/core/container/util/dockerutil.go
index 9d113b2b918..6cd24129822 100644
--- 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
index 8d909d08cdf..059622fc0e6 100644
--- 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
index 4eaca78da4f..b62c3aa4a42 100755
--- 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"
 )