Skip to content

Commit 633b681

Browse files
committed
add changelog, drop replace
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
1 parent 0f525e9 commit 633b681

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

changelog/unreleased/bump-reva.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ Enhancement: Bump reva
22

33
Bumps reva version
44

5+
https://github.com/owncloud/ocis/pull/10172
56
https://github.com/owncloud/ocis/pull/10157
67
https://github.com/owncloud/ocis/pull/9817

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/cenkalti/backoff v2.2.1+incompatible
1616
github.com/coreos/go-oidc/v3 v3.11.0
1717
github.com/cs3org/go-cs3apis v0.0.0-20240724121416-062c4e3046cb
18-
github.com/cs3org/reva/v2 v2.24.2-0.20240926082340-b5c3c6781528
18+
github.com/cs3org/reva/v2 v2.24.2-0.20240930121615-c33c803283ee
1919
github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
2020
github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e
2121
github.com/egirna/icap-client v0.1.1
@@ -365,8 +365,6 @@ replace github.com/unrolled/secure => github.com/DeepDiver1975/secure v0.0.0-202
365365

366366
replace github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20240807130109-f62bb67e8c90
367367

368-
replace github.com/cs3org/reva/v2 => github.com/butonic/reva/v2 v2.19.1-0.20240926125755-02af5a26695d
369-
370368
// exclude the v2 line of go-sqlite3 which was released accidentally and prevents pulling in newer versions of go-sqlite3
371369
// see https://github.com/mattn/go-sqlite3/issues/965 for more details
372370
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ github.com/bombsimon/logrusr/v3 v3.1.0/go.mod h1:PksPPgSFEL2I52pla2glgCyyd2OqOHA
195195
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
196196
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
197197
github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
198-
github.com/butonic/reva/v2 v2.19.1-0.20240926125755-02af5a26695d h1:AXQmZPvOoLvkVns8IOy/gIoW7MVRiIySadXFhdwGrEg=
199-
github.com/butonic/reva/v2 v2.19.1-0.20240926125755-02af5a26695d/go.mod h1:p7CHBXcg6sSqB+0JMNDfC1S7TSh9FghXkw1kTV3KcJI=
200198
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
201199
github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 h1:3uZCA/BLTIu+DqCfguByNMJa2HVHpXvjfy0Dy7g6fuA=
202200
github.com/bytecodealliance/wasmtime-go/v3 v3.0.2/go.mod h1:RnUjnIXxEJcL6BgCvNyzCCRzZcxCgsZCi+RNlvYor5Q=
@@ -257,6 +255,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
257255
github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
258256
github.com/cs3org/go-cs3apis v0.0.0-20240724121416-062c4e3046cb h1:KmYZDReplv/yfwc1LNYpDcVhVujC3Pasv6WjXx1haSU=
259257
github.com/cs3org/go-cs3apis v0.0.0-20240724121416-062c4e3046cb/go.mod h1:yyP8PRo0EZou3nSH7H4qjlzQwaydPeIRNgX50npQHpE=
258+
github.com/cs3org/reva/v2 v2.24.2-0.20240930121615-c33c803283ee h1:+1sYiuA9LRQIznBNG1AFQoIGdCUCqQT1Dof2rTTsDm8=
259+
github.com/cs3org/reva/v2 v2.24.2-0.20240930121615-c33c803283ee/go.mod h1:p7CHBXcg6sSqB+0JMNDfC1S7TSh9FghXkw1kTV3KcJI=
260260
github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
261261
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
262262
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

vendor/modules.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
367367
github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
368368
github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
369369
github.com/cs3org/go-cs3apis/cs3/types/v1beta1
370-
# github.com/cs3org/reva/v2 v2.24.2-0.20240926082340-b5c3c6781528 => github.com/butonic/reva/v2 v2.19.1-0.20240926125755-02af5a26695d
370+
# github.com/cs3org/reva/v2 v2.24.2-0.20240930121615-c33c803283ee
371371
## explicit; go 1.21
372372
github.com/cs3org/reva/v2/cmd/revad/internal/grace
373373
github.com/cs3org/reva/v2/cmd/revad/runtime
@@ -2445,4 +2445,3 @@ stash.kopano.io/kgol/rndm
24452445
# github.com/egirna/icap-client => github.com/fschade/icap-client v0.0.0-20240802074440-aade4a234387
24462446
# github.com/unrolled/secure => github.com/DeepDiver1975/secure v0.0.0-20240611112133-abc838fb797c
24472447
# github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20240807130109-f62bb67e8c90
2448-
# github.com/cs3org/reva/v2 => github.com/butonic/reva/v2 v2.19.1-0.20240926125755-02af5a26695d

0 commit comments

Comments
 (0)