Skip to content

Commit 673fdde

Browse files
wansirwansir
authored
Bump github.com/emicklei/go-restful-openapi to v2.9.2-0.20230507070325-d6acc08e570c (kubesphere#5669)
1 parent 16c2dbc commit 673fdde

File tree

160 files changed

+709
-4635
lines changed

Some content is hidden

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

160 files changed

+709
-4635
lines changed

‎LICENSES/vendor/github.com/emicklei/go-restful-openapi/LICENSE renamed to ‎LICENSES/vendor/github.com/emicklei/go-restful-openapi/v2/LICENSE

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES/vendor/github.com/emicklei/go-restful/LICENSE

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎LICENSES/vendor/github.com/emicklei/go-restful/v3/LICENSE

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ require (
2323
github.com/elastic/go-elasticsearch/v5 v5.6.1
2424
github.com/elastic/go-elasticsearch/v6 v6.8.2
2525
github.com/elastic/go-elasticsearch/v7 v7.3.0
26-
github.com/emicklei/go-restful v2.16.0+incompatible
27-
github.com/emicklei/go-restful-openapi v1.4.1
26+
github.com/emicklei/go-restful-openapi/v2 v2.9.1
27+
github.com/emicklei/go-restful/v3 v3.10.2
2828
github.com/evanphx/json-patch v5.6.0+incompatible
2929
github.com/fatih/structs v1.1.0
3030
github.com/fsnotify/fsnotify v1.6.0
@@ -143,7 +143,6 @@ require (
143143
github.com/docker/go-units v0.5.0 // indirect
144144
github.com/edsrzf/mmap-go v1.1.0 // indirect
145145
github.com/efficientgo/tools/core v0.0.0-20220225185207-fe763185946b // indirect
146-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
147146
github.com/emirpasic/gods v1.12.0 // indirect
148147
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
149148
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
@@ -338,9 +337,8 @@ replace (
338337
github.com/elastic/go-elasticsearch/v5 => github.com/elastic/go-elasticsearch/v5 v5.6.1
339338
github.com/elastic/go-elasticsearch/v6 => github.com/elastic/go-elasticsearch/v6 v6.8.2
340339
github.com/elastic/go-elasticsearch/v7 => github.com/elastic/go-elasticsearch/v7 v7.3.0
341-
github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible
342-
github.com/emicklei/go-restful-openapi => github.com/emicklei/go-restful-openapi v1.4.1
343-
github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.10.1
340+
github.com/emicklei/go-restful-openapi/v2 => github.com/emicklei/go-restful-openapi/v2 v2.9.2-0.20230507070325-d6acc08e570c
341+
github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.10.2
344342
github.com/emirpasic/gods => github.com/emirpasic/gods v1.12.0
345343
github.com/evanphx/json-patch => github.com/evanphx/json-patch v5.6.0+incompatible
346344
github.com/evanphx/json-patch/v5 => github.com/evanphx/json-patch/v5 v5.6.0

‎go.sum

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8
264264
github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
265265
github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
266266
github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
267-
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
268267
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
269268
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
270269
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
@@ -496,12 +495,12 @@ github.com/elastic/go-elasticsearch/v7 v7.3.0 h1:H29Nqf9cB9dVxX6LwS+zTDC2D4t9s+8
496495
github.com/elastic/go-elasticsearch/v7 v7.3.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
497496
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
498497
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
499-
github.com/emicklei/go-restful v2.16.0+incompatible h1:rgqiKNjTnFQA6kkhFe16D8epTksy9HQ1MyrbDXSdYhM=
500-
github.com/emicklei/go-restful v2.16.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
501-
github.com/emicklei/go-restful-openapi v1.4.1 h1:SocVTIQWnXyit4dotTrwmncBAjtRaBmfcHjo3XGcCm4=
502-
github.com/emicklei/go-restful-openapi v1.4.1/go.mod h1:kWQ8rQMVQ6G6lePwjDveJ00KjAUr/jq6z1X8DrDP3Gc=
503-
github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
504-
github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
498+
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
499+
github.com/emicklei/go-restful v2.11.2-0.20200112161605-a7c079c43d51+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
500+
github.com/emicklei/go-restful-openapi/v2 v2.9.2-0.20230507070325-d6acc08e570c h1:Fr2oTQtTLMbCXMdhUnnsrDVRTPauJLFYHtNtcc/RSL0=
501+
github.com/emicklei/go-restful-openapi/v2 v2.9.2-0.20230507070325-d6acc08e570c/go.mod h1:I//7paNAkpeGWmBYZ2JLq/timz5YWI/bcUeBMstEfKo=
502+
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
503+
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
505504
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
506505
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
507506
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=

‎pkg/api/alerting/v2alpha1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"strings"
2525
"time"
2626

27-
"github.com/emicklei/go-restful"
27+
"github.com/emicklei/go-restful/v3"
2828
"github.com/pkg/errors"
2929
prommodel "github.com/prometheus/common/model"
3030
"github.com/prometheus/prometheus/model/timestamp"

‎pkg/api/alerting/v2alpha1/types_test.go

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

10-
"github.com/emicklei/go-restful"
10+
"github.com/emicklei/go-restful/v3"
1111
"github.com/prometheus/prometheus/rules"
1212
"github.com/stretchr/testify/assert"
1313
)

‎pkg/api/auditing/v1alpha1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strconv"
2121
"time"
2222

23-
"github.com/emicklei/go-restful"
23+
"github.com/emicklei/go-restful/v3"
2424

2525
"kubesphere.io/kubesphere/pkg/simple/client/auditing"
2626
)

‎pkg/api/auditing/v1alpha1/types_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/emicklei/go-restful"
9+
"github.com/emicklei/go-restful/v3"
1010
"github.com/stretchr/testify/assert"
1111
)
1212

‎pkg/api/events/v1alpha1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strconv"
2121
"time"
2222

23-
"github.com/emicklei/go-restful"
23+
"github.com/emicklei/go-restful/v3"
2424

2525
"kubesphere.io/kubesphere/pkg/simple/client/events"
2626
)

0 commit comments

Comments
 (0)