Skip to content

Commit aad5fae

Browse files
SaigredanSaigredan
authored
Merge branch 'prebid:master' into master
2 parents 6f1f235 + a39fde9 commit aad5fae

691 files changed

Lines changed: 17807 additions & 6610 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.

‎.github/workflows/pr-functional-tests.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Functional tests
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- 'docs/**'
7+
- '.github/**'
8+
branches:
9+
- master
10+
release:
11+
types:
12+
- created
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
18+
strategy:
19+
matrix:
20+
java: [ 11 ]
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
25+
- name: Set up JDK
26+
uses: actions/setup-java@v1
27+
with:
28+
java-version: ${{ matrix.java }}
29+
30+
- name: Cache Maven dependendcies
31+
uses: actions/cache@v1
32+
with:
33+
path: ~/.m2/repository
34+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
35+
restore-keys: |
36+
${{ runner.os }}-maven-
37+
38+
- name: Build with Maven
39+
run: mvn -B verify -DskipUnitTests=true --file extra/pom.xml

.github/workflows/pullrequest.yml renamed to .github/workflows/pr-java-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java: [ 11 ]
2121

2222
steps:
23-
- uses: actions/checkout@v1
23+
- uses: actions/checkout@v2
2424

2525
- name: Set up JDK
2626
uses: actions/setup-java@v1

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
target/
1313

1414
.DS_Store
15+
16+
.allure/

‎.maven-dockerinclude‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
target/*.jar
2+
src/main/docker/*

‎Dockerfile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM openjdk:11-jre-slim
2+
3+
WORKDIR /app/prebid-server
4+
5+
VOLUME /app/prebid-server/conf
6+
VOLUME /app/prebid-server/data
7+
8+
COPY src/main/docker/run.sh ./
9+
COPY src/main/docker/application.yaml ./
10+
COPY target/prebid-server.jar ./
11+
12+
EXPOSE 8080
13+
EXPOSE 8060
14+
15+
ENTRYPOINT [ "/app/prebid-server/run.sh" ]

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ and verify response status is `200 OK`.
9292
# Documentation
9393

9494
## Development
95-
- [Endpoints](docs/endpoints)
96-
- [Adding new bidder](docs/developers/add-new-bidder.md)
97-
- [Adding new analytics module](docs/developers/add-new-analytics-module.md)
95+
- [Endpoints](https://docs.prebid.org/prebid-server/endpoints/pbs-endpoint-overview.html)
96+
- [Adding new bidder](https://docs.prebid.org/prebid-server/developers/add-new-bidder-java.html)
97+
- [Adding new analytics module](https://docs.prebid.org/prebid-server/developers/pbs-build-an-analytics-adapter.html#adding-an-analytics-adapter-in-pbs-java)
9898
- [Adding viewability support](docs/developers/add-viewability-vendors.md)
9999
- [Auction result post-processing](docs/developers/auction-result-post-processing.md)
100-
- [Cookie Syncs](docs/developers/cookie-syncs.md)
100+
- [Cookie Syncs](https://docs.prebid.org/prebid-server/developers/pbs-cookie-sync.html)
101101
- [Stored Requests](docs/developers/stored-requests.md)
102102
- [Unit Tests](docs/developers/unit-tests.md)
103103
- [GDPR](docs/developers/gdpr.md)

‎docs/application-settings.md‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ There are two ways to configure application settings: database and file. This do
2020
the bid and log an operational warning.
2121
- `auction.events.enabled` - enables events for account if true
2222
- `privacy.ccpa.enabled` - enables gdpr verifications if true. Has higher priority than configuration in application.yaml.
23-
- `privacy.ccpa.integration-enabled.web` - overrides `ccpa.enforce` property behaviour for web requests type.
24-
- `privacy.ccpa.integration-enabled.amp` - overrides `ccpa.enforce` property behaviour for amp requests type.
25-
- `privacy.ccpa.integration-enabled.app` - overrides `ccpa.enforce` property behaviour for app requests type.
26-
- `privacy.ccpa.integration-enabled.video` - overrides `ccpa.enforce` property behaviour for video requests type.
23+
- `privacy.ccpa.channel-enabled.web` - overrides `ccpa.enforce` property behaviour for web requests type.
24+
- `privacy.ccpa.channel-enabled.amp` - overrides `ccpa.enforce` property behaviour for amp requests type.
25+
- `privacy.ccpa.channel-enabled.app` - overrides `ccpa.enforce` property behaviour for app requests type.
26+
- `privacy.ccpa.channel-enabled.video` - overrides `ccpa.enforce` property behaviour for video requests type.
2727
- `privacy.gdpr.enabled` - enables gdpr verifications if true. Has higher priority than configuration in
2828
application.yaml.
29-
- `privacy.gdpr.integration-enabled.web` - overrides `privacy.gdpr.enabled` property behaviour for web requests type.
30-
- `privacy.gdpr.integration-enabled.amp` - overrides `privacy.gdpr.enabled` property behaviour for amp requests type.
31-
- `privacy.gdpr.integration-enabled.app` - overrides `privacy.gdpr.enabled` property behaviour for app requests type.
32-
- `privacy.gdpr.integration-enabled.video` - overrides `privacy.gdpr.enabled` property behaviour for video requests
29+
- `privacy.gdpr.channel-enabled.web` - overrides `privacy.gdpr.enabled` property behaviour for web requests type.
30+
- `privacy.gdpr.channel-enabled.amp` - overrides `privacy.gdpr.enabled` property behaviour for amp requests type.
31+
- `privacy.gdpr.channel-enabled.app` - overrides `privacy.gdpr.enabled` property behaviour for app requests type.
32+
- `privacy.gdpr.channel-enabled.video` - overrides `privacy.gdpr.enabled` property behaviour for video requests
3333
type.
3434
- `privacy.gdpr.purposes.[p1-p10].enforce-purpose` - define type of enforcement confirmation: `no`/`basic`/`full`.
3535
Default `full`
@@ -105,14 +105,14 @@ Here's an example YAML file containing account-specific settings:
105105
privacy:
106106
ccpa:
107107
enabled: true
108-
integration-enabled:
108+
channel-enabled:
109109
video: true
110110
web: true
111111
app: true
112112
amp: true
113113
gdpr:
114114
enabled: true
115-
integration-enabled:
115+
channel-enabled:
116116
video: true
117117
web: true
118118
app: true
@@ -438,30 +438,27 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8'
438438
The following Mysql SQL query could be used to construct a JSON document of required shape on the fly:
439439

440440
```mysql-sql
441-
SELECT
442-
JSON_MERGE_PATCH(config, JSON_OBJECT(
443-
'id', uuid,
444-
'status', status,
445-
'auction', JSON_OBJECT(
446-
'price-granularity', price_granularity,
447-
'banner-cache-ttl', banner_cache_ttl,
448-
'video-cache-ttl', video_cache_ttl,
449-
'truncate-target-attr', truncate_target_attr,
450-
'default-integration', default_integration,
451-
'bid-validations', bid_validations,
452-
'events', JSON_OBJECT(
453-
'enabled', NOT NOT(events_enabled)
454-
)
455-
),
456-
'privacy', JSON_OBJECT(
457-
'ccpa', JSON_OBJECT(
458-
'enabled', NOT NOT(enforce_ccpa)
459-
),
460-
'gdpr', tcf_config
461-
),
462-
'analytics', analytics_config
463-
)) as consolidated_config
464-
FROM accounts_account
465-
WHERE uuid = %ACCOUNT_ID%
466-
LIMIT 1;
441+
SELECT JSON_MERGE_PATCH(
442+
JSON_OBJECT(
443+
'id', uuid,
444+
'status', status,
445+
'auction', JSON_OBJECT(
446+
'price-granularity', price_granularity,
447+
'banner-cache-ttl', banner_cache_ttl,
448+
'video-cache-ttl', video_cache_ttl,
449+
'truncate-target-attr', truncate_target_attr,
450+
'default-integration', default_integration,
451+
'bid-validations', bid_validations,
452+
'events', JSON_OBJECT('enabled', NOT NOT (events_enabled))
453+
),
454+
'privacy', JSON_OBJECT(
455+
'ccpa', JSON_OBJECT('enabled', NOT NOT (enforce_ccpa)),
456+
'gdpr', tcf_config
457+
),
458+
'analytics', analytics_config
459+
),
460+
COALESCE(config, '{}')) as consolidated_config
461+
FROM accounts_account
462+
WHERE uuid = %ACCOUNT_ID%
463+
LIMIT 1
467464
```

‎docs/bidders/appnexus.md‎

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

‎docs/bidders/audienceNetwork.md‎

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

‎docs/bidders/beachfront.md‎

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

0 commit comments

Comments
 (0)