From 1cc615b22df9ba72417886cc87e853984d036b5f Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 09:35:50 +1100 Subject: [PATCH 1/9] Bump base image version --- .github/workflows/java.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index eeb2088425..2b3b68b338 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -14,7 +14,7 @@ on: jobs: tests-java-1_8: name: Test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: gradle/gradle-build-action@v2 @@ -25,7 +25,7 @@ jobs: sonarqube: name: SonarQube - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: From 6960bf1e15291dac46e5784d7b65ca93c3e81256 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 09:40:35 +1100 Subject: [PATCH 2/9] Bump java version in gradle --- java/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/build.gradle b/java/build.gradle index ccd7696b4e..d17f0ae231 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -10,7 +10,7 @@ plugins { java { toolchain { - languageVersion = JavaLanguageVersion.of(11) + languageVersion = JavaLanguageVersion.of(17) } } From c66a2c227782be87e0814801c27f89b6a9ac8388 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 09:40:45 +1100 Subject: [PATCH 3/9] Revert "Bump base image version" This reverts commit 1cc615b22df9ba72417886cc87e853984d036b5f. --- .github/workflows/java.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index 2b3b68b338..eeb2088425 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -14,7 +14,7 @@ on: jobs: tests-java-1_8: name: Test - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - uses: gradle/gradle-build-action@v2 @@ -25,7 +25,7 @@ jobs: sonarqube: name: SonarQube - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 with: From 0c35c1c22c36465fa0f1d8124184d374021d1634 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 09:56:26 +1100 Subject: [PATCH 4/9] sigh --- java/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/build.gradle b/java/build.gradle index d17f0ae231..fe1cc9b60a 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,6 +1,6 @@ plugins { id 'jacoco' - id "org.sonarqube" version "3.3" + id "org.sonarqube" version "4.7" // spotless pre v5 used to allow gradle 4 on ubuntu-latest id "com.diffplug.gradle.spotless" version "4.5.1" id 'maven-publish' From 979eb05cd8a42b4c114e2264ded409ae8c25bef9 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 09:59:13 +1100 Subject: [PATCH 5/9] again --- java/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/build.gradle b/java/build.gradle index fe1cc9b60a..fc58eb667b 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,6 +1,6 @@ plugins { id 'jacoco' - id "org.sonarqube" version "4.7" + id "org.sonarqube" version "4.4.1.3373" // spotless pre v5 used to allow gradle 4 on ubuntu-latest id "com.diffplug.gradle.spotless" version "4.5.1" id 'maven-publish' From 1b1881ea10fc0e0e6c2b86621d5a7bfc2e7b95ab Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 10:03:15 +1100 Subject: [PATCH 6/9] ffs --- java/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/build.gradle b/java/build.gradle index fc58eb667b..cf0afa2ab1 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -60,7 +60,7 @@ jacocoTestReport { } } -sonarqube { +sonar { properties { property 'sonar.projectName', "libsbp-java" property "sonar.projectKey", "swift-nav_libsbp" From 7844cbcdf43f3ffef54de97481c449e20077fa29 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 10:08:40 +1100 Subject: [PATCH 7/9] Revert "Revert "Bump base image version"" This reverts commit c66a2c227782be87e0814801c27f89b6a9ac8388. --- .github/workflows/java.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index eeb2088425..2b3b68b338 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -14,7 +14,7 @@ on: jobs: tests-java-1_8: name: Test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: gradle/gradle-build-action@v2 @@ -25,7 +25,7 @@ jobs: sonarqube: name: SonarQube - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: From 36adcc892775ab6af9d92126d3518f17f2766568 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 10:16:16 +1100 Subject: [PATCH 8/9] blow it all away --- .github/workflows/java.yaml | 20 +------------------- java/build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index 2b3b68b338..7a05c61ad7 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -14,7 +14,7 @@ on: jobs: tests-java-1_8: name: Test - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - uses: gradle/gradle-build-action@v2 @@ -23,21 +23,3 @@ jobs: - name: Run tests run: make test-java - sonarqube: - name: SonarQube - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: gradle/gradle-build-action@v2 - with: - gradle-version: 7.1.1 - - name: Run tests - run: make test-java - - - name: Run sonarqube - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: (cd java && gradle sonarqube) diff --git a/java/build.gradle b/java/build.gradle index cf0afa2ab1..ccd7696b4e 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,6 +1,6 @@ plugins { id 'jacoco' - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "3.3" // spotless pre v5 used to allow gradle 4 on ubuntu-latest id "com.diffplug.gradle.spotless" version "4.5.1" id 'maven-publish' @@ -10,7 +10,7 @@ plugins { java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(11) } } @@ -60,7 +60,7 @@ jacocoTestReport { } } -sonar { +sonarqube { properties { property 'sonar.projectName', "libsbp-java" property "sonar.projectKey", "swift-nav_libsbp" From 20b461c4b30a5d221b8e4320d0811b7dcdb1acf1 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Fri, 2 Feb 2024 11:34:52 +1100 Subject: [PATCH 9/9] Change to comment out --- .github/workflows/java.yaml | 18 ++++++++++++++++++ java/build.gradle | 20 ++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index 7a05c61ad7..5d7f824d11 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -23,3 +23,21 @@ jobs: - name: Run tests run: make test-java +# sonarqube: +# name: SonarQube +# runs-on: ubuntu-20.04 +# steps: +# - uses: actions/checkout@v2 +# with: +# fetch-depth: 0 +# - uses: gradle/gradle-build-action@v2 +# with: +# gradle-version: 7.1.1 +# - name: Run tests +# run: make test-java +# +# - name: Run sonarqube +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} +# run: (cd java && gradle sonarqube) diff --git a/java/build.gradle b/java/build.gradle index ccd7696b4e..1cd807004c 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,6 +1,6 @@ plugins { id 'jacoco' - id "org.sonarqube" version "3.3" + // id "org.sonarqube" version "3.3" // spotless pre v5 used to allow gradle 4 on ubuntu-latest id "com.diffplug.gradle.spotless" version "4.5.1" id 'maven-publish' @@ -60,15 +60,15 @@ jacocoTestReport { } } -sonarqube { - properties { - property 'sonar.projectName', "libsbp-java" - property "sonar.projectKey", "swift-nav_libsbp" - property "sonar.organization", "swift-nav" - property 'sonar.coverage.jacoco.xmlReportPaths', 'build/reports/jacoco/test/jacocoTestReport.xml' - property "sonar.host.url", "https://sonarcloud.io" - } -} +// sonarqube { +// properties { +// property 'sonar.projectName', "libsbp-java" +// property "sonar.projectKey", "swift-nav_libsbp" +// property "sonar.organization", "swift-nav" +// property 'sonar.coverage.jacoco.xmlReportPaths', 'build/reports/jacoco/test/jacocoTestReport.xml' +// property "sonar.host.url", "https://sonarcloud.io" +// } +// } spotless { java {