From ac01ad2216768025b92f1c3dd19aab84ab9745e0 Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 13:17:18 +0200 Subject: [PATCH 01/10] Add properties for sonarcloud --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index c236ecc..351a0ff 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,8 @@ UTF-8 1.44 + psaikkonen + https://sonarcloud.io ${project.groupId}:${project.artifactId} From 3a9017ec329fd609ca937167edb42fd10fb26db8 Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 13:18:45 +0200 Subject: [PATCH 02/10] Create build.yml --- .github/workflows/build.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..cb7d7fd --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,36 @@ +name: Build +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Cache SonarCloud packages + uses: actions/cache@v1 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Maven packages + uses: actions/cache@v1 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=psaikkonen_JavaFXLibrary From 96510257ca0bd88859348fa4d511974f13dea858 Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 13:34:56 +0200 Subject: [PATCH 03/10] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb7d7fd..e97d529 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 11 + - name: Set up JDK 8 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 8 - name: Cache SonarCloud packages uses: actions/cache@v1 with: From 82adfe82f8e73467c4911d0708d1e5a746e36178 Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 13:42:22 +0200 Subject: [PATCH 04/10] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e97d529..f7b18f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 8 + java-package: jdk+fx - name: Cache SonarCloud packages uses: actions/cache@v1 with: From 18c558bef12c34ab4d458316df904faf645b59ae Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 13:49:15 +0200 Subject: [PATCH 05/10] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7b18f9..3014d61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,4 +34,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=psaikkonen_JavaFXLibrary + run: mvn -B package org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=psaikkonen_JavaFXLibrary From 6b3a96d417faf2a2faa482b3905261198861025b Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 14:06:16 +0200 Subject: [PATCH 06/10] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3014d61..8ff0cd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 8 + java-version: 11 java-package: jdk+fx - name: Cache SonarCloud packages uses: actions/cache@v1 From c51c0560d5197ef011f6acfbbb44fec962266376 Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 14:12:10 +0200 Subject: [PATCH 07/10] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ff0cd8..79121df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,4 +34,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -B package org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=psaikkonen_JavaFXLibrary + run: mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=psaikkonen_JavaFXLibrary From 84fae01e9f678d85bececc3505c56ff1fe010d58 Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 14:16:59 +0200 Subject: [PATCH 08/10] Update build.yml --- .github/workflows/build.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79121df..4f74e91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 11 + - name: Set up JDK 8 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 8 java-package: jdk+fx - name: Cache SonarCloud packages uses: actions/cache@v1 @@ -30,7 +30,14 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Build and analyze + - name: Build + run: mvn package + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + java-package: jdk+fx + - name: Analyze env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 875a8176420d283725ca04f7ca7f73a18876e00d Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Fri, 26 Nov 2021 15:47:49 +0200 Subject: [PATCH 09/10] Update pom.xml --- pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index bb3c1a6..6709d50 100644 --- a/pom.xml +++ b/pom.xml @@ -365,9 +365,30 @@ + + org.jacoco + jacoco-maven-plugin + 0.8.8-SNAPSHOT + + + + + org.jacoco + jacoco-maven-plugin + + + + + report + + + + + + org.apache.maven From a14e7b613aeda58d81a44643580910893342e4f7 Mon Sep 17 00:00:00 2001 From: Pasi Saikkonen Date: Mon, 29 Nov 2021 11:19:10 +0200 Subject: [PATCH 10/10] Add jacoco for unit test coverage reports --- pom.xml | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 6709d50..d713c53 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ 1.44 psaikkonen https://sonarcloud.io + ${project.groupId}:${project.artifactId} @@ -184,13 +185,33 @@ + + org.jacoco + jacoco-maven-plugin + 0.8.7 + + + default-prepare-agent + + prepare-agent + + + + default-report + test + + report + + + + org.apache.maven.plugins maven-surefire-plugin 2.22.2 - -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar + @{argLine} -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar @@ -365,30 +386,8 @@ - - org.jacoco - jacoco-maven-plugin - 0.8.8-SNAPSHOT - - - - - - org.jacoco - jacoco-maven-plugin - - - - - report - - - - - - org.apache.maven