Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/remove duplicated declarations surefire failsafe #15

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Fix/remove duplicated declarations surefire failsafe #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4987efb
Remove duplicated declarations of maven-surefire-plugin
dcremonini May 15, 2020
56471d7
Remove duplicated declarations of maven-failsafe-plugin
dcremonini May 15, 2020
c1d27c2
Remove duplicated declarations of jacoco-maven-plugin and set forkCou…
dcremonini May 15, 2020
d553299
Add spotbugs maven report
dcremonini May 15, 2020
3d48bc7
Remove duplicated declarations of jacoco-maven-plugin and set forkCou…
dcremonini May 15, 2020
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
12 changes: 12 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@ This is the first implementation of the DP-3T "low bandwidth" protocol. The curr

Our immediate roadmap is: to support the Apple/Google wire protocol, to be forward-compatible, and to support the actual Apple/Google API as soon as it is released to iOS and Android devices.

## Reporting

Using the maven plugin you can generate a full website containing the documentation.
Currently the resulting site is not deployable yet.

[Root](dpppt-backend-sdk/target/staging/index.html)

```bash
cd dpppt-backend-sdk
mvn clean compile site site:stage
```

## Repositories
* Android SDK & Calibration app: [dp3t-sdk-android](https://github.com/DP-3T/dp3t-sdk-android)
* iOS SDK & Calibration app: [dp3t-sdk-ios](https://github.com/DP-3T/dp3t-sdk-ios)
Expand Down
2 changes: 1 addition & 1 deletion dpppt-backend-sdk/dpppt-backend-sdk-report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>${maven-surefire-plugin-version}</version>
<configuration>
<!-- Jacoco prepare-agent builds some command-line params without -->
<!-- which jacoco will not instrument. Hence it is important to add -->
Expand Down
135 changes: 71 additions & 64 deletions dpppt-backend-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
<assertj-version>3.15.0</assertj-version>
<maven-surefire-plugin-version>2.22.2</maven-surefire-plugin-version>
<maven-failsafe-plugin-version>2.22.2</maven-failsafe-plugin-version>
<jacoco-maven-plugin-version>0.8.5</jacoco-maven-plugin-version>
<maven-project-info-reports-plugin>3.0.0</maven-project-info-reports-plugin>
<spotbugs-maven-plugin-version>4.0.0</spotbugs-maven-plugin-version>
<jacoco-maven-plugin-version>0.8.5</jacoco-maven-plugin-version>
</properties>

<modules>
Expand Down Expand Up @@ -143,38 +147,14 @@
<target>${java-version}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin-version}</version>
<configuration>
<argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin-version}</version>
<configuration>
<!-- Force alphabetical order to have a reproducible build -->
<runOrder>alphabetical</runOrder>
<argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8</argLine>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>${jacoco-maven-plugin-version}</version>
<executions>
<!-- set arg line property for surefire -->
<execution>
<id>prepare-agent</id>
<id>prepare-agent-01</id>
<goals>
<goal>prepare-agent</goal>
</goals>
Expand All @@ -184,48 +164,15 @@
</execution>
<!-- set arg line property for failsafe -->
<execution>
<id>prepare-agent-integration</id>
<id>prepare-agent-integration-01</id>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafeArgLine</propertyName>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<forkCount>1</forkCount>
<argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<argLine>${itCoverageAgent}</argLine>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<executions>
<!-- METHOD 1 -->
<!--<execution>-->
<!--<id>prepare-agent</id>-->
Expand All @@ -237,7 +184,7 @@

<!-- METHOD 2 -->
<execution>
<id>prepare-unit-tests</id>
<id>prepare-unit-tests-02</id>
<goals>
<goal>prepare-agent</goal>
</goals>
Expand All @@ -248,7 +195,7 @@

<!-- prepare agent for measuring integration tests -->
<execution>
<id>prepare-agent</id>
<id>prepare-agent-02</id>
<goals>
<goal>prepare-agent</goal>
</goals>
Expand All @@ -260,6 +207,41 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin-version}</version>
<configuration>
<!-- Setting forkCount to 0 is required by JaCoCo plugin -->
<forkCount>0</forkCount>
<argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin-version}</version>
<configuration>
<!-- Force alphabetical order to have a reproducible build -->
<runOrder>alphabetical</runOrder>
<argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8</argLine>
<!-- Setting forkCount to 0 is required by JaCoCo plugin -->
<forkCount>0</forkCount>
</configuration>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<argLine>${itCoverageAgent}</argLine>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down Expand Up @@ -299,12 +281,12 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>${jacoco-maven-plugin-version}</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.0.0</version>
<version>${spotbugs-maven-plugin-version}</version>
<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
Expand All @@ -323,5 +305,30 @@
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/noiapp/noi-app-backend-new-WIP.git</url>
</repository>

<site>
<id>id-local-preview</id>
<name>local-preview</name>
<url>http://localhost/</url>
</site>
</distributionManagement>


<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin}</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
</configuration>
</plugin>
</plugins>
</reporting>
</project>