[FAB-8352] Go 1.10 compatibility

This change updates the dependencies to Go 1.10 compatible versions. Certificate transparency and pkcs11 dependencies are updated to the latest as they needed a fix for Go 1.10. The default LD flag (-s) is also removed as this was a fix for a previous version. Change-Id: I7a67f069628bef7aa98fa0adf8e9321e7efef0c6 Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Feb 19, 2018 · 396f43e · 396f43e
1 parent 1f2274d
commit 396f43e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ FABRIC_DEVSTABLE_VERSION_MINOR  := 1.1
 FABRIC_DEVSTABLE_VERSION_MAJOR  := 1
 
 # Build flags (overridable)
-GO_LDFLAGS                 ?= -s
+GO_LDFLAGS                 ?=
 GO_TESTFLAGS               ?=
 FABRIC_SDK_EXPERIMENTAL    ?= true
 FABRIC_SDK_EXTRA_GO_TAGS   ?=

diff --git a/test/scripts/check_lint.sh b/test/scripts/check_lint.sh
@@ -47,7 +47,6 @@ do
       exit 1
    fi
 
-   OUTPUT="$($GOIMPORTS_CMD -w -srcdir $PROJECT_PATH -l $i)"
    OUTPUT="$($GOIMPORTS_CMD -srcdir $PROJECT_PATH -l $i)"
 
    if [[ $OUTPUT ]]; then
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,6 @@ do @@
           exit 1
        fi
-       OUTPUT="$($GOIMPORTS_CMD -w -srcdir $PROJECT_PATH -l $i)"
        OUTPUT="$($GOIMPORTS_CMD -srcdir $PROJECT_PATH -l $i)"
        if [[ $OUTPUT ]]; then
@@ Expand Down @@