You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2022/10/22 09:15:37 UTC

[logging-log4j2] 02/04: Bump actions/setup-java from 3.4.1 to 3.6.0

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 285cc7f24242327ec4771002b0783d3415b4a6ff
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Oct 19 10:36:06 2022 +0000

    Bump actions/setup-java from 3.4.1 to 3.6.0
    
    Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.4.1 to 3.6.0.
    - [Release notes](https://github.com/actions/setup-java/releases)
    - [Commits](https://github.com/actions/setup-java/compare/v3.4.1...de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc)
    
    ---
    updated-dependencies:
    - dependency-name: actions/setup-java
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
---
 .github/workflows/benchmark.yml        |  4 +-
 .github/workflows/build.yml            |  4 +-
 .github/workflows/codeql-analysis.yml  | 80 ++++++++++++++++++++++++++++++++++
 .github/workflows/log4j-kafka-test.yml |  2 +-
 4 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 26149a70be..cecd7b1162 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2.4.0
+        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc   # 3.6.0
         with:
           distribution: temurin
           java-version: 11
@@ -83,7 +83,7 @@ jobs:
 
       - name: Set up JDK ${{ matrix.jdk }}
         if: matrix.jdk != 11
-        uses: actions/setup-java@v2.4.0
+        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc   # 3.6.0
         with:
           distribution: temurin
           java-version: ${{ matrix.jdk }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 00d3bad3d6..3de194d46c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748   # 3.0.1
 
       - name: Setup JDK 11
-        uses: actions/setup-java@9519cf1382ac8dc61ad461f7f7cb45f033220189   # 3.1.1
+        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc   # 3.6.0
         with:
           distribution: temurin
           java-version: 11
@@ -96,7 +96,7 @@ jobs:
         uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748   # 3.0.1
 
       - name: Setup JDK 11
-        uses: actions/setup-java@9519cf1382ac8dc61ad461f7f7cb45f033220189   # 3.1.1
+        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc   # 3.6.0
         with:
           distribution: temurin
           java-version: 11
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000000..ffd6f0821b
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,80 @@
+# 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: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '32 12 * * 5'
+
+jobs:
+
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b   # 3.0.2
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@b398f525a5587552e573b247ac661067fafa920b    # 2.1.22
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+      # JDK 11 is needed for the build.
+      # Search `maven-toolchains-plugin` usages for details.
+      - name: Setup 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
+        timeout-minutes: 60
+        shell: bash
+        run: |
+          ./mvnw \
+          --show-version --batch-mode --errors --no-transfer-progress \
+          -DskipTests \
+          --global-toolchains ".github/workflows/maven-toolchains.xml"
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@b398f525a5587552e573b247ac661067fafa920b    # 2.1.22
diff --git a/.github/workflows/log4j-kafka-test.yml b/.github/workflows/log4j-kafka-test.yml
index edf462c45b..7fbd94e577 100644
--- a/.github/workflows/log4j-kafka-test.yml
+++ b/.github/workflows/log4j-kafka-test.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748   # 3.0.1
 
       - name: Setup JDK 11
-        uses: actions/setup-java@9519cf1382ac8dc61ad461f7f7cb45f033220189   # 3.1.1
+        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc   # 3.6.0
         with:
           distribution: temurin
           java-version: 11