From 575cae6598dc1c1c4eb52ce7c84f94b7281bcc7c Mon Sep 17 00:00:00 2001 From: yutafujiiPP Date: Thu, 30 Mar 2023 17:51:11 +0900 Subject: [PATCH 1/5] update library versions --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 4c105ca..3c71c0b 100644 --- a/build.gradle +++ b/build.gradle @@ -69,14 +69,14 @@ java { dependencies { - compile 'io.swagger:swagger-annotations:1.6.6' + compile 'io.swagger:swagger-annotations:1.6.10' compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.squareup.okhttp:logging-interceptor:2.7.5' - compile 'com.google.code.gson:gson:2.9.1' - compile ('com.auth0:java-jwt:3.19.2'){ + compile 'com.google.code.gson:gson:2.10.1' + compile ('com.auth0:java-jwt:4.0.0'){ exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind' } - compile 'com.fasterxml.jackson.core:jackson-databind:2.13.3' + compile 'com.fasterxml.jackson.core:jackson-databind:2.14.2' compile 'org.apache.commons:commons-lang3:3.12.0' // validation compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: '7.0.5.Final' @@ -84,9 +84,9 @@ dependencies { compile group: 'jakarta.el', name: 'jakarta.el-api', version: '4.0.0' compile group: 'org.glassfish', name: 'jakarta.el', version: '4.0.2' - testCompile 'org.mockito:mockito-core:4.4.0' - testCompile("org.junit.jupiter:junit-jupiter-engine:5.9.0") - testCompile("org.junit.platform:junit-platform-runner:1.9.0") + testCompile 'org.mockito:mockito-core:4.6.0' + testCompile("org.junit.jupiter:junit-jupiter-engine:5.9.2") + testCompile("org.junit.platform:junit-platform-runner:1.9.2") } pmd{ consoleOutput = true From 25be1836a3ef3a6357fe29eb8644cd898b5ba887 Mon Sep 17 00:00:00 2001 From: yutafujiiPP Date: Fri, 31 Mar 2023 16:05:28 +0900 Subject: [PATCH 2/5] Integrate codeQL to build-ci.yaml --- .github/workflows/build-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 7b0fe9d..fde38ad 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -21,6 +21,17 @@ jobs: chmod +x ./cc-test-reporter ./cc-test-reporter before-build + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: go, javascript + + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + - name: Run coverage run: | ./gradlew clean build jacocoTestReport From 765214ddac23f3dbf210e45c6e261b1e89ff82ec Mon Sep 17 00:00:00 2001 From: yutafujiiPP Date: Fri, 31 Mar 2023 16:08:06 +0900 Subject: [PATCH 3/5] Integrate codeQL to build-ci.yaml --- .github/workflows/build-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index fde38ad..d90099d 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -24,7 +24,7 @@ jobs: - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: - languages: go, javascript + languages: java - name: Autobuild uses: github/codeql-action/autobuild@v2 From dd857ddcd3df357d59dada3dd3e01aed77e87eb9 Mon Sep 17 00:00:00 2001 From: yutafujiiPP Date: Fri, 31 Mar 2023 16:27:38 +0900 Subject: [PATCH 4/5] split CI checks --- .github/workflows/build-ci.yml | 41 +++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index d90099d..d26f2f9 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -3,7 +3,7 @@ name: PayPay Java SDK CI on: [push,pull_request] jobs: - build: + code-climate: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -21,6 +21,27 @@ jobs: chmod +x ./cc-test-reporter ./cc-test-reporter before-build + - name: Run coverage + run: | + ./gradlew clean build jacocoTestReport + + - name: Code Climate after-build + env: + CC_TEST_REPORTER_ID: 7498cf1d134247ce860e440046a15731b846c8e2b4d6a0111310f012d12e6fda + run: | + JACOCO_SOURCE_PATH=src/main/java ./cc-test-reporter format-coverage build/reports/jacoco/test/jacocoTestReport.xml --input-type jacoco + ./cc-test-reporter upload-coverage + + code-ql: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Set up openjdk + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: @@ -32,16 +53,16 @@ jobs: - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 - - name: Run coverage - run: | - ./gradlew clean build jacocoTestReport + co-pilot: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Set up openjdk + uses: actions/setup-java@v1 + with: + java-version: 1.8 - name: Upload to CoPilot run: bash <(curl -s https://copilot.blackducksoftware.com/ci/githubactions/scripts/upload) - - name: Code Climate after-build - env: - CC_TEST_REPORTER_ID: 7498cf1d134247ce860e440046a15731b846c8e2b4d6a0111310f012d12e6fda - run: | - JACOCO_SOURCE_PATH=src/main/java ./cc-test-reporter format-coverage build/reports/jacoco/test/jacocoTestReport.xml --input-type jacoco - ./cc-test-reporter upload-coverage From f48a8e9c2ffd8cca05d8a906c2c2d6e4ea724cdf Mon Sep 17 00:00:00 2001 From: yutafujiiPP Date: Fri, 31 Mar 2023 18:10:15 +0900 Subject: [PATCH 5/5] Empty commit to retry CI