From 62c43cce77e6abd452062fe4c52e0351ada50737 Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Fri, 7 Feb 2020 22:15:05 +0100 Subject: [PATCH] replace blackfriday.v2 with blackfriday/v2 --- backend/_example/memory_store/go.mod | 2 -- backend/app/store/formatter.go | 2 +- backend/go.mod | 4 +--- .../russross/blackfriday/v2}/.gitignore | 0 .../russross/blackfriday/v2}/.travis.yml | 0 .../russross/blackfriday/v2}/LICENSE.txt | 0 .../russross/blackfriday/v2}/README.md | 0 .../russross/blackfriday/v2}/block.go | 0 .../russross/blackfriday/v2}/doc.go | 0 .../russross/blackfriday/v2}/esc.go | 0 .../russross/blackfriday/v2}/go.mod | 0 .../russross/blackfriday/v2}/html.go | 0 .../russross/blackfriday/v2}/inline.go | 0 .../russross/blackfriday/v2}/markdown.go | 0 .../russross/blackfriday/v2}/node.go | 0 .../russross/blackfriday/v2}/smartypants.go | 0 backend/vendor/modules.txt | 4 ++-- 17 files changed, 4 insertions(+), 8 deletions(-) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/.gitignore (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/.travis.yml (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/LICENSE.txt (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/README.md (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/block.go (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/doc.go (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/esc.go (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/go.mod (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/html.go (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/inline.go (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/markdown.go (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/node.go (100%) rename backend/vendor/{gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2}/smartypants.go (100%) diff --git a/backend/_example/memory_store/go.mod b/backend/_example/memory_store/go.mod index 510a92e6..45046f26 100644 --- a/backend/_example/memory_store/go.mod +++ b/backend/_example/memory_store/go.mod @@ -12,5 +12,3 @@ require ( ) replace github.com/umputun/remark/backend => ../../ - -replace gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2 v2.0.1 diff --git a/backend/app/store/formatter.go b/backend/app/store/formatter.go index b3b52c31..668fe3d1 100644 --- a/backend/app/store/formatter.go +++ b/backend/app/store/formatter.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/PuerkitoBio/goquery" - bf "gopkg.in/russross/blackfriday.v2" + bf "github.com/russross/blackfriday/v2" ) // CommentFormatter implements all generic formatting ops on comment diff --git a/backend/go.mod b/backend/go.mod index 5ccefb5a..88db52fd 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -2,8 +2,6 @@ module github.com/umputun/remark/backend go 1.13 -replace gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2 v2.0.1 - require ( cloud.google.com/go v0.47.0 // indirect github.com/PuerkitoBio/goquery v1.5.0 @@ -43,6 +41,7 @@ require ( github.com/pkg/errors v0.8.1 github.com/rakyll/statik v0.1.6 github.com/rs/xid v1.2.1 + github.com/russross/blackfriday/v2 v2.0.1 github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/smartystreets/assertions v1.0.1 // indirect github.com/stretchr/objx v0.2.0 // indirect @@ -61,6 +60,5 @@ require ( golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect google.golang.org/appengine v1.6.5 // indirect gopkg.in/oauth2.v3 v3.11.0 // indirect - gopkg.in/russross/blackfriday.v2 v2.0.1 gopkg.in/yaml.v2 v2.2.4 // indirect ) diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/.gitignore b/backend/vendor/github.com/russross/blackfriday/v2/.gitignore similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/.gitignore rename to backend/vendor/github.com/russross/blackfriday/v2/.gitignore diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/.travis.yml b/backend/vendor/github.com/russross/blackfriday/v2/.travis.yml similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/.travis.yml rename to backend/vendor/github.com/russross/blackfriday/v2/.travis.yml diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/LICENSE.txt b/backend/vendor/github.com/russross/blackfriday/v2/LICENSE.txt similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/LICENSE.txt rename to backend/vendor/github.com/russross/blackfriday/v2/LICENSE.txt diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/README.md b/backend/vendor/github.com/russross/blackfriday/v2/README.md similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/README.md rename to backend/vendor/github.com/russross/blackfriday/v2/README.md diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/block.go b/backend/vendor/github.com/russross/blackfriday/v2/block.go similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/block.go rename to backend/vendor/github.com/russross/blackfriday/v2/block.go diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/doc.go b/backend/vendor/github.com/russross/blackfriday/v2/doc.go similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/doc.go rename to backend/vendor/github.com/russross/blackfriday/v2/doc.go diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/esc.go b/backend/vendor/github.com/russross/blackfriday/v2/esc.go similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/esc.go rename to backend/vendor/github.com/russross/blackfriday/v2/esc.go diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/go.mod b/backend/vendor/github.com/russross/blackfriday/v2/go.mod similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/go.mod rename to backend/vendor/github.com/russross/blackfriday/v2/go.mod diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/html.go b/backend/vendor/github.com/russross/blackfriday/v2/html.go similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/html.go rename to backend/vendor/github.com/russross/blackfriday/v2/html.go diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/inline.go b/backend/vendor/github.com/russross/blackfriday/v2/inline.go similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/inline.go rename to backend/vendor/github.com/russross/blackfriday/v2/inline.go diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/markdown.go b/backend/vendor/github.com/russross/blackfriday/v2/markdown.go similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/markdown.go rename to backend/vendor/github.com/russross/blackfriday/v2/markdown.go diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/node.go b/backend/vendor/github.com/russross/blackfriday/v2/node.go similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/node.go rename to backend/vendor/github.com/russross/blackfriday/v2/node.go diff --git a/backend/vendor/gopkg.in/russross/blackfriday.v2/smartypants.go b/backend/vendor/github.com/russross/blackfriday/v2/smartypants.go similarity index 100% rename from backend/vendor/gopkg.in/russross/blackfriday.v2/smartypants.go rename to backend/vendor/github.com/russross/blackfriday/v2/smartypants.go diff --git a/backend/vendor/modules.txt b/backend/vendor/modules.txt index eb2c95f6..6d44ee06 100644 --- a/backend/vendor/modules.txt +++ b/backend/vendor/modules.txt @@ -92,6 +92,8 @@ github.com/pmezard/go-difflib/difflib github.com/rakyll/statik/fs # github.com/rs/xid v1.2.1 github.com/rs/xid +# github.com/russross/blackfriday/v2 v2.0.1 +github.com/russross/blackfriday/v2 # github.com/shurcooL/sanitized_anchor_name v1.0.0 github.com/shurcooL/sanitized_anchor_name # github.com/stretchr/objx v0.2.0 @@ -182,7 +184,5 @@ google.golang.org/appengine/urlfetch gopkg.in/oauth2.v3 gopkg.in/oauth2.v3/errors gopkg.in/oauth2.v3/server -# gopkg.in/russross/blackfriday.v2 v2.0.1 => github.com/russross/blackfriday/v2 v2.0.1 -gopkg.in/russross/blackfriday.v2 # gopkg.in/yaml.v2 v2.2.4 gopkg.in/yaml.v2