Bump tomcat-juli from 10.0.23 to 10.1.6

.asf.yaml

@@ -0,0 +1,38 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# .asf.yaml documentation:
+# https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
+notifications:
+  commits: [email protected]
+  # issues and PRs send their own emails to devs
+  issues: [email protected]
+  pullrequests: [email protected]
+  jira_options: link label
+github:
+  description: "Apache Log4j 2 is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x, and provides many of the improvements available in Logback while fixing some inherent problems in Logback's architecture."
+  homepage: https://logging.apache.org/log4j/2.x/
+  labels:
+    - apache
+    - api
+    - java
+    - library
+    - log4j
+    - log4j2
+    - logging
+  protected_branches:
+    # Prevent force pushes to primary branches
+    master: {}
+    release-2.x: {}

.gitattributes

@@ -1 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 mvnw.cmd eol=crlf

.github/dependabot.yml

@@ -0,0 +1,32 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 50
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 5
+- package-ecosystem: "docker"
+  directory: "/"
+  schedule:
+    interval: weekly

.github/workflows/benchmark.yml

@@ -0,0 +1,234 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache license, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the license for the specific language governing permissions and
+# limitations under the license.
+
+name: benchmark
+
+on: [ workflow_dispatch ]
+
+jobs:
+
+  build:
+
+    if: github.repository == 'apache/logging-log4j2'
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8   # 3.1.0
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc   # 3.6.0
+        with:
+          distribution: temurin
+          java-version: 11
+          java-package: jdk
+          architecture: x64
+          cache: maven
+
+      - name: Build with Maven
+        shell: bash
+        run: |
+          ./mvnw \
+            --show-version --batch-mode --errors --no-transfer-progress \
+            -DskipTests=true \
+            --projects log4j-perf \
+            --also-make \
+            package
+
+      - name: Upload built sources
+        uses: actions/upload-artifact@v2
+        with:
+          name: benchmarks.jar
+          path: log4j-perf/target/benchmarks.jar
+
+  run:
+
+    needs: build
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ macos-latest, ubuntu-latest, windows-latest ]
+        jdk: [ 11, 17 ]
+        concurrency: [ 1, 8 ]
+        jmhCommand:
+          - "-t $CONCURRENCY -f 3 -wi 3 -w 10s -i 4 -r 20s -prof gc -prof perfnorm -rf json -rff results-layout-jtl.json '.*JsonTemplateLayoutBenchmark.*Jtl4EcsLayout'"
+          - "-t $CONCURRENCY -f 3 -wi 3 -w 10s -i 4 -r 20s -prof gc -prof perfnorm -rf json -rff results-util-instant-format.json '.*InstantFormatBenchmark.*'"
+
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8   # 3.1.0
+
+      - name: Download built sources
+        uses: actions/download-artifact@v2
+        with:
+          name: benchmarks.jar
+          path: log4j-perf/target
+
+      - name: Set up JDK ${{ matrix.jdk }}
+        if: matrix.jdk != 11
+        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc   # 3.6.0
+        with:
+          distribution: temurin
+          java-version: ${{ matrix.jdk }}
+          java-package: jdk
+          architecture: x64
+          cache: maven
+
+      - name: Run benchmarks
+        timeout-minutes: 120
+        shell: bash
+        run: |
+          export CONCURRENCY=${{ matrix.concurrency }}
+          java \
+            -jar log4j-perf/target/benchmarks.jar \
+            ${{ matrix.jmhCommand }}
+
+      - name: Stage benchmark results for commit
+        shell: bash
+        run: |
+
+          # Determine the artifact version.
+          set -x
+          ./mvnw \
+            --batch-mode --quiet \
+            -DforceStdout=true \
+            -Dexpression=project.version \
+            help:evaluate \
+            | tee mvnw-project-version.out
+          echo
+
+          # Determine certain file path properties.
+          export REVISION=$(<mvnw-project-version.out)
+          export BRANCH_NAME=$(echo "$GITHUB_REF" | sed 's/refs\/heads\///g')
+          export INSTANT=$(date -u +%Y%m%d)
+          export OS_NAME=$(echo "${{ matrix.os }}" | sed 's/-latest//g')
+          export RUN_ID=$(printf "%020d" "$GITHUB_RUN_ID")
+
+          # Move and stage the result files.
+          for SRC_FILEPATH in results-*.json; do
+            export BENCHMARK_NAME=$(basename "$SRC_FILEPATH" | sed 's/^results-//g' | sed 's/\.json$//g')
+            export DST_FILEPATH="benchmark/results/$REVISION/$BRANCH_NAME-$INSTANT-$RUN_ID/$BENCHMARK_NAME-O$OS_NAME-J${{ matrix.jdk }}-C${{ matrix.concurrency }}.json"
+            mkdir -v -p $(dirname "$DST_FILEPATH")
+            mv -v "$SRC_FILEPATH" "$DST_FILEPATH"
+            git add "$DST_FILEPATH"
+          done
+
+          # Stash changes for commit.
+          git stash save
+          git clean -f
+
+      - name: Commit benchmark results
+        timeout-minutes: 1
+        shell: bash
+        run: |
+
+          # Checkout the results branch.
+          set -x
+          git fetch origin gh-pages
+          git checkout -B gh-pages origin/gh-pages
+
+          # Stage the stashed changes.
+          # (`show + apply` is preferred over `pop`, since the latter fails if file already exists.)
+          git stash show -p | git apply
+          git add benchmark/results
+          git status --porcelain
+          test $(git status --porcelain | wc -l) -gt 0 || exit 0
+
+          # Commit changes.
+          git config user.name github-actions
+          git config user.email [email protected]
+          git commit -a -m "Add benchmark results for ${{ runner.os }}, JDK ${{ matrix.jdk }}, and concurrency ${{ matrix.concurrency }}."
+
+          # Push changes in a loop to allow concurrent repository modifications.
+          export RETRY=0
+          while [ 1 ]; do
+            set +e
+            git push origin gh-pages 2>&1 | tee git-push.out
+            if [ $? -eq 0 ]; then
+              exit 0
+            else
+              set -e
+              let RETRY+=1
+              echo "retry #$RETRY"
+              git pull -r origin gh-pages
+            fi
+          done
+
+  index:
+
+    runs-on: ubuntu-latest
+    needs: run
+
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8   # 3.1.0
+        with:
+          ref: gh-pages
+
+      - name: Setup Python 3
+        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984   # 4.3.0
+        with:
+          python-version: 3.x
+
+      - name: Index benchmark results
+        timeout-minutes: 1
+        shell: bash
+        run: |
+
+          # Configure the git user.
+          git config user.name github-actions
+          git config user.email [email protected]
+
+          # Push changes in a loop to allow concurrent repository modifications.
+          export RETRY=0
+          export INDEX_FILEPATH=benchmark/results/index.json
+          while [ 1 ]; do
+
+            # Generate the index file.
+            python -c '\
+              import json, os, re;\
+              filepaths=[re.sub("^benchmark/results/", "", os.path.join(root,filename)) \
+                  for (root, dirs, filenames) in os.walk("benchmark/results") \
+                      for filename in filenames]; \
+              filepaths.remove("index.json"); \
+              print(json.dumps(filepaths))' \
+            >"$INDEX_FILEPATH"
+
+            # Exit if there are no changes, that is, a concurrent job has indexed all results.
+            git diff --exit-code "$INDEX_FILEPATH" && exit 0
+
+            # Commit the index file.
+            git add "$INDEX_FILEPATH"
+            git commit "$INDEX_FILEPATH" -m "Update benchmark results index."
+
+            # Push the index file.
+            set +e
+            git push origin gh-pages 2>&1 | tee git-push.out
+            if [ $? -eq 0 ]; then
+              exit 0
+            else
+              set -e
+              let RETRY+=1
+              echo "retry #$RETRY"
+              git pull -r origin gh-pages
+            fi
+
+          done