From 808c4354ff6cdb84962a3af55799eeea99841002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Mon, 7 Nov 2022 23:31:31 +0100 Subject: [PATCH] make codeql more stable --- .github/workflows/codeql.yml | 72 ++++++------------- build.gradle | 2 +- .../org/xbib/net/resource/IPAddressUtil.java | 3 + .../xbib/net/resource/ThreadLocalCoders.java | 3 + settings.gradle | 14 ++++ 5 files changed, 41 insertions(+), 53 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6b27e17..d7f207c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,24 +1,12 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL" on: push: branches: [ "main" ] pull_request: - # The branches below must be a subset of the branches above branches: [ "main" ] schedule: - - cron: '27 21 * * 1' + - cron: '16 16 * * 4' jobs: analyze: @@ -33,48 +21,28 @@ jobs: fail-fast: false matrix: language: [ 'java' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - name: Setup Java JDK - uses: actions/setup-java@v3.5.1 - with: - distribution: 'temurin' - java-version: '17' + - name: Setup Java JDK + uses: actions/setup-java@v3.5.1 + with: + distribution: 'zulu' + java-version: '17' - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - 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. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 + - name: Build + run: | + ./gradlew --version + ./gradlew build --no-build-cache - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{matrix.language}}" diff --git a/build.gradle b/build.gradle index d629aea..642f511 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { plugins { id "de.marcphilipp.nexus-publish" version "0.4.0" id "io.codearte.nexus-staging" version "0.21.1" - id "org.xbib.gradle.plugin.asciidoctor" version "2.5.2.1" + id "org.xbib.gradle.plugin.asciidoctor" version "2.5.2.2" id "org.cyclonedx.bom" version "1.7.2" id "com.github.spotbugs" version "5.0.13" id "checkstyle" diff --git a/net-resource/src/main/java/org/xbib/net/resource/IPAddressUtil.java b/net-resource/src/main/java/org/xbib/net/resource/IPAddressUtil.java index 2c935fd..e0c7d86 100644 --- a/net-resource/src/main/java/org/xbib/net/resource/IPAddressUtil.java +++ b/net-resource/src/main/java/org/xbib/net/resource/IPAddressUtil.java @@ -30,6 +30,9 @@ public class IPAddressUtil { private final static int INADDR16SZ = 16; private final static int INT16SZ = 2; + public IPAddressUtil() { + } + /* * Converts IPv4 address in its textual presentation form * into its numeric binary form. diff --git a/net-resource/src/main/java/org/xbib/net/resource/ThreadLocalCoders.java b/net-resource/src/main/java/org/xbib/net/resource/ThreadLocalCoders.java index dacfccd..9ee9580 100644 --- a/net-resource/src/main/java/org/xbib/net/resource/ThreadLocalCoders.java +++ b/net-resource/src/main/java/org/xbib/net/resource/ThreadLocalCoders.java @@ -37,6 +37,9 @@ public class ThreadLocalCoders { private static final int CACHE_SIZE = 3; + public ThreadLocalCoders() { + } + private static abstract class Cache { // Thread-local reference to array of cached objects, in LRU order diff --git a/settings.gradle b/settings.gradle index 4dc73c2..1ad1fa5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,17 @@ +pluginManagement { + repositories { + mavenLocal() + mavenCentral { + metadataSources { + mavenPom() + artifact() + ignoreGradleMetadataRedirection() + } + } + gradlePluginPortal() + } +} + dependencyResolutionManagement { versionCatalogs { libs {