Skip to content
This repository was archived by the owner on Feb 4, 2021. It is now read-only.

Commit 507b92f

Browse files
authored
Merge pull request #158 from ProgrammingLab/gedorinku/hydra_1.0.3
Bump hydra to v1.0.3
2 parents f2ffa9a + db6c221 commit 507b92f

File tree

5 files changed

+701
-24
lines changed

5 files changed

+701
-24
lines changed

app/di/client_component.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package di
33
import (
44
"context"
55

6-
"github.com/ory/hydra/sdk/go/hydra"
6+
hydra "github.com/ory/hydra-legacy-sdk"
77
"github.com/pkg/errors"
88

99
"github.com/ProgrammingLab/prolab-accounts/app/config"

app/server/oauth_server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"time"
1010

1111
"github.com/izumin5210/grapi/pkg/grapiserver"
12-
"github.com/ory/hydra/sdk/go/hydra/swagger"
12+
"github.com/ory/hydra-legacy-sdk/swagger"
1313
"github.com/pkg/errors"
1414
"golang.org/x/crypto/bcrypt"
1515
"google.golang.org/grpc/status"

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
- TEST_DATABASE_URL=${TEST_DATABASE_URL_RIDGEPOLE}
2626

2727
hydra-migrate:
28-
image: oryd/hydra:v1.0.0-rc.10
28+
image: oryd/hydra:v1.0.3
2929
depends_on:
3030
- pg
3131
environment:
@@ -36,7 +36,7 @@ services:
3636
restart: on-failure
3737

3838
hydra:
39-
image: oryd/hydra:v1.0.0-rc.10
39+
image: oryd/hydra:v1.0.3
4040
depends_on:
4141
- hydra-migrate
4242
ports:

go.mod

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,49 @@ module github.com/ProgrammingLab/prolab-accounts
33
go 1.12
44

55
require (
6+
contrib.go.opencensus.io/exporter/stackdriver v0.7.0 // indirect
7+
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 // indirect
68
github.com/PuerkitoBio/goquery v1.5.0 // indirect
79
github.com/go-redis/redis v6.14.1+incompatible
810
github.com/gobuffalo/envy v1.7.0 // indirect
911
github.com/gobuffalo/packr/v2 v2.1.0
1012
github.com/gobwas/glob v0.2.3
11-
github.com/gofrs/uuid v3.2.0+incompatible // indirect
1213
github.com/gogo/protobuf v1.2.1
13-
github.com/golang/protobuf v1.3.1
14-
github.com/grpc-ecosystem/grpc-gateway v1.8.6
14+
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
15+
github.com/golang/protobuf v1.3.2
16+
github.com/grpc-ecosystem/grpc-gateway v1.9.6
1517
github.com/izumin5210/grapi v0.4.0
1618
github.com/joho/godotenv v1.3.0
1719
github.com/jordan-wright/email v0.0.0-20180115032944-94ae17dedda2
1820
github.com/kat-co/vala v0.0.0-20140812221447-bfe9b50e828a
1921
github.com/kelseyhightower/envconfig v1.3.0
2022
github.com/lib/pq v1.0.0
21-
github.com/mattn/go-isatty v0.0.4 // indirect
2223
github.com/minio/minio-go v0.0.0-20190207005939-34f2b94c43ca
2324
github.com/mmcdole/gofeed v1.0.0-beta2
2425
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
2526
github.com/mwitkow/go-proto-validators v0.0.0-20190212092829-1f388280e944
26-
github.com/onsi/ginkgo v1.7.0 // indirect
27-
github.com/onsi/gomega v1.4.3 // indirect
28-
github.com/ory/hydra v0.0.0-20181218121201-bdb6634e3d87
27+
github.com/openzipkin/zipkin-go v0.1.1 // indirect
28+
github.com/ory/hydra v1.0.3
29+
github.com/ory/hydra-legacy-sdk v0.0.0-20190409103449-1f564942be76
30+
github.com/ory/sqlcon v0.0.7 // indirect
2931
github.com/pkg/errors v0.8.1
3032
github.com/rs/cors v1.6.0
3133
github.com/shurcooL/githubv4 v0.0.0-20190119021625-d9689b595017
3234
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
33-
github.com/spf13/afero v1.2.0 // indirect
34-
github.com/spf13/viper v1.3.1
35+
github.com/spf13/viper v1.4.0
3536
github.com/volatiletech/inflect v0.0.0-20170731032912-e7201282ae8d // indirect
3637
github.com/volatiletech/null v8.0.0+incompatible
3738
github.com/volatiletech/sqlboiler v3.2.0+incompatible
3839
github.com/xanzy/go-gitlab v0.13.0 // indirect
39-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
40-
golang.org/x/image v0.0.0-20190424155947-59b11bec70c7
41-
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 // indirect
42-
golang.org/x/net v0.0.0-20190311183353-d8887717615a
43-
golang.org/x/oauth2 v0.0.0-20190111185915-36a7019397c4
44-
golang.org/x/sync v0.0.0-20190412183630-56d357773e84
45-
golang.org/x/sys v0.0.0-20190219092855-153ac476189d // indirect
46-
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 // indirect
47-
google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922
48-
google.golang.org/grpc v1.20.1
40+
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
41+
golang.org/x/image v0.0.0-20190802002840-cff245a6509b
42+
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
43+
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
44+
golang.org/x/sync v0.0.0-20190423024810-112230192c58
45+
google.golang.org/genproto v0.0.0-20190817000702-55e96fffbd48
46+
google.golang.org/grpc v1.23.0
4947
gopkg.in/ini.v1 v1.42.0 // indirect
50-
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a // indirect
48+
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
5149
)
5250

5351
replace github.com/gofrs/uuid v0.0.0-20180830191909-370558f003bf => github.com/gofrs/uuid/v3 v3.1.1

0 commit comments

Comments
 (0)