EXCH-10878 Fetch upstream changes

.github/pull_request_template.md

@@ -1,31 +1,34 @@
 ### 🔧 Type of changes
 - [ ] new bid adapter
-- [ ] update bid adapter
+- [ ] bid adapter update
 - [ ] new feature
 - [ ] new analytics adapter
 - [ ] new module
+- [ ] module update
 - [ ] bugfix
 - [ ] documentation
 - [ ] configuration
+- [ ] dependency update
 - [ ] tech debt (test coverage, refactorings, etc.)
 
 ### ✨ What's the context?
-
-What's the context for the changes? Are there any
-
+What's the context for the changes?
 
 ### 🧠 Rationale behind the change
-
 Why did you choose to make these changes? Were there any trade-offs you had to consider?
 
+### 🔎 New Bid Adapter Checklist
+- [ ] verify email contact works
+- [ ] NO fully dynamic hostnames
+- [ ] geographic host parameters are NOT required
+- [ ] direct use of HTTP is prohibited - *implement an existing Bidder interface that will do all the job*
+- [ ] if the ORTB is just forwarded to the endpoint, use the generic adapter - *define the new adapter as the alias of the generic adapter*
+- [ ] cover an adapter configuration with an integration test
 
 ### 🧪 Test plan
-
 How do you know the changes are safe to ship to production?
 
-
 ### 🏎 Quality check
-
 - [ ] Are your changes following [our code style guidelines](https://github.com/prebid/prebid-server-java/blob/master/docs/developers/code-style.md)?
 - [ ] Are there any breaking changes in your code?
 - [ ] Does your test coverage exceed 90%?

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,48 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up JDK
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 21
+
+    - name: Cache Maven packages
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Build with Maven
+      run: mvn -B package --file extra/pom.xml
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
+      with:
+        category: "/language:${{ matrix.language }}"

.github/workflows/docker-image-publish.yml

@@ -1,10 +1,9 @@
 name: Publish Docker image for new tag/release
 
 on:
-  workflow_run:
-    workflows: [Publish release]
-    types:
-      - completed
+  push:
+    tags:
+      - '*'
 
 env:
   REGISTRY: ghcr.io
@@ -20,41 +19,54 @@ jobs:
     strategy:
       matrix:
         java: [ 21 ]
-        dockerfile-path: [Dockerfile, extra/Dockerfile]
+        dockerfile-path: [Dockerfile, Dockerfile-modules]
         include:
           - dockerfile-path: Dockerfile
             build-cmd: mvn clean package -Dcheckstyle.skip -Dmaven.test.skip=true
             package-name: ghcr.io/${{ github.repository }}
-          - dockerfile-path: extra/Dockerfile
+
+          - dockerfile-path: Dockerfile-modules
             build-cmd: mvn clean package --file extra/pom.xml -Dcheckstyle.skip -Dmaven.test.skip=true
             package-name: ghcr.io/${{ github.repository }}-bundle
     steps:
+      - name: Check out Repository
+        uses: actions/checkout@v4
+
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           cache: 'maven'
           java-version: ${{ matrix.java }}
+
       - name: Build .jar via Maven
         run: ${{ matrix.build-cmd }}
-      - name: Checkout repository
-        uses: actions/checkout@v4
+
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Extract metadata (tags, labels) for Docker Image
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ matrix.package-name }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ${{ matrix.dockerfile-path }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release-drafter.yml

@@ -2,27 +2,20 @@ name: Publish release
 
 on:
   push:
-    branches:
-      - master
+    tags:
+      - '*'
 
 jobs:
   update_release_draft:
     name: Publish release with notes
     runs-on: ubuntu-latest
-    if: "contains(github.event.head_commit.message, 'Prebid Server prepare release ')"
     steps:
-      - name: Extract tag from commit message
-        run: |
-          target_tag=${COMMIT_MSG#"Prebid Server prepare release "}
-          echo "TARGET_TAG=$target_tag" >> $GITHUB_ENV
-        env:
-          COMMIT_MSG: ${{ github.event.head_commit.message }}
       - name: Create and publish release
         uses: release-drafter/release-drafter@v5
         with:
           config-name: release-drafter-config.yml
           publish: true
-          name: "v${{ env.TARGET_TAG }}"
-          tag: ${{ env.TARGET_TAG }}
+          name: "v${{ github.ref_name }}"
+          tag: ${{ github.ref_name }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/slack-stale-pr.yml

@@ -0,0 +1,27 @@
+name: Post Stale PRs To Slack
+
+on:
+  # run Monday 9am and on-demand
+  workflow_dispatch:
+  schedule:
+    - cron:  '0 9 * * 1'
+
+jobs:
+  fetch-PRs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch pull requests
+        id: local
+        uses: paritytech/[email protected]
+        with:
+          GITHUB_TOKEN: ${{ github.token }}
+          days-stale: 14
+          ignoredLabels: "blocked"
+      - name: Post to a Slack channel
+        id: slack
+        uses: slackapi/[email protected]
+        with:
+          channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
+          slack-message: "${{ steps.local.outputs.message }}"
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

README.md

@@ -100,12 +100,30 @@ There are a couple of 'hello world' test requests described in sample/requests/R
 
 ## Running Docker image
 
-Starting from PBS Java v2.9, you can download prebuilt Docker images from [GitHub Packages](https://github.com/orgs/prebid/packages?repo_name=prebid-server-java) page,
-and use them instead of plain .jar files. This prebuilt images are delivered with or without extra modules.
+Starting from PBS Java v3.11.0, you can download prebuilt Docker images from [GitHub Packages](https://github.com/orgs/prebid/packages?repo_name=prebid-server-java) page,
+and use them instead of plain .jar files. These prebuilt images are delivered in 2 flavors:
+- https://github.com/prebid/prebid-server-java/pkgs/container/prebid-server-java is a bare PBS and doesn't contain modules.
+- https://github.com/prebid/prebid-server-java/pkgs/container/prebid-server-java-bundle is a "bundle" that contains PBS and all the modules.
 
-In order to run such image correctly, you should attach PBS config file. Easiest way is to mount config file into container,
+To run PBS from image correctly, you should provide the PBS config file. The easiest way is to mount the config file into the container,
 using [--mount or --volume (-v) Docker CLI arguments](https://docs.docker.com/engine/reference/commandline/run/).
-Keep in mind, that config file should be mounted into specific location: ```/app/prebid-server/``` or ```/app/prebid-server/conf/```.
+Keep in mind that the config file should be mounted into a specific location: ```/app/prebid-server/conf/``` or ```/app/prebid-server/```.
+
+PBS follows the regular Spring Boot config load hierarchy and type.
+For simple configuration, a single `application.yaml` mounted to `/app/prebid-server/conf/` will be enough.
+Please consult [Spring Externalized Configuration](https://docs.spring.io/spring-boot/reference/features/external-config.html) for all possible ways to configure PBS.
+
+You can also supply command-line parameters through `JAVA_OPTS` environment variable which will be appended to the `java` command before the `-jar ...` parameter.
+Please pay attention to line breaks and escape them if needed.
+
+Example execution using sample configuration:
+```shell
+docker run --rm -v ./sample:/app/prebid-server/sample:ro -p 8060:8060 -p 8080:8080 ghcr.io/prebid/prebid-server-java:latest --spring.config.additional-location=sample/configs/prebid-config.yaml
+```
+or
+```shell
+docker run --rm -v ./sample:/app/prebid-server/sample:ro -p 8060:8060 -p 8080:8080 -e JAVA_OPTS=-Dspring.config.additional-location=sample/configs/prebid-config.yaml ghcr.io/prebid/prebid-server-java:latest
+```
 
 # Documentation