Skip to content

Commit 8dee3f6

Browse files
committed
fix the ocis module version accordingly to the major version
1 parent 7ba20d5 commit 8dee3f6

File tree

1,118 files changed

+27879
-3043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,118 files changed

+27879
-3043
lines changed

docs/helpers/configenvextractor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func RenderTemplates() {
2626
log.Fatal(err)
2727
}
2828
replacer := strings.NewReplacer(
29-
"../../", "github.com/owncloud/ocis/v2/",
29+
"../../", "github.com/owncloud/ocis/v7/",
3030
"/defaultconfig.go", "",
3131
)
3232
for i := range paths {

docs/helpers/markdowncreation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"text/template"
1111
"time"
1212

13-
"github.com/owncloud/ocis/v2/ocis-pkg/markdown"
13+
"github.com/owncloud/ocis/v7/ocis-pkg/markdown"
1414
)
1515

1616
var _configMarkdown = `{{< include file="services/_includes/%s-config-example.yaml" language="yaml" >}}

go.mod

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/owncloud/ocis/v2
1+
module github.com/owncloud/ocis/v7
22

33
go 1.22.7
44

@@ -129,6 +129,7 @@ require (
129129
github.com/ajg/form v1.5.1 // indirect
130130
github.com/alexedwards/argon2id v1.0.0 // indirect
131131
github.com/amoghe/go-crypt v0.0.0-20220222110647-20eada5f5964 // indirect
132+
github.com/armon/go-metrics v0.4.1 // indirect
132133
github.com/armon/go-radix v1.0.0 // indirect
133134
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
134135
github.com/aws/aws-sdk-go v1.55.5 // indirect
@@ -198,6 +199,11 @@ require (
198199
github.com/go-logr/logr v1.4.2 // indirect
199200
github.com/go-logr/stdr v1.2.2 // indirect
200201
github.com/go-micro/plugins/v4/events/natsjs v1.2.2 // indirect
202+
github.com/go-micro/plugins/v4/registry/consul v1.2.1 // indirect
203+
github.com/go-micro/plugins/v4/registry/etcd v1.2.0 // indirect
204+
github.com/go-micro/plugins/v4/registry/kubernetes v1.1.2-0.20230605104008-a179a6b8f8e6 // indirect
205+
github.com/go-micro/plugins/v4/registry/mdns v1.2.0 // indirect
206+
github.com/go-micro/plugins/v4/registry/nats v1.2.1 // indirect
201207
github.com/go-micro/plugins/v4/store/nats-js v1.2.1 // indirect
202208
github.com/go-micro/plugins/v4/store/redis v1.2.1 // indirect
203209
github.com/go-playground/locales v0.14.1 // indirect
@@ -231,8 +237,14 @@ require (
231237
github.com/gorilla/handlers v1.5.1 // indirect
232238
github.com/gorilla/schema v1.4.1 // indirect
233239
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
240+
github.com/hashicorp/consul/api v1.15.2 // indirect
241+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
234242
github.com/hashicorp/go-hclog v1.6.3 // indirect
243+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
235244
github.com/hashicorp/go-plugin v1.6.2 // indirect
245+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
246+
github.com/hashicorp/golang-lru v0.6.0 // indirect
247+
github.com/hashicorp/serf v0.10.0 // indirect
236248
github.com/hashicorp/yamux v0.1.1 // indirect
237249
github.com/huandu/xstrings v1.5.0 // indirect
238250
github.com/iancoleman/strcase v0.3.0 // indirect
@@ -263,6 +275,8 @@ require (
263275
github.com/minio/md5-simd v1.1.2 // indirect
264276
github.com/minio/minio-go/v7 v7.0.78 // indirect
265277
github.com/mitchellh/copystructure v1.2.0 // indirect
278+
github.com/mitchellh/go-homedir v1.1.0 // indirect
279+
github.com/mitchellh/hashstructure v1.1.0 // indirect
266280
github.com/mitchellh/reflectwalk v1.0.2 // indirect
267281
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
268282
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -274,6 +288,7 @@ require (
274288
github.com/nxadm/tail v1.4.8 // indirect
275289
github.com/opencontainers/runtime-spec v1.1.0 // indirect
276290
github.com/opentracing/opentracing-go v1.2.0 // indirect
291+
github.com/owncloud/ocis/v2 v2.0.0-rc.2 // indirect
277292
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
278293
github.com/pablodz/inotifywaitgo v0.0.7 // indirect
279294
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
@@ -353,3 +368,5 @@ replace go-micro.dev/v4 => github.com/butonic/go-micro/v4 v4.11.1-0.202411151126
353368
// exclude the v2 line of go-sqlite3 which was released accidentally and prevents pulling in newer versions of go-sqlite3
354369
// see https://github.com/mattn/go-sqlite3/issues/965 for more details
355370
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
371+
372+
exclude github.com/owncloud/ocis/v2 v2.0.0

go.sum

+88
Large diffs are not rendered by default.

ocis-pkg/account/option.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package account
22

33
import (
4-
"github.com/owncloud/ocis/v2/ocis-pkg/log"
4+
"github.com/owncloud/ocis/v7/ocis-pkg/log"
55
)
66

77
// Option defines a single option function.

ocis-pkg/ast/test/test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package test
44
import (
55
"github.com/google/go-cmp/cmp"
66
"github.com/google/go-cmp/cmp/cmpopts"
7-
"github.com/owncloud/ocis/v2/ocis-pkg/ast"
7+
"github.com/owncloud/ocis/v7/ocis-pkg/ast"
88
)
99

1010
// DiffAst returns a human-readable report of the differences between two values

ocis-pkg/checks/checkgrpc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
7+
"github.com/owncloud/ocis/v7/ocis-pkg/handlers"
88
"google.golang.org/grpc"
99
"google.golang.org/grpc/credentials/insecure"
1010
)

ocis-pkg/checks/checkhttp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
10+
"github.com/owncloud/ocis/v7/ocis-pkg/handlers"
1111
)
1212

1313
// NewHTTPCheck checks the reachability of a http server.

ocis-pkg/checks/checktcp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net"
66
"time"
77

8-
"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
8+
"github.com/owncloud/ocis/v7/ocis-pkg/handlers"
99
)
1010

1111
// NewTCPCheck returns a check that connects to a given tcp endpoint.

ocis-pkg/clihelper/app.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package clihelper
22

33
import (
4-
"github.com/owncloud/ocis/v2/ocis-pkg/version"
4+
"github.com/owncloud/ocis/v7/ocis-pkg/version"
55
"github.com/urfave/cli/v2"
66
)
77

ocis-pkg/config/config.go

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
package config
22

33
import (
4-
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
5-
activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/config"
6-
antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/config"
7-
appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/config"
8-
appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/config"
9-
audit "github.com/owncloud/ocis/v2/services/audit/pkg/config"
10-
authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/config"
11-
authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config"
12-
authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config"
13-
authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config"
14-
authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/config"
15-
clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/config"
16-
collaboration "github.com/owncloud/ocis/v2/services/collaboration/pkg/config"
17-
eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config"
18-
frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/config"
19-
gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/config"
20-
graph "github.com/owncloud/ocis/v2/services/graph/pkg/config"
21-
groups "github.com/owncloud/ocis/v2/services/groups/pkg/config"
22-
idm "github.com/owncloud/ocis/v2/services/idm/pkg/config"
23-
idp "github.com/owncloud/ocis/v2/services/idp/pkg/config"
24-
invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/config"
25-
nats "github.com/owncloud/ocis/v2/services/nats/pkg/config"
26-
notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/config"
27-
ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/config"
28-
ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/config"
29-
ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/config"
30-
policies "github.com/owncloud/ocis/v2/services/policies/pkg/config"
31-
postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config"
32-
proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/config"
33-
search "github.com/owncloud/ocis/v2/services/search/pkg/config"
34-
settings "github.com/owncloud/ocis/v2/services/settings/pkg/config"
35-
sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config"
36-
sse "github.com/owncloud/ocis/v2/services/sse/pkg/config"
37-
storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/config"
38-
storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/config"
39-
storagesystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/config"
40-
storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/config"
41-
thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config"
42-
userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/config"
43-
users "github.com/owncloud/ocis/v2/services/users/pkg/config"
44-
web "github.com/owncloud/ocis/v2/services/web/pkg/config"
45-
webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/config"
46-
webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/config"
4+
"github.com/owncloud/ocis/v7/ocis-pkg/shared"
5+
activitylog "github.com/owncloud/ocis/v7/services/activitylog/pkg/config"
6+
antivirus "github.com/owncloud/ocis/v7/services/antivirus/pkg/config"
7+
appProvider "github.com/owncloud/ocis/v7/services/app-provider/pkg/config"
8+
appRegistry "github.com/owncloud/ocis/v7/services/app-registry/pkg/config"
9+
audit "github.com/owncloud/ocis/v7/services/audit/pkg/config"
10+
authapp "github.com/owncloud/ocis/v7/services/auth-app/pkg/config"
11+
authbasic "github.com/owncloud/ocis/v7/services/auth-basic/pkg/config"
12+
authbearer "github.com/owncloud/ocis/v7/services/auth-bearer/pkg/config"
13+
authmachine "github.com/owncloud/ocis/v7/services/auth-machine/pkg/config"
14+
authservice "github.com/owncloud/ocis/v7/services/auth-service/pkg/config"
15+
clientlog "github.com/owncloud/ocis/v7/services/clientlog/pkg/config"
16+
collaboration "github.com/owncloud/ocis/v7/services/collaboration/pkg/config"
17+
eventhistory "github.com/owncloud/ocis/v7/services/eventhistory/pkg/config"
18+
frontend "github.com/owncloud/ocis/v7/services/frontend/pkg/config"
19+
gateway "github.com/owncloud/ocis/v7/services/gateway/pkg/config"
20+
graph "github.com/owncloud/ocis/v7/services/graph/pkg/config"
21+
groups "github.com/owncloud/ocis/v7/services/groups/pkg/config"
22+
idm "github.com/owncloud/ocis/v7/services/idm/pkg/config"
23+
idp "github.com/owncloud/ocis/v7/services/idp/pkg/config"
24+
invitations "github.com/owncloud/ocis/v7/services/invitations/pkg/config"
25+
nats "github.com/owncloud/ocis/v7/services/nats/pkg/config"
26+
notifications "github.com/owncloud/ocis/v7/services/notifications/pkg/config"
27+
ocdav "github.com/owncloud/ocis/v7/services/ocdav/pkg/config"
28+
ocm "github.com/owncloud/ocis/v7/services/ocm/pkg/config"
29+
ocs "github.com/owncloud/ocis/v7/services/ocs/pkg/config"
30+
policies "github.com/owncloud/ocis/v7/services/policies/pkg/config"
31+
postprocessing "github.com/owncloud/ocis/v7/services/postprocessing/pkg/config"
32+
proxy "github.com/owncloud/ocis/v7/services/proxy/pkg/config"
33+
search "github.com/owncloud/ocis/v7/services/search/pkg/config"
34+
settings "github.com/owncloud/ocis/v7/services/settings/pkg/config"
35+
sharing "github.com/owncloud/ocis/v7/services/sharing/pkg/config"
36+
sse "github.com/owncloud/ocis/v7/services/sse/pkg/config"
37+
storagepublic "github.com/owncloud/ocis/v7/services/storage-publiclink/pkg/config"
38+
storageshares "github.com/owncloud/ocis/v7/services/storage-shares/pkg/config"
39+
storagesystem "github.com/owncloud/ocis/v7/services/storage-system/pkg/config"
40+
storageusers "github.com/owncloud/ocis/v7/services/storage-users/pkg/config"
41+
thumbnails "github.com/owncloud/ocis/v7/services/thumbnails/pkg/config"
42+
userlog "github.com/owncloud/ocis/v7/services/userlog/pkg/config"
43+
users "github.com/owncloud/ocis/v7/services/users/pkg/config"
44+
web "github.com/owncloud/ocis/v7/services/web/pkg/config"
45+
webdav "github.com/owncloud/ocis/v7/services/webdav/pkg/config"
46+
webfinger "github.com/owncloud/ocis/v7/services/webfinger/pkg/config"
4747
)
4848

4949
type Mode int

ocis-pkg/config/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package config_test
33
import (
44
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
6-
"github.com/owncloud/ocis/v2/ocis-pkg/config"
6+
"github.com/owncloud/ocis/v7/ocis-pkg/config"
77
"gopkg.in/yaml.v2"
88
)
99

ocis-pkg/config/defaultconfig.go

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
package config
22

33
import (
4-
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
5-
activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/config/defaults"
6-
antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/config/defaults"
7-
appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/config/defaults"
8-
appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/config/defaults"
9-
audit "github.com/owncloud/ocis/v2/services/audit/pkg/config/defaults"
10-
authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/defaults"
11-
authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/defaults"
12-
authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config/defaults"
13-
authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/defaults"
14-
authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/config/defaults"
15-
clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/config/defaults"
16-
collaboration "github.com/owncloud/ocis/v2/services/collaboration/pkg/config/defaults"
17-
eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config/defaults"
18-
frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/config/defaults"
19-
gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/config/defaults"
20-
graph "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults"
21-
groups "github.com/owncloud/ocis/v2/services/groups/pkg/config/defaults"
22-
idm "github.com/owncloud/ocis/v2/services/idm/pkg/config/defaults"
23-
idp "github.com/owncloud/ocis/v2/services/idp/pkg/config/defaults"
24-
invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/config/defaults"
25-
nats "github.com/owncloud/ocis/v2/services/nats/pkg/config/defaults"
26-
notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/config/defaults"
27-
ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/defaults"
28-
ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/config/defaults"
29-
ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/config/defaults"
30-
policies "github.com/owncloud/ocis/v2/services/policies/pkg/config/defaults"
31-
postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/defaults"
32-
proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults"
33-
search "github.com/owncloud/ocis/v2/services/search/pkg/config/defaults"
34-
settings "github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults"
35-
sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config/defaults"
36-
sse "github.com/owncloud/ocis/v2/services/sse/pkg/config/defaults"
37-
storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/config/defaults"
38-
storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/config/defaults"
39-
storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/config/defaults"
40-
storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/config/defaults"
41-
thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config/defaults"
42-
userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/config/defaults"
43-
users "github.com/owncloud/ocis/v2/services/users/pkg/config/defaults"
44-
web "github.com/owncloud/ocis/v2/services/web/pkg/config/defaults"
45-
webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/config/defaults"
46-
webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/config/defaults"
4+
"github.com/owncloud/ocis/v7/ocis-pkg/shared"
5+
activitylog "github.com/owncloud/ocis/v7/services/activitylog/pkg/config/defaults"
6+
antivirus "github.com/owncloud/ocis/v7/services/antivirus/pkg/config/defaults"
7+
appProvider "github.com/owncloud/ocis/v7/services/app-provider/pkg/config/defaults"
8+
appRegistry "github.com/owncloud/ocis/v7/services/app-registry/pkg/config/defaults"
9+
audit "github.com/owncloud/ocis/v7/services/audit/pkg/config/defaults"
10+
authapp "github.com/owncloud/ocis/v7/services/auth-app/pkg/config/defaults"
11+
authbasic "github.com/owncloud/ocis/v7/services/auth-basic/pkg/config/defaults"
12+
authbearer "github.com/owncloud/ocis/v7/services/auth-bearer/pkg/config/defaults"
13+
authmachine "github.com/owncloud/ocis/v7/services/auth-machine/pkg/config/defaults"
14+
authservice "github.com/owncloud/ocis/v7/services/auth-service/pkg/config/defaults"
15+
clientlog "github.com/owncloud/ocis/v7/services/clientlog/pkg/config/defaults"
16+
collaboration "github.com/owncloud/ocis/v7/services/collaboration/pkg/config/defaults"
17+
eventhistory "github.com/owncloud/ocis/v7/services/eventhistory/pkg/config/defaults"
18+
frontend "github.com/owncloud/ocis/v7/services/frontend/pkg/config/defaults"
19+
gateway "github.com/owncloud/ocis/v7/services/gateway/pkg/config/defaults"
20+
graph "github.com/owncloud/ocis/v7/services/graph/pkg/config/defaults"
21+
groups "github.com/owncloud/ocis/v7/services/groups/pkg/config/defaults"
22+
idm "github.com/owncloud/ocis/v7/services/idm/pkg/config/defaults"
23+
idp "github.com/owncloud/ocis/v7/services/idp/pkg/config/defaults"
24+
invitations "github.com/owncloud/ocis/v7/services/invitations/pkg/config/defaults"
25+
nats "github.com/owncloud/ocis/v7/services/nats/pkg/config/defaults"
26+
notifications "github.com/owncloud/ocis/v7/services/notifications/pkg/config/defaults"
27+
ocdav "github.com/owncloud/ocis/v7/services/ocdav/pkg/config/defaults"
28+
ocm "github.com/owncloud/ocis/v7/services/ocm/pkg/config/defaults"
29+
ocs "github.com/owncloud/ocis/v7/services/ocs/pkg/config/defaults"
30+
policies "github.com/owncloud/ocis/v7/services/policies/pkg/config/defaults"
31+
postprocessing "github.com/owncloud/ocis/v7/services/postprocessing/pkg/config/defaults"
32+
proxy "github.com/owncloud/ocis/v7/services/proxy/pkg/config/defaults"
33+
search "github.com/owncloud/ocis/v7/services/search/pkg/config/defaults"
34+
settings "github.com/owncloud/ocis/v7/services/settings/pkg/config/defaults"
35+
sharing "github.com/owncloud/ocis/v7/services/sharing/pkg/config/defaults"
36+
sse "github.com/owncloud/ocis/v7/services/sse/pkg/config/defaults"
37+
storagepublic "github.com/owncloud/ocis/v7/services/storage-publiclink/pkg/config/defaults"
38+
storageshares "github.com/owncloud/ocis/v7/services/storage-shares/pkg/config/defaults"
39+
storageSystem "github.com/owncloud/ocis/v7/services/storage-system/pkg/config/defaults"
40+
storageusers "github.com/owncloud/ocis/v7/services/storage-users/pkg/config/defaults"
41+
thumbnails "github.com/owncloud/ocis/v7/services/thumbnails/pkg/config/defaults"
42+
userlog "github.com/owncloud/ocis/v7/services/userlog/pkg/config/defaults"
43+
users "github.com/owncloud/ocis/v7/services/users/pkg/config/defaults"
44+
web "github.com/owncloud/ocis/v7/services/web/pkg/config/defaults"
45+
webdav "github.com/owncloud/ocis/v7/services/webdav/pkg/config/defaults"
46+
webfinger "github.com/owncloud/ocis/v7/services/webfinger/pkg/config/defaults"
4747
)
4848

4949
func DefaultConfig() *Config {

ocis-pkg/config/helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
gofig "github.com/gookit/config/v2"
1010
gooyaml "github.com/gookit/config/v2/yaml"
11-
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
11+
"github.com/owncloud/ocis/v7/ocis-pkg/config/defaults"
1212
)
1313

1414
var (

ocis-pkg/config/parser/parse.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package parser
33
import (
44
"errors"
55

6-
"github.com/owncloud/ocis/v2/ocis-pkg/config"
7-
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
8-
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
9-
"github.com/owncloud/ocis/v2/ocis-pkg/structs"
6+
"github.com/owncloud/ocis/v7/ocis-pkg/config"
7+
"github.com/owncloud/ocis/v7/ocis-pkg/config/envdecode"
8+
"github.com/owncloud/ocis/v7/ocis-pkg/shared"
9+
"github.com/owncloud/ocis/v7/ocis-pkg/structs"
1010
)
1111

1212
// ParseConfig loads the ocis configuration and

ocis-pkg/conversions/ptr_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
libregraph "github.com/owncloud/libre-graph-api-go"
88

9-
"github.com/owncloud/ocis/v2/ocis-pkg/conversions"
9+
"github.com/owncloud/ocis/v7/ocis-pkg/conversions"
1010
)
1111

1212
func checkIdentical[T any](t *testing.T, p T, want string) {

ocis-pkg/cors/option.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cors
22

33
import (
4-
"github.com/owncloud/ocis/v2/ocis-pkg/log"
4+
"github.com/owncloud/ocis/v7/ocis-pkg/log"
55
)
66

77
// Option defines a single option function.

ocis-pkg/crypto/crypto_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/owncloud/ocis/v2/ocis-pkg/crypto"
9-
"github.com/owncloud/ocis/v2/ocis-pkg/log"
8+
"github.com/owncloud/ocis/v7/ocis-pkg/crypto"
9+
"github.com/owncloud/ocis/v7/ocis-pkg/log"
1010

1111
. "github.com/onsi/ginkgo/v2"
12-
cfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
12+
cfg "github.com/owncloud/ocis/v7/ocis-pkg/config"
1313
)
1414

1515
var _ = Describe("Crypto", func() {

ocis-pkg/crypto/gencert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"os"
1313
"path/filepath"
1414

15-
"github.com/owncloud/ocis/v2/ocis-pkg/log"
15+
"github.com/owncloud/ocis/v7/ocis-pkg/log"
1616
mtls "go-micro.dev/v4/util/tls"
1717
)
1818

0 commit comments

Comments
 (0)