Merge pull request #309 from cbusbey/dep

using dep for dep mgmt

Author: cbusbey

.gitignore

@@ -5,3 +5,4 @@ vendor/*/
 _test/test
 _test/echo_server
 _test/tmp
+_vendor*

.travis.yml

@@ -21,7 +21,7 @@ matrix:
     - go: tip
 
 install:
-  - go get -u github.com/kardianos/govendor
-  - govendor sync
+  - go get -u github.com/golang/dep/cmd/dep
+  - dep ensure
 
 script: if [ -z "$FIX_TEST" ]; then make generate && make build && make; else make build_accept && make $FIX_TEST; fi

Gopkg.lock

@@ -0,0 +1,34 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/mattn/go-sqlite3"
+  version = "1.2.0"
+
+[[constraint]]
+  name = "github.com/shopspring/decimal"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"

Gopkg.toml

@@ -47,16 +47,16 @@ Next, using [Git](https://git-scm.com/), clone this repository into `$GOPATH/src
 
 ### Installing Dependencies
 
-QuickFIX/Go uses [govendor](https://github.com/kardianos/govendor) to manage the vendored dependencies. Install govendor with `go get`:
+QuickFIX/Go uses [dep](https://github.com/golang/dep) to manage the vendored dependencies. Install dep with `go get`:
 
 ```sh
-$ go get github.com/kardianos/govendor
+$ go get -u github.com/golang/dep/cmd/dep
 ```
 
-Run `govendor sync` to install the correct versioned dependencies into `vendor/, which Go 1.6+ automatically recognizes and loads.
+Run `dep ensure` to install the correct versioned dependencies into `vendor/`, which Go 1.6+ automatically recognizes and loads.
 
 ```sh
-$ $GOPATH/bin/govendor sync
+$ $GOPATH/bin/dep ensure
 ```
 
 **Note:** No vendored dependencies are included in the QuickFIX/Go source.
@@ -101,37 +101,34 @@ If you are developing QuickFIX/Go, there are a few tasks you might need to perfo
 
 #### Adding a dependency
 
-If you are adding a dependency, you will need update the govendor manifest in the same Pull Request as the code that depends on it. You should do this in a separate commit from your code, as this makes PR review easier and Git history simpler to read in the future.
+If you are adding a dependency, you will need to update the dep manifest in the same Pull Request as the code that depends on it. You should do this in a separate commit from your code, as this makes PR review easier and Git history simpler to read in the future.
 
 To add a dependency:
 
-Assuming your work is on a branch called `my-feature-branch`, the steps look like this:
-
-1. Add the new package to your GOPATH:
-
-    ```bash
-    go get github.com/quickfixgo/my-project
-    ```
-
-2.  Add the new package to your vendor/ directory:
-
-    ```bash
-    govendor add github.com/quickfixgo/my-project
-    ```
-
-3. Review the changes in git and commit them.
+1. Add the dependency using `dep`:
+```bash
+$ dep ensure -add github.com/foo/bar
+```
+2. Review the changes in git and commit them.
 
 #### Updating a dependency
 
-To update a dependency:
+To update a dependency to the latest version allowed by constraints in `Gopkg.toml`:
 
-1. Fetch the dependency:
+1. Run:
+```bash
+$ dep ensure -update github.com/foo/bar
+```
+2. Review the changes in git and commit them.
 
-    ```bash
-    govendor fetch github.com/quickfixgo/my-project
-    ```
+To change the allowed version/branch/revision of a dependency:
 
-2. Review the changes in git and commit them.
+1. Manually edit `Gopkg.toml`
+2. Run:
+```bash
+$ dep ensure
+```
+3. Review the changes in git and commit them.
 
 Licensing
 ---------