diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f723238c2..648fa8b4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,8 +36,7 @@ jobs: - name: Analyse with SonarCloud if: ${{ github.repository == 'focus-shift/jollyday' && matrix.java == 17 && matrix.os == 'ubuntu-latest' && (github.event_name != 'pull_request' || (github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]')) }} run: > - ./mvnw -Pcoverage verify - sonar:sonar + ./mvnw -Pcoverage sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=focus-shift -Dsonar.projectKey=focus-shift_jollyday diff --git a/jollyday-core/pom.xml b/jollyday-core/pom.xml index 63aefc0fe..fe2a1e7df 100644 --- a/jollyday-core/pom.xml +++ b/jollyday-core/pom.xml @@ -3,6 +3,7 @@ 4.0.0 jollyday-core + Jollyday Core Core module of the jollyday library that contains the API for the developers and diff --git a/jollyday-jackson/pom.xml b/jollyday-jackson/pom.xml index 397f27242..b9d293079 100644 --- a/jollyday-jackson/pom.xml +++ b/jollyday-jackson/pom.xml @@ -3,8 +3,8 @@ 4.0.0 jollyday-jackson - Jollyday with Jackson + Jollyday with Jackson Jackson based jollyday implementation diff --git a/jollyday-jaxb/pom.xml b/jollyday-jaxb/pom.xml index 9612cae02..dc725f152 100644 --- a/jollyday-jaxb/pom.xml +++ b/jollyday-jaxb/pom.xml @@ -3,8 +3,8 @@ 4.0.0 jollyday-jaxb - Jollyday with Jakarta XML Binding (JAXB) + Jollyday with Jakarta XML Binding (JAXB) Jakarta XML Binding (JAXB) based jollyday implementation diff --git a/jollyday-tests/pom.xml b/jollyday-tests/pom.xml index f79d67846..201f20bc8 100644 --- a/jollyday-tests/pom.xml +++ b/jollyday-tests/pom.xml @@ -3,6 +3,7 @@ 4.0.0 jollyday-tests + Jollyday Tests @@ -93,20 +94,6 @@ true - - - org.jacoco - jacoco-maven-plugin - - - report - - report-aggregate - - verify - - - diff --git a/pom.xml b/pom.xml index 6df83fc6e..cedbea299 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ - ${maven.multiModuleProjectDirectory}/jollyday-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/target/site/jacoco-aggregate/jacoco.xml @@ -295,7 +295,6 @@ org.jacoco jacoco-maven-plugin - 0.8.11 prepare-agent @@ -303,6 +302,17 @@ prepare-agent + + report + + report + + + + XML + + + @@ -370,6 +380,7 @@ jollyday-tests + report-aggregate diff --git a/report-aggregate/pom.xml b/report-aggregate/pom.xml new file mode 100644 index 000000000..a8628b6f2 --- /dev/null +++ b/report-aggregate/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + pom + + report-aggregate + Aggregate Coverage Report + + Aggregate Coverage Report + + + de.focus-shift + jollyday + 0.27.0-SNAPSHOT + + + + + de.focus-shift + jollyday-core + ${project.version} + + + de.focus-shift + jollyday-jackson + ${project.version} + + + de.focus-shift + jollyday-jaxb + ${project.version} + + + + + + + org.jacoco + jacoco-maven-plugin + + + report-aggregate + verify + + report-aggregate + + + + + + +