use plain pkg module

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

services/thumbnails/pkg/command/health.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/parser"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/logging"

services/thumbnails/pkg/command/root.go

@@ -3,7 +3,7 @@ package command
 import (
 	"os"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/clihelper"
+	"github.com/opencloud-eu/opencloud/pkg/clihelper"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	"github.com/urfave/cli/v2"
 )

services/thumbnails/pkg/command/server.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/oklog/run"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
-	ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
+	ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc"
+	"github.com/opencloud-eu/opencloud/pkg/tracing"
+	"github.com/opencloud-eu/opencloud/pkg/version"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/parser"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/logging"

services/thumbnails/pkg/command/version.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
+	"github.com/opencloud-eu/opencloud/pkg/registry"
+	"github.com/opencloud-eu/opencloud/pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"

services/thumbnails/pkg/config/config.go

@@ -4,7 +4,7 @@ package config
 import (
 	"context"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
+	"github.com/opencloud-eu/opencloud/pkg/shared"
 	"go-micro.dev/v4/client"
 )
 

services/thumbnails/pkg/config/defaults/defaultconfig.go

@@ -4,9 +4,9 @@ import (
 	"path"
 	"strings"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/structs"
+	"github.com/opencloud-eu/opencloud/pkg/config/defaults"
+	"github.com/opencloud-eu/opencloud/pkg/shared"
+	"github.com/opencloud-eu/opencloud/pkg/structs"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 )
 

services/thumbnails/pkg/config/grpc.go

@@ -1,6 +1,6 @@
 package config
 
-import "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
+import "github.com/opencloud-eu/opencloud/pkg/shared"
 
 // GRPCConfig defines the available grpc configuration.
 type GRPCConfig struct {

services/thumbnails/pkg/config/http.go

@@ -1,6 +1,6 @@
 package config
 
-import "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
+import "github.com/opencloud-eu/opencloud/pkg/shared"
 
 // CORS defines the available cors configuration.
 type CORS struct {

services/thumbnails/pkg/config/parser/parse.go

@@ -3,11 +3,11 @@ package parser
 import (
 	"errors"
 
-	ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
+	ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
+	"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
 )
 
 // ParseConfig loads configuration from known paths.

services/thumbnails/pkg/config/tracing.go

@@ -1,6 +1,6 @@
 package config
 
-import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
+import "github.com/opencloud-eu/opencloud/pkg/tracing"
 
 // Tracing defines the available tracing configuration.
 type Tracing struct {

services/thumbnails/pkg/logging/logging.go

@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 )
 

services/thumbnails/pkg/preprocessor/fontloader.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/sync"
+	"github.com/opencloud-eu/opencloud/pkg/sync"
 	"golang.org/x/image/font"
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/opentype"

services/thumbnails/pkg/server/debug/option.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 )
 

services/thumbnails/pkg/server/debug/server.go

@@ -3,10 +3,10 @@ package debug
 import (
 	"net/http"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/checks"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/service/debug"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
+	"github.com/opencloud-eu/opencloud/pkg/checks"
+	"github.com/opencloud-eu/opencloud/pkg/handlers"
+	"github.com/opencloud-eu/opencloud/pkg/service/debug"
+	"github.com/opencloud-eu/opencloud/pkg/version"
 )
 
 // Server initializes the debug service and server.

services/thumbnails/pkg/server/grpc/option.go

@@ -3,7 +3,7 @@ package grpc
 import (
 	"context"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/metrics"
 	"go.opentelemetry.io/otel/trace"

services/thumbnails/pkg/server/grpc/server.go

@@ -3,10 +3,10 @@ package grpc
 import (
 	"github.com/cs3org/reva/v2/pkg/bytesize"
 	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc/handler/ratelimiter"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
+	"github.com/opencloud-eu/opencloud/pkg/registry"
+	"github.com/opencloud-eu/opencloud/pkg/service/grpc"
+	"github.com/opencloud-eu/opencloud/pkg/service/grpc/handler/ratelimiter"
+	"github.com/opencloud-eu/opencloud/pkg/version"
 	thumbnailssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0"
 	svc "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/service/grpc/v0"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/service/grpc/v0/decorators"

services/thumbnails/pkg/server/http/option.go

@@ -3,7 +3,7 @@ package http
 import (
 	"context"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/metrics"
 	"github.com/urfave/cli/v2"

services/thumbnails/pkg/server/http/server.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 
 	"github.com/go-chi/chi/v5/middleware"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/cors"
-	ocismiddleware "github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/service/http"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
+	"github.com/opencloud-eu/opencloud/pkg/cors"
+	ocismiddleware "github.com/opencloud-eu/opencloud/pkg/middleware"
+	"github.com/opencloud-eu/opencloud/pkg/service/http"
+	"github.com/opencloud-eu/opencloud/pkg/version"
 	svc "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/service/http/v0"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage"
 	"go-micro.dev/v4"

services/thumbnails/pkg/service/grpc/v0/decorators/logging.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	thumbnailssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0"
 	merrors "go-micro.dev/v4/errors"
 )

services/thumbnails/pkg/service/grpc/v0/option.go

@@ -5,7 +5,7 @@ import (
 
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
 	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/imgsource"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage"

services/thumbnails/pkg/service/grpc/v0/service.go

@@ -20,7 +20,7 @@ import (
 	merrors "go-micro.dev/v4/errors"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	thumbnailssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0"
 	terrors "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/errors"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/preprocessor"

services/thumbnails/pkg/service/http/v0/logging.go

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

services/thumbnails/pkg/service/http/v0/option.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage"
 	"go.opentelemetry.io/otel/trace"

services/thumbnails/pkg/service/http/v0/service.go

@@ -10,8 +10,8 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/riandyrn/otelchi"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
+	"github.com/opencloud-eu/opencloud/pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/tracing"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 	tjwt "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/service/jwt"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail"

services/thumbnails/pkg/thumbnail/storage/filesystem.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
 )
 

services/thumbnails/pkg/thumbnail/thumbnail.go

@@ -5,7 +5,7 @@ import (
 	"image"
 	"mime"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/errors"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage"
 )

services/thumbnails/pkg/thumbnail/thumbnail_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage"
 )