Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

- name: Build with Java ${{ matrix.java }}
run: |
mvn --batch-mode -T 1C clean org.jacoco:jacoco-maven-plugin:prepare-agent install \
mvn --batch-mode -T 1C clean install \
-Djava.version=${{ matrix.java }}
env:
OSSINDEX_USERNAME: ${{ secrets.OSSINDEX_USERNAME }}
Expand Down
3 changes: 1 addition & 2 deletions doc/developer_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,7 @@ mvn -T 1C --update-snapshots versions:use-latest-releases versions:update-proper
## Run local sonar analysis

```sh
mvn -T 1C clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar \
-Dsonar.token=[token]
mvn -T 1C clean package sonar:sonar -Dsonar.token=[token]
```

See analysis results at [sonarcloud.io](https://sonarcloud.io/dashboard?id=org.itsallcode.openfasttrace%3Aopenfasttrace).
Expand Down
11 changes: 9 additions & 2 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,13 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.14</version>
<executions>
<execution>
<id>prepare-agent</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>merge-results</id>
<phase>verify</phase>
Expand Down Expand Up @@ -400,7 +407,7 @@
</systemPropertyVariables>
<useModulePath>true</useModulePath>
<argLine>
<!-- Required for Java >= 18 --> ${test.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
<!-- Keep JaCoCo agent args and add Mockito agent (required for Java >= 18) --> @{argLine} ${test.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
<plugin>
Expand All @@ -414,7 +421,7 @@
<test.coverage>true</test.coverage>
</systemPropertyVariables>
<useModulePath>true</useModulePath>
<argLine><!-- Required for Java >= 18 --> ${test.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
<argLine><!-- Keep JaCoCo agent args and add Mockito agent (required for Java >= 18) --> @{argLine} ${test.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
<executions>
<execution>
Expand Down
Loading