Merge pull request #144 from nipeharefa/update-docs

lammel · web-flow · commit bb63adc24034 · 2020-11-20T13:27:35.000+01:00
Use latest echo version for docs
diff --git a/cookbook/auto-tls/server.go b/cookbook/auto-tls/server.go
@@ -3,8 +3,8 @@ package main
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 	"golang.org/x/crypto/acme/autocert"
 )
 
diff --git a/cookbook/cors/server.go b/cookbook/cors/server.go
@@ -3,8 +3,8 @@ package main
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 var (
diff --git a/cookbook/crud/server.go b/cookbook/crud/server.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 type (
diff --git a/cookbook/embed-resources/server.go b/cookbook/embed-resources/server.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/GeertJohan/go.rice"
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 func main() {
diff --git a/cookbook/file-download/attachment/server.go b/cookbook/file-download/attachment/server.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func main() {
diff --git a/cookbook/file-download/inline/server.go b/cookbook/file-download/inline/server.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func main() {
diff --git a/cookbook/file-download/server.go b/cookbook/file-download/server.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func main() {
diff --git a/cookbook/file-upload/multiple/server.go b/cookbook/file-upload/multiple/server.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func upload(c echo.Context) error {
diff --git a/cookbook/file-upload/single/server.go b/cookbook/file-upload/single/server.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func upload(c echo.Context) error {
diff --git a/cookbook/google-app-engine/app-engine.go b/cookbook/google-app-engine/app-engine.go
@@ -5,7 +5,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 func createMux() *echo.Echo {
diff --git a/cookbook/google-app-engine/app-managed.go b/cookbook/google-app-engine/app-managed.go
@@ -5,7 +5,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 	"google.golang.org/appengine"
 )
 
diff --git a/cookbook/google-app-engine/app-standalone.go b/cookbook/google-app-engine/app-standalone.go
@@ -3,8 +3,8 @@
 package main
 
 import (
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func createMux() *echo.Echo {
diff --git a/cookbook/google-app-engine/users.go b/cookbook/google-app-engine/users.go
@@ -3,8 +3,8 @@ package main
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 type (
diff --git a/cookbook/google-app-engine/welcome.go b/cookbook/google-app-engine/welcome.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 type (
diff --git a/cookbook/graceful-shutdown/grace/server.go b/cookbook/graceful-shutdown/grace/server.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/facebookgo/grace/gracehttp"
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 func main() {
diff --git a/cookbook/graceful-shutdown/graceful/server.go b/cookbook/graceful-shutdown/graceful/server.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 	"github.com/tylerb/graceful"
 )
 
diff --git a/cookbook/graceful-shutdown/server.go b/cookbook/graceful-shutdown/server.go
@@ -7,7 +7,7 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 	"github.com/labstack/gommon/log"
 )
 
diff --git a/cookbook/hello-world/server.go b/cookbook/hello-world/server.go
@@ -3,8 +3,8 @@ package main
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func main() {
diff --git a/cookbook/http2-server-push/server.go b/cookbook/http2-server-push/server.go
@@ -3,7 +3,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 func main() {
diff --git a/cookbook/http2/server.go b/cookbook/http2/server.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 func main() {
diff --git a/cookbook/jsonp/server.go b/cookbook/jsonp/server.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func main() {
diff --git a/cookbook/jwt/custom-claims/server.go b/cookbook/jwt/custom-claims/server.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 // jwtCustomClaims are custom claims extending default ones.
diff --git a/cookbook/jwt/map-claims/server.go b/cookbook/jwt/map-claims/server.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func login(c echo.Context) error {
diff --git a/cookbook/load-balancing/upstream/server.go b/cookbook/load-balancing/upstream/server.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 var index = `
diff --git a/cookbook/middleware/server.go b/cookbook/middleware/server.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 type (
diff --git a/cookbook/reverse-proxy/server.go b/cookbook/reverse-proxy/server.go
@@ -3,8 +3,8 @@ package main
 import (
 	"net/url"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 func main() {
diff --git a/cookbook/reverse-proxy/upstream/server.go b/cookbook/reverse-proxy/upstream/server.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 	"golang.org/x/net/websocket"
 )
 
diff --git a/cookbook/streaming-response/server.go b/cookbook/streaming-response/server.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 type (
diff --git a/cookbook/subdomains/server.go b/cookbook/subdomains/server.go
@@ -3,8 +3,8 @@ package main
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 type (
diff --git a/cookbook/twitter/handler/post.go b/cookbook/twitter/handler/post.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 	"github.com/labstack/echox/cookbook/twitter/model"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
diff --git a/cookbook/twitter/handler/user.go b/cookbook/twitter/handler/user.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 	"github.com/labstack/echox/cookbook/twitter/model"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
diff --git a/cookbook/twitter/server.go b/cookbook/twitter/server.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 	"github.com/labstack/echox/cookbook/twitter/handler"
 	"github.com/labstack/gommon/log"
 	"gopkg.in/mgo.v2"
diff --git a/cookbook/websocket/gorilla/server.go b/cookbook/websocket/gorilla/server.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/gorilla/websocket"
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 var (
diff --git a/cookbook/websocket/net/server.go b/cookbook/websocket/net/server.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/middleware"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 	"golang.org/x/net/websocket"
 )
 
diff --git a/website/content/guide.md b/website/content/guide.md
@@ -27,7 +27,7 @@ package main
 import (
 	"net/http"
 	
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 func main() {
diff --git a/website/content/guide/templates.md b/website/content/guide/templates.md
@@ -84,7 +84,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 // TemplateRenderer is a custom html/template renderer for Echo framework
diff --git a/website/content/guide/testing.md b/website/content/guide/testing.md
@@ -36,7 +36,7 @@ package handler
 import (
 	"net/http"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 )
 
 type (
@@ -78,7 +78,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
`5`	`5`
`6`		`- "github.com/labstack/echo"`
`7`		`- "github.com/labstack/echo/middleware"`
	`6`	`+ "github.com/labstack/echo/v4"`
	`7`	`+ "github.com/labstack/echo/v4/middleware"`
`8`	`8`	`"golang.org/x/crypto/acme/autocert"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"net/http"`
`5`	`5`	`"strconv"`
`6`	`6`
`7`		`- "github.com/labstack/echo"`
`8`		`- "github.com/labstack/echo/middleware"`
	`7`	`+ "github.com/labstack/echo/v4"`
	`8`	`+ "github.com/labstack/echo/v4/middleware"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type (`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"net/http"`
`5`	`5`
`6`	`6`	`"github.com/GeertJohan/go.rice"`
`7`		`- "github.com/labstack/echo"`
	`7`	`+ "github.com/labstack/echo/v4"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/labstack/echo"`
`5`		`- "github.com/labstack/echo/middleware"`
	`4`	`+ "github.com/labstack/echo/v4"`
	`5`	`+ "github.com/labstack/echo/v4/middleware"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"net/http"`
`7`	`7`	`"os"`
`8`	`8`
`9`		`- "github.com/labstack/echo"`
`10`		`- "github.com/labstack/echo/middleware"`
	`9`	`+ "github.com/labstack/echo/v4"`
	`10`	`+ "github.com/labstack/echo/v4/middleware"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func upload(c echo.Context) error {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ package main`
`5`	`5`	`import (`
`6`	`6`	`"net/http"`
`7`	`7`
`8`		`- "github.com/labstack/echo"`
	`8`	`+ "github.com/labstack/echo/v4"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func createMux() *echo.Echo {`