Merge branch 'main' into commons-net-cve

.asf.yaml

@@ -11,7 +11,10 @@ github:
     - reactive
     - reactive-streams
     - messaging
-
+
+  protected_tags:
+    - "v*.*.*"
+
   features:
     # Enable wiki for documentation
     wiki: false

.git-blame-ignore-revs

@@ -1,5 +1,6 @@
 # scalafmt
 433daa5c5b0b2c3f85c6f1c7e62a4f4171856468
+5e339991b14da475b382dcbb192efc391aab21c1
 
 # manual
 1225828a913a61eb48123410077123c737c1b84e

.github/workflows/check-build-test.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
   push:
     branches:
-      - master
       - main
     tags-ignore:
       - v*
@@ -23,26 +22,22 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      # temporarily do full checkout
-      #  with: # https://github.com/olafurpg/setup-scala#faster-checkout-of-big-repos
-      #    fetch-depth: 100
-
-      #- name: Fetch tags
-      #  run: git fetch --depth=100 origin +refs/tags/*:refs/tags/*
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: Setup Java 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8
 
       - name: Cache Coursier cache
         uses: coursier/cache-action@v6.4.0
 
-      # temporarily remove mima checks
-      - name: "Code style, compile tests, MiMa. Run locally with: sbt +~2.13 \"verifyCodeFmt; Test/compile; mimaReportBinaryIssues\""
-        run: sbt "verifyCodeFmt; +Test/compile"
+      - name: "Code style, compile tests, MiMa. Run locally with: sbt \"javafmtCheckAll; +Test/compile; +mimaReportBinaryIssues\""
+        run: sbt "javafmtCheckAll; +Test/compile; +mimaReportBinaryIssues"
 
   documentation:
     name: ScalaDoc, Documentation with Paradox
@@ -52,16 +47,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      # temporarily do full checkout
-      #  with: # https://github.com/olafurpg/setup-scala#faster-checkout-of-big-repos
-      #    fetch-depth: 100
-
-      #- name: Fetch tags
-      #  run: git fetch --depth=100 origin +refs/tags/*:refs/tags/*
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: Setup Java 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11
@@ -137,13 +129,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      # temporarily do full checkout
-      #  with: # gh-detect-changes.sh compares with the target branch
-      #    fetch-depth: 0
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: Setup Java 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8

.github/workflows/dependency-graph.yml

@@ -0,0 +1,12 @@
+name: Update Dependency Graph
+on:
+  push:
+    branches:
+      - main # default branch of the project
+jobs:
+  dependency-graph:
+    name: Update Dependency Graph
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: scalacenter/sbt-dependency-submission@v2

.github/workflows/format.yml

@@ -12,13 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
 
       - name: Check project is formatted
         uses: jrouly/scalafmt-native-action@v2
         with:
-          version: '3.7.1'
+          version: '3.7.11'
           arguments: '--list --mode diff-ref=origin/main'

.github/workflows/headers.yml

@@ -11,10 +11,13 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: Setup Java 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8

.github/workflows/link-validator.yml

@@ -10,15 +10,13 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-        with: # https://github.com/olafurpg/setup-scala#faster-checkout-of-big-repos
-          fetch-depth: 100
-
-      - name: Fetch tags
-        run: git fetch --depth=100 origin +refs/tags/*:refs/tags/*
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: Setup Java 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11

.github/workflows/nightly-builds.yaml

@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8

.github/workflows/nightly-pekko-1.1-builds.yaml

@@ -0,0 +1,43 @@
+name: Nightly Pekko 1.1 Builds
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+permissions: {}
+
+concurrency:
+  # Only run once for latest commit per ref and cancel other (previous) runs.
+  group: pekko-1.1-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test-compile:
+    name: Compile
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        JDK: [ 8, 11, 17 ]
+    env:
+      JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
+
+      - name: Setup Java ${{ matrix.JDK }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: ${{ matrix.JDK }}
+
+      - name: Cache Coursier cache
+        uses: coursier/cache-action@v6.4.0
+
+      - name: "compile, including  tests. Run locally with: sbt -Dpekko.build.pekko.version=main +Test/compile"
+        run: sbt -Dpekko.build.pekko.version=main +Test/compile

.github/workflows/publish-1.0-docs.yml

@@ -0,0 +1,65 @@
+name: Publish 1.0 docs
+
+on:
+  workflow_dispatch:
+
+jobs:
+  publish:
+    # runs on main repo only
+    if: github.repository == 'apache/incubator-pekko-connectors'
+    name: Publish
+    runs-on: ubuntu-20.04
+    env:
+      JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
+
+      - name: Setup Java 8
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 8
+
+      - name: Build Documentation
+        run: |-
+          sbt "set ThisBuild / version := \"1.0.1\"; docs/paradox; unidoc"
+
+      # Create directory structure upfront since rsync does not create intermediate directories otherwise
+      - name: Create directory structure
+        run: |-
+          mkdir -p target/nightly-docs/docs/pekko-connectors/1.0.1/
+          mkdir -p target/nightly-docs/docs/pekko-connectors/1.0/
+          cp -r docs/target/paradox/site/main/ target/nightly-docs/docs/pekko-connectors/1.0.1/docs
+          cp -r docs/target/paradox/site/main/ target/nightly-docs/docs/pekko-connectors/1.0/docs
+          rm -r docs/target/paradox/site/main/
+          cp -r target/scala-2.13/unidoc target/nightly-docs/docs/pekko-connectors/1.0.1/api
+          cp -r target/scala-2.13/unidoc target/nightly-docs/docs/pekko-connectors/1.0/api
+          rm -r target/scala-2.13/unidoc
+
+      - name: Upload 1.0.x docs
+        uses: ./.github/actions/sync-nightlies
+        with:
+          upload: true
+          switches: --archive --compress --update --delete --progress --relative
+          local_path: target/nightly-docs/./docs/pekko-connectors/1.0.1 # The intermediate dot is to show `--relative` which paths to operate on
+          remote_path: ${{ secrets.NIGHTLIES_RSYNC_PATH }}/pekko/
+          remote_host: ${{ secrets.NIGHTLIES_RSYNC_HOST }}
+          remote_port: ${{ secrets.NIGHTLIES_RSYNC_PORT }}
+          remote_user: ${{ secrets.NIGHTLIES_RSYNC_USER }}
+          remote_key: ${{ secrets.NIGHTLIES_RSYNC_KEY }}
+
+      - name: Upload 1.0 docs
+        uses: ./.github/actions/sync-nightlies
+        with:
+          upload: true
+          switches: --archive --compress --update --delete --progress --relative
+          local_path: target/nightly-docs/./docs/pekko-connectors/1.0 # The intermediate dot is to show `--relative` which paths to operate on
+          remote_path: ${{ secrets.NIGHTLIES_RSYNC_PATH }}/pekko/
+          remote_host: ${{ secrets.NIGHTLIES_RSYNC_HOST }}
+          remote_port: ${{ secrets.NIGHTLIES_RSYNC_PORT }}
+          remote_user: ${{ secrets.NIGHTLIES_RSYNC_USER }}
+          remote_key: ${{ secrets.NIGHTLIES_RSYNC_KEY }}

.github/workflows/publish-nightly.yml

@@ -15,13 +15,13 @@ jobs:
       JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+          fetch-tags: true
           fetch-depth: 0
 
       - name: Setup Java 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8
@@ -48,7 +48,7 @@ jobs:
         with:
           upload: true
           switches: --archive --compress --update --delete --progress --relative
-          local_path: target/nightly-docs/./docs/pekko-connectors/ # The intermediate dot is to show `--relative` which paths to operate on
+          local_path: target/nightly-docs/./docs/pekko-connectors/${{ github.ref_name }}-snapshot # The intermediate dot is to show `--relative` which paths to operate on
           remote_path: ${{ secrets.NIGHTLIES_RSYNC_PATH }}/pekko/
           remote_host: ${{ secrets.NIGHTLIES_RSYNC_HOST }}
           remote_port: ${{ secrets.NIGHTLIES_RSYNC_PORT }}

.scalafmt.conf

@@ -1,4 +1,4 @@
-version                                  = 3.7.1
+version                                  = 3.7.11
 runner.dialect                           = scala213
 project.git                              = true
 style                                    = defaultWithAlign

CONTRIBUTING.md

@@ -81,6 +81,12 @@ Example:
     * Details 2
     * Details 3
 
+## Applying code style to the project
+
+The project uses [scalafmt](https://scalameta.org/scalafmt/) to ensure code quality which is automatically checked on
+every PR. If you would like to check for any potential code style problems locally you can run `sbt checkCodeStyle`
+and if you want to apply the code style then you can run `sbt applyCodeStyle`.
+
 ### Ignoring formatting commits in git blame
 
 Throughout the history of the codebase various formatting commits have been applied as the scalafmt style has evolved over time, if desired
@@ -96,5 +102,4 @@ git config blame.ignoreRevsFile .git-blame-ignore-revs
 1. [GitHub actions](https://github.com/apache/incubator-pekko-connectors/actions) automatically merge the code, builds it, runs the tests and sets Pull Request status accordingly of results in GitHub.
 1. [Scalafmt](http://scalameta.org/scalafmt/) enforces some of the code style rules.
 1. [sbt-header plugin](https://github.com/sbt/sbt-header) manages consistent copyright headers in every source file.
-1. A GitHub bot checks whether you've signed the Lightbend CLA. 
 1. Enabling `fatalWarnings := true` for all projects.