webdav working

webdav/go.mod

@@ -3,18 +3,22 @@ module github.com/owncloud/ocis/webdav
 go 1.13
 
 require (
-	contrib.go.opencensus.io/exporter/jaeger v0.2.0
+	contrib.go.opencensus.io/exporter/jaeger v0.2.1
 	contrib.go.opencensus.io/exporter/ocagent v0.6.0
 	contrib.go.opencensus.io/exporter/zipkin v0.1.1
-	github.com/go-chi/chi v4.0.2+incompatible
-	github.com/micro/cli/v2 v2.1.1
-	github.com/micro/go-micro/v2 v2.0.0
+	github.com/go-chi/chi v4.1.2+incompatible
+	github.com/micro/cli/v2 v2.1.2
+	github.com/micro/go-micro/v2 v2.9.1
 	github.com/oklog/run v1.0.0
 	github.com/openzipkin/zipkin-go v0.2.2
-	github.com/owncloud/ocis-pkg/v2 v2.2.1
-	github.com/owncloud/ocis-thumbnails v0.2.0
-	github.com/spf13/viper v1.5.0
-	go.opencensus.io v0.22.2
+	github.com/owncloud/ocis/ocis-pkg v0.0.0-20200918114005-1a0ddd2190ee
+	github.com/owncloud/ocis/thumbnails v0.0.0-20200918125107-fcca9faa81c8
+	github.com/spf13/viper v1.6.3
+	go.opencensus.io v0.22.4
 )
 
-replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
+replace (
+	github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
+	github.com/owncloud/ocis/thumbnails => ../thumbnails
+	google.golang.org/grpc => google.golang.org/grpc v1.26.0
+)

webdav/pkg/command/root.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/owncloud/ocis/webdav/pkg/flagset"
 	"github.com/owncloud/ocis/webdav/pkg/version"

webdav/pkg/server/debug/option.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 

webdav/pkg/server/debug/server.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis-pkg/v2/service/debug"
+	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/owncloud/ocis/webdav/pkg/version"
 )

webdav/pkg/server/http/option.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/owncloud/ocis/webdav/pkg/metrics"
 )

webdav/pkg/server/http/server.go

@@ -1,8 +1,8 @@
 package http
 
 import (
-	"github.com/owncloud/ocis-pkg/v2/middleware"
-	"github.com/owncloud/ocis-pkg/v2/service/http"
+	"github.com/owncloud/ocis/ocis-pkg/middleware"
+	"github.com/owncloud/ocis/ocis-pkg/service/http"
 	svc "github.com/owncloud/ocis/webdav/pkg/service/v0"
 	"github.com/owncloud/ocis/webdav/pkg/version"
 )

webdav/pkg/service/v0/logging.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
 // NewLogging returns a service that logs messages.

webdav/pkg/service/v0/option.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 

webdav/pkg/service/v0/service.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-chi/chi"
 	"github.com/micro/go-micro/v2/client"
-	thumbnails "github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
+	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 	thumbnail "github.com/owncloud/ocis/webdav/pkg/dav/thumbnails"
 )