Skip to content

Commit 5311013

Browse files
SmartHubSolutionsSmartHubSolutions
authored
Merge branch 'master' into attekmi_add_amcom_alias
2 parents 9ef2041 + 615e5df commit 5311013

1,215 files changed

Lines changed: 8351 additions & 5431 deletions

File tree

Some content is hidden

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

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN go mod tidy
2424
RUN go mod vendor
2525
ARG TEST="true"
2626
RUN if [ "$TEST" != "false" ]; then ./validate.sh ; fi
27-
RUN go build -mod=vendor -ldflags "-X github.com/prebid/prebid-server/v3/version.Ver=`git describe --tags | sed 's/^v//'` -X github.com/prebid/prebid-server/v3/version.Rev=`git rev-parse HEAD`" .
27+
RUN go build -mod=vendor -ldflags "-X github.com/prebid/prebid-server/v4/version.Ver=`git describe --tags | sed 's/^v//'` -X github.com/prebid/prebid-server/v4/version.Rev=`git rev-parse HEAD`" .
2828

2929
FROM ubuntu:22.04 AS release
3030
LABEL maintainer="hans.hjort@xandr.com"

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test: deps
1515
ifeq "$(adapter)" ""
1616
./validate.sh
1717
else
18-
go test github.com/prebid/prebid-server/v3/adapters/$(adapter) -bench=.
18+
go test github.com/prebid/prebid-server/v4/adapters/$(adapter) -bench=.
1919
endif
2020

2121
# build-modules generates modules/builder.go file which provides a list of all available modules

‎account/account.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66

77
"github.com/prebid/go-gdpr/consentconstants"
88

9-
"github.com/prebid/prebid-server/v3/config"
10-
"github.com/prebid/prebid-server/v3/errortypes"
11-
"github.com/prebid/prebid-server/v3/metrics"
12-
"github.com/prebid/prebid-server/v3/openrtb_ext"
13-
"github.com/prebid/prebid-server/v3/stored_requests"
14-
"github.com/prebid/prebid-server/v3/util/iputil"
15-
"github.com/prebid/prebid-server/v3/util/jsonutil"
9+
"github.com/prebid/prebid-server/v4/config"
10+
"github.com/prebid/prebid-server/v4/errortypes"
11+
"github.com/prebid/prebid-server/v4/metrics"
12+
"github.com/prebid/prebid-server/v4/openrtb_ext"
13+
"github.com/prebid/prebid-server/v4/stored_requests"
14+
"github.com/prebid/prebid-server/v4/util/iputil"
15+
"github.com/prebid/prebid-server/v4/util/jsonutil"
1616
)
1717

1818
// GetAccount looks up the config.Account object referenced by the given accountID, with access rules applied

‎account/account_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66
"fmt"
77
"testing"
88

9-
"github.com/prebid/prebid-server/v3/config"
10-
"github.com/prebid/prebid-server/v3/errortypes"
11-
"github.com/prebid/prebid-server/v3/metrics"
12-
"github.com/prebid/prebid-server/v3/openrtb_ext"
13-
"github.com/prebid/prebid-server/v3/stored_requests"
14-
"github.com/prebid/prebid-server/v3/util/iputil"
15-
"github.com/prebid/prebid-server/v3/util/ptrutil"
9+
"github.com/prebid/prebid-server/v4/config"
10+
"github.com/prebid/prebid-server/v4/errortypes"
11+
"github.com/prebid/prebid-server/v4/metrics"
12+
"github.com/prebid/prebid-server/v4/openrtb_ext"
13+
"github.com/prebid/prebid-server/v4/stored_requests"
14+
"github.com/prebid/prebid-server/v4/util/iputil"
15+
"github.com/prebid/prebid-server/v4/util/ptrutil"
1616
"github.com/stretchr/testify/assert"
1717
"github.com/stretchr/testify/mock"
1818
)

‎adapters/33across/33across.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77

88
"github.com/prebid/openrtb/v20/adcom1"
99
"github.com/prebid/openrtb/v20/openrtb2"
10-
"github.com/prebid/prebid-server/v3/adapters"
11-
"github.com/prebid/prebid-server/v3/config"
12-
"github.com/prebid/prebid-server/v3/errortypes"
13-
"github.com/prebid/prebid-server/v3/openrtb_ext"
14-
"github.com/prebid/prebid-server/v3/util/jsonutil"
10+
"github.com/prebid/prebid-server/v4/adapters"
11+
"github.com/prebid/prebid-server/v4/config"
12+
"github.com/prebid/prebid-server/v4/errortypes"
13+
"github.com/prebid/prebid-server/v4/openrtb_ext"
14+
"github.com/prebid/prebid-server/v4/util/jsonutil"
1515
)
1616

1717
type TtxAdapter struct {

‎adapters/33across/33across_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package ttx
33
import (
44
"testing"
55

6-
"github.com/prebid/prebid-server/v3/adapters/adapterstest"
7-
"github.com/prebid/prebid-server/v3/config"
8-
"github.com/prebid/prebid-server/v3/openrtb_ext"
6+
"github.com/prebid/prebid-server/v4/adapters/adapterstest"
7+
"github.com/prebid/prebid-server/v4/config"
8+
"github.com/prebid/prebid-server/v4/openrtb_ext"
99
)
1010

1111
func TestJsonSamples(t *testing.T) {

‎adapters/33across/params_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/prebid/prebid-server/v3/openrtb_ext"
7+
"github.com/prebid/prebid-server/v4/openrtb_ext"
88
)
99

1010
// This file actually intends to test static/bidder-params/33across.json

‎adapters/aax/aax.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"net/url"
88

99
"github.com/prebid/openrtb/v20/openrtb2"
10-
"github.com/prebid/prebid-server/v3/adapters"
11-
"github.com/prebid/prebid-server/v3/config"
12-
"github.com/prebid/prebid-server/v3/errortypes"
13-
"github.com/prebid/prebid-server/v3/openrtb_ext"
14-
"github.com/prebid/prebid-server/v3/util/jsonutil"
10+
"github.com/prebid/prebid-server/v4/adapters"
11+
"github.com/prebid/prebid-server/v4/config"
12+
"github.com/prebid/prebid-server/v4/errortypes"
13+
"github.com/prebid/prebid-server/v4/openrtb_ext"
14+
"github.com/prebid/prebid-server/v4/util/jsonutil"
1515
)
1616

1717
type adapter struct {

‎adapters/aax/aax_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"github.com/stretchr/testify/assert"
77

8-
"github.com/prebid/prebid-server/v3/adapters/adapterstest"
9-
"github.com/prebid/prebid-server/v3/config"
10-
"github.com/prebid/prebid-server/v3/openrtb_ext"
8+
"github.com/prebid/prebid-server/v4/adapters/adapterstest"
9+
"github.com/prebid/prebid-server/v4/config"
10+
"github.com/prebid/prebid-server/v4/openrtb_ext"
1111
)
1212

1313
func TestJsonSamples(t *testing.T) {

‎adapters/aax/params_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/prebid/prebid-server/v3/openrtb_ext"
7+
"github.com/prebid/prebid-server/v4/openrtb_ext"
88
)
99

1010
// This file actually intends to test static/bidder-params/aax.json

0 commit comments

Comments
 (0)