From 4dc5874694691a07017b889e428c54e7ef16c1e2 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Fri, 23 Jul 2021 07:27:37 -0500 Subject: [PATCH] Remove jsonschema fork The PR fixing thread safety when registering a custom keyword has been merged so I'm removing the fork and going back to using the upstream repository. See https://github.com/qri-io/jsonschema/pull/103 Signed-off-by: Carolyn Van Slyck --- go.mod | 7 +------ go.sum | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 941b6492..a5c78001 100644 --- a/go.mod +++ b/go.mod @@ -2,11 +2,6 @@ module github.com/cnabio/cnab-go go 1.13 -// Make our use of jsonschema thread-safe -// Upstream Issue: https://github.com/qri-io/jsonschema/issues/80 -// Local Fix: https://github.com/carolynvs/jsonschema/tree/local-keyword-registry -replace github.com/qri-io/jsonschema => github.com/carolynvs/jsonschema v0.2.1-0.20210602145235-283986347fba - require ( github.com/Masterminds/semver v1.5.0 github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect @@ -42,7 +37,7 @@ require ( github.com/pivotal/image-relocation v0.0.0-20191111101224-e94aff6df06c github.com/pkg/errors v0.9.1 github.com/qri-io/jsonpointer v0.1.1 - github.com/qri-io/jsonschema v0.2.1-0.20201028142641-08d62a2939dc + github.com/qri-io/jsonschema v0.2.2-0.20210723092138-2eb22ee8115f github.com/stretchr/testify v1.6.1 github.com/theupdateframework/notary v0.6.1 // indirect github.com/xeipuuv/gojsonschema v1.2.0 diff --git a/go.sum b/go.sum index 8582a8b6..703e9e34 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,6 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA= github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= -github.com/carolynvs/jsonschema v0.2.1-0.20210602145235-283986347fba h1:mjN+V+g5m08sWxTlQ2UNj2kdO4FLH1AuDS0l/2aIw7U= -github.com/carolynvs/jsonschema v0.2.1-0.20210602145235-283986347fba/go.mod h1:g7DPkiOsK1xv6T/Ao5scXRkd+yTFygcANPBaaqW+VrI= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -668,6 +666,8 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/qri-io/jsonpointer v0.1.1 h1:prVZBZLL6TW5vsSB9fFHFAMBLI4b0ri5vribQlTJiBA= github.com/qri-io/jsonpointer v0.1.1/go.mod h1:DnJPaYgiKu56EuDp8TU5wFLdZIcAnb/uH9v37ZaMV64= +github.com/qri-io/jsonschema v0.2.2-0.20210723092138-2eb22ee8115f h1:fG/BLRtlFDgCs/dvPjiAN3v2Mrkr1KRWkEdXj20UwLY= +github.com/qri-io/jsonschema v0.2.2-0.20210723092138-2eb22ee8115f/go.mod h1:g7DPkiOsK1xv6T/Ao5scXRkd+yTFygcANPBaaqW+VrI= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=