diff options
Diffstat (limited to 'pkgs/applications/networking/cluster/jx/gomod.patch')
| -rw-r--r-- | pkgs/applications/networking/cluster/jx/gomod.patch | 186 |
1 files changed, 186 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/jx/gomod.patch b/pkgs/applications/networking/cluster/jx/gomod.patch new file mode 100644 index 000000000000..0116d45955dc --- /dev/null +++ b/pkgs/applications/networking/cluster/jx/gomod.patch @@ -0,0 +1,186 @@ +diff --git a/go.mod b/go.mod +index cd54a606e..a78b23286 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,5 +1,7 @@ + module github.com/jenkins-x/jx + ++go 1.14 ++ + require ( + code.gitea.io/sdk v0.0.0-20180702024448-79a281c4e34a + github.com/Azure/draft v0.15.0 +@@ -7,7 +9,6 @@ require ( + github.com/IBM-Cloud/bluemix-go v0.0.0-20181008063305-d718d474c7c2 + github.com/Jeffail/gabs v1.1.1 + github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e +- github.com/Masterminds/semver v1.4.2 // indirect + github.com/Netflix/go-expect v0.0.0-20180814212900-124a37274874 + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect + github.com/Pallinder/go-randomdata v0.0.0-20180616180521-15df0648130a +@@ -20,7 +21,7 @@ require ( + github.com/andygrunwald/go-gerrit v0.0.0-20181026193842-43cfd7a94eb4 + github.com/andygrunwald/go-jira v1.5.0 + github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect +- github.com/antham/chyle v1.4.0 ++ github.com/antham/chyle v1.9.0 + github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect + github.com/armon/go-radix v1.0.0 // indirect + github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect +@@ -36,21 +37,18 @@ require ( + github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f + github.com/codeship/codeship-go v0.0.0-20180717142545-7793ca823354 + github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect +- github.com/cpuguy83/go-md2man v1.0.8 // indirect + github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect + github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c + github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect + github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45 // indirect + github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect + github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect +- github.com/emicklei/go-restful v2.8.0+incompatible +- github.com/emirpasic/gods v1.9.0 // indirect +- github.com/fatih/color v1.7.0 ++ github.com/emicklei/go-restful v2.8.0+incompatible // indirect ++ github.com/fatih/color v1.9.0 + github.com/fatih/structs v1.0.0 + github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect + github.com/gfleury/go-bitbucket-v1 v0.0.0-20190216152406-3a732135aa4d + github.com/ghodss/yaml v1.0.0 +- github.com/gliderlabs/ssh v0.1.1 // indirect + github.com/go-ldap/ldap v3.0.1+incompatible // indirect + github.com/go-ole/go-ole v1.2.1 // indirect + github.com/go-openapi/jsonreference v0.17.0 +@@ -59,9 +57,9 @@ require ( + github.com/gobwas/glob v0.2.3 // indirect + github.com/gocql/gocql v0.0.0-20190126123547-8516aabb0f99 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b +- github.com/golang/protobuf v1.2.0 ++ github.com/golang/protobuf v1.3.1 + github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect +- github.com/google/go-cmp v0.2.0 ++ github.com/google/go-cmp v0.3.0 + github.com/google/go-containerregistry v0.0.0-20190317040536-ebbba8469d06 // indirect + github.com/google/go-github v17.0.0+incompatible + github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect +@@ -79,15 +77,15 @@ require ( + github.com/hashicorp/go-sockaddr v1.0.0 // indirect + github.com/hashicorp/go-uuid v1.0.1 // indirect + github.com/hashicorp/go-version v0.0.0-20180716215031-270f2f71b1ee +- github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce ++ github.com/hashicorp/hcl v1.0.0 + github.com/hashicorp/vault v0.11.4 + github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20190115203747-edbfe287c5d9 // indirect +- github.com/heptio/sonobuoy v0.12.0 ++ github.com/heptio/sonobuoy v0.18.1 + github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c + github.com/hpcloud/tail v1.0.0 + github.com/iancoleman/orderedmap v0.0.0-20181121102841-22c6ecc9fe13 + github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 // indirect +- github.com/imdario/mergo v0.3.6 ++ github.com/imdario/mergo v0.3.8 + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jbrukh/bayesian v0.0.0-20161210175230-bf3f261f9a9c // indirect + github.com/jefferai/jsonx v1.0.0 // indirect +@@ -95,14 +93,12 @@ require ( + github.com/jenkins-x/golang-jenkins v0.0.0-20180919102630-65b83ad42314 + github.com/jetstack/cert-manager v0.5.2 + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect +- github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55 // indirect + github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a // indirect + github.com/knative/build v0.5.0 + github.com/knative/build-pipeline v0.1.0 // indirect + github.com/knative/pkg v0.0.0-20190402181056-ff46edef0ae5 + github.com/knative/serving v0.5.0 + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect +- github.com/kr/pty v1.1.2 // indirect + github.com/kubernetes/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect + github.com/kubernetes/kube-openapi v0.0.0-20190320154901-5e45bb682580 // indirect + github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect +@@ -114,9 +110,8 @@ require ( + github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect + github.com/mholt/archiver v3.1.1+incompatible + github.com/mitchellh/copystructure v1.0.0 // indirect +- github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 // indirect + github.com/mitchellh/go-testing-interface v1.0.0 // indirect +- github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 ++ github.com/mitchellh/mapstructure v1.1.2 + github.com/nlopes/slack v0.0.0-20180721202243-347a74b1ea30 + github.com/nwaples/rardecode v1.0.0 // indirect + github.com/onsi/ginkgo v1.6.0 +@@ -130,55 +125,48 @@ require ( + github.com/petergtz/pegomock v2.2.0+incompatible + github.com/pierrec/lz4 v2.0.5+incompatible // indirect + github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15 +- github.com/pkg/errors v0.8.0 +- github.com/prometheus/common v0.2.0 // indirect ++ github.com/pkg/errors v0.8.1 + github.com/rodaine/hclencoder v0.0.0-20180926060551-0680c4321930 +- github.com/russross/blackfriday v1.5.1 +- github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 ++ github.com/russross/blackfriday v1.5.2 ++ github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 // indirect + github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5 + github.com/sergi/go-diff v1.0.0 // indirect + github.com/sethvargo/go-password v0.1.2 + github.com/shirou/gopsutil v0.0.0-20180901134234-eb1f1ab16f2e + github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect +- github.com/sirupsen/logrus v1.4.1 +- github.com/spf13/cobra v0.0.3 +- github.com/spf13/pflag v1.0.3 +- github.com/src-d/gcfg v1.3.0 // indirect ++ github.com/sirupsen/logrus v1.4.2 ++ github.com/spf13/cobra v0.0.7 ++ github.com/spf13/pflag v1.0.5 + github.com/stoewer/go-strcase v1.0.1 + github.com/stretchr/objx v0.2.0 // indirect +- github.com/stretchr/testify v1.3.0 ++ github.com/stretchr/testify v1.4.0 + github.com/tektoncd/pipeline v0.0.0-20190327171839-7c43fbae2816 + github.com/trivago/tgo v1.0.1 // indirect + github.com/ulikunitz/xz v0.5.6 // indirect + github.com/wbrefvem/go-bitbucket v0.0.0-20190128183802-fc08fd046abb + github.com/xanzy/go-gitlab v0.0.0-20180814191223-f3bc634ab936 +- github.com/xanzy/ssh-agent v0.2.0 // indirect + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + gocloud.dev v0.9.0 + golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c // indirect +- golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect + golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 // indirect +- golang.org/x/net v0.0.0-20181201002055-351d144fa1fc // indirect + golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 +- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 +- golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 ++ golang.org/x/sync v0.0.0-20190423024810-112230192c58 ++ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e + google.golang.org/api v0.1.0 // indirect + google.golang.org/genproto v0.0.0-20190219182410-082222b4a5c5 // indirect + gopkg.in/AlecAivazis/survey.v1 v1.6.2 + gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect + gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect +- gopkg.in/src-d/go-billy.v4 v4.2.0 // indirect +- gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 // indirect +- gopkg.in/src-d/go-git.v4 v4.5.0 ++ gopkg.in/src-d/go-git.v4 v4.13.1 + gopkg.in/warnings.v0 v0.1.2 // indirect +- gopkg.in/yaml.v2 v2.2.1 ++ gopkg.in/yaml.v2 v2.2.2 + gotest.tools v2.2.0+incompatible // indirect + k8s.io/api v0.0.0-20190126160303-ccdd560a045f + k8s.io/apiextensions-apiserver v0.0.0-20181128195303-1f84094d7e8e + k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 + k8s.io/client-go v9.0.0+incompatible +- k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da +- k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 ++ k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect ++ k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 // indirect + k8s.io/helm v2.7.2+incompatible + k8s.io/klog v0.2.0 // indirect + k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 +@@ -197,6 +185,4 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d + + replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 + +-replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible +- + replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 |