From a5b041a13208672780a8748dde345996b11741f9 Mon Sep 17 00:00:00 2001 From: sebr72 Date: Tue, 11 Jul 2023 09:57:07 +0200 Subject: [PATCH] Use default CodeQL in github, and java 8 compatible libraries Logback, Mockito and Checkstyle for java 8 --- .github/workflows/codeql.yaml | 45 ----------------------------------- build.gradle | 4 ++-- core/build.gradle | 4 ++-- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 .github/workflows/codeql.yaml diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml deleted file mode 100644 index 71f2e972da..0000000000 --- a/.github/workflows/codeql.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: Code scanning - -on: - push: - branches: - - master - - '[0-9]+.[0-9]+' - tags: - - '*' - pull_request: - schedule: - - cron: '0 19 * * 0' - -env: - HAS_SECRETS: ${{ secrets.HAS_SECRETS }} - -jobs: - CodeQL-Build: - runs-on: ubuntu-20.04 - name: Code scanning - timeout-minutes: 15 - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - if: env.HAS_SECRETS == 'HAS_SECRETS' - - - name: Setup Java JDK - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: temurin - if: env.HAS_SECRETS == 'HAS_SECRETS' - - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - if: env.HAS_SECRETS == 'HAS_SECRETS' - - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - if: env.HAS_SECRETS == 'HAS_SECRETS' - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - if: env.HAS_SECRETS == 'HAS_SECRETS' diff --git a/build.gradle b/build.gradle index 1330e035c8..050e0d9124 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) { jar.dependsOn(checkstyleMain) checkstyle { - toolVersion = "10.7.0" // com.puppycrawl.tools:checkstyle + toolVersion = "9.3" // com.puppycrawl.tools:checkstyle configFile = file("$rootProject.rootDir/checkstyle_checks.xml") configProperties = ['basedir': project.rootDir.path] ignoreFailures = true @@ -77,7 +77,7 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) { dependencies { testCompile( "junit:junit:4.13.2", - 'org.mockito:mockito-core:5.1.1', + 'org.mockito:mockito-core:4.11.0', ) } diff --git a/core/build.gradle b/core/build.gradle index 9289ecbbda..b7c7ba098b 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -166,8 +166,8 @@ dependencies { "org.slf4j:slf4j-api:2.0.7", "org.slf4j:jcl-over-slf4j:2.0.7", "org.slf4j:jul-to-slf4j:2.0.7", - "ch.qos.logback:logback-classic:1.4.7", - "ch.qos.logback:logback-access:1.4.7", + "ch.qos.logback:logback-classic:1.3.7", + "ch.qos.logback:logback-access:1.3.7", 'org.json:json:20220924', 'org.yaml:snakeyaml:2.0', 'com.github.spullara.cli-parser:cli-parser:1.1.6',