Merge remote-tracking branch 'apache/2.24.x' into feature/2.x/logging…

…-parent-11.3.0
apache · Sep 22, 2024 · 9127152 · 9127152
2 parents d3cbdc6 + 80b6a59
commit 9127152
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/develocity-publish-build-scans.yaml b/.github/workflows/develocity-publish-build-scans.yaml
@@ -29,10 +29,12 @@ jobs:
       actions: write
       pull-requests: write
     steps:
+
       - name: Setup Build Scan link capture
-        uses: gradle/develocity-actions/maven-setup@v1
+        uses: gradle/develocity-actions/maven-setup@9f1bf05334de7eb619731d5466c35a153742311d   # 1.2
+
       - name: Publish Build Scans
-        uses: gradle/develocity-actions/maven-publish-build-scan@v1
+        uses: gradle/develocity-actions/maven-publish-build-scan@9f1bf05334de7eb619731d5466c35a153742311d   # 1.2
         with:
           develocity-url: 'https://ge.apache.org'
           develocity-access-key: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/src/changelog/.2.x.x/2953_enable_docker_for_JTL.xml b/src/changelog/.2.x.x/2953_enable_docker_for_JTL.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://logging.apache.org/xml/ns"
+       xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="changed">
+  <issue id="2953" link="https://github.com/apache/logging-log4j2/pull/2953"/>
+  <description format="asciidoc">Enable Docker-based tests in CI for JSON Template Layout</description>
+</entry>