Skip to content

Commit cc946d9

Browse files
emerick-bironemerick-biron
authored
Merge pull request #24 from DevLab-umontp/CI-SonarCloud
💚 sonar inclusions
2 parents ff3bd69 + de87c08 commit cc946d9

File tree

2 files changed

+134
-110
lines changed

2 files changed

+134
-110
lines changed

‎pom.xml‎

Lines changed: 133 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,37 @@
1313
<url>https://github.com/DevLab-umontp/API-JAVA-EDT</url>
1414

1515
<properties>
16+
<!-- base -->
17+
<project.java.version>11</project.java.version>
18+
<junit.jupiter.version>5.4.0-M1</junit.jupiter.version>
1619
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17-
<maven.compiler.source>11</maven.compiler.source>
18-
<maven.compiler.target>11</maven.compiler.target>
20+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
21+
22+
<!-- https://sonarcloud.io -->
1923
<sonar.projectKey>DevLab-umontp_API-JAVA-EDT</sonar.projectKey>
2024
<sonar.organization>devlab-umontp</sonar.organization>
2125
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
26+
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml
27+
</sonar.coverage.jacoco.xmlReportPaths>
2228
</properties>
2329

24-
<profiles>
25-
<profile>
26-
<id>github-deploy</id>
27-
<repositories>
28-
<repository>
29-
<id>github</id>
30-
<url>http://jarsm2.dyndns.dk</url>
31-
</repository>
32-
</repositories>
33-
</profile>
34-
</profiles>
35-
36-
<dependencyManagement>
37-
<dependencies>
38-
<dependency>
39-
<groupId>org.junit</groupId>
40-
<artifactId>junit-bom</artifactId>
41-
<version>5.5.2</version>
42-
<type>pom</type>
43-
<scope>import</scope>
44-
</dependency>
45-
</dependencies>
46-
</dependencyManagement>
47-
4830
<dependencies>
4931
<dependency>
5032
<groupId>org.junit.jupiter</groupId>
51-
<artifactId>junit-jupiter</artifactId>
52-
<version>5.4.0-M1</version>
33+
<artifactId>junit-jupiter-api</artifactId>
34+
<version>${junit.jupiter.version}</version>
35+
<scope>test</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.junit.jupiter</groupId>
39+
<artifactId>junit-jupiter-engine</artifactId>
40+
<version>${junit.jupiter.version}</version>
41+
<scope>test</scope>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.junit.jupiter</groupId>
45+
<artifactId>junit-jupiter-params</artifactId>
46+
<version>${junit.jupiter.version}</version>
5347
<scope>test</scope>
5448
</dependency>
5549
<dependency>
@@ -59,6 +53,13 @@
5953
</dependency>
6054
</dependencies>
6155

56+
<licenses>
57+
<license>
58+
<name>MIT License</name>
59+
<url>http://www.opensource.org/licenses/mit-license.php</url>
60+
</license>
61+
</licenses>
62+
6263
<developers>
6364
<developer>
6465
<name>Emerick BIRON</name>
@@ -92,87 +93,110 @@
9293
</repository>
9394
</distributionManagement>
9495

96+
97+
<profiles>
98+
<profile>
99+
<id>release</id>
100+
<build>
101+
<plugins>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-source-plugin</artifactId>
105+
<version>3.2.1</version>
106+
<executions>
107+
<execution>
108+
<id>attach-sources</id>
109+
<goals>
110+
<goal>jar</goal>
111+
</goals>
112+
</execution>
113+
</executions>
114+
</plugin>
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-javadoc-plugin</artifactId>
118+
<version>3.0.1</version>
119+
<executions>
120+
<execution>
121+
<id>attach-javadocs</id>
122+
<goals>
123+
<goal>jar</goal>
124+
</goals>
125+
</execution>
126+
</executions>
127+
</plugin>
128+
<plugin>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-gpg-plugin</artifactId>
131+
<version>1.6</version>
132+
<executions>
133+
<execution>
134+
<id>sign-artifacts</id>
135+
<phase>verify</phase>
136+
<goals>
137+
<goal>sign</goal>
138+
</goals>
139+
</execution>
140+
</executions>
141+
</plugin>
142+
</plugins>
143+
</build>
144+
</profile>
145+
</profiles>
146+
95147
<build>
96-
<pluginManagement>
97-
<!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
98-
<plugins>
99-
<plugin>
100-
<groupId>org.apache.maven.plugins</groupId>
101-
<artifactId>maven-surefire-plugin</artifactId>
102-
<version>3.0.0-M5</version>
103-
<configuration>
104-
<includes>
105-
<source>.</source>
106-
<include>src/main/java/**</include>
107-
</includes>
108-
</configuration>
109-
</plugin>
110-
<plugin>
111-
<groupId>org.apache.maven.plugins</groupId>
112-
<artifactId>maven-failsafe-plugin</artifactId>
113-
<version>2.22.0</version>
114-
</plugin>
115-
<plugin>
116-
<groupId>org.apache.maven.plugins</groupId>
117-
<artifactId>maven-compiler-plugin</artifactId>
118-
<version>3.8.1</version>
119-
<configuration>
120-
<source>11</source>
121-
<target>11</target>
122-
</configuration>
123-
</plugin>
124-
<plugin>
125-
<groupId>org.sonatype.plugins</groupId>
126-
<artifactId>nexus-staging-maven-plugin</artifactId>
127-
<version>1.6.7</version>
128-
<extensions>true</extensions>
129-
<configuration>
130-
<serverId>ossrh</serverId>
131-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
132-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
133-
</configuration>
134-
</plugin>
135-
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-source-plugin</artifactId>
138-
<version>2.2.1</version>
139-
<executions>
140-
<execution>
141-
<id>attach-sources</id>
142-
<goals>
143-
<goal>jar-no-fork</goal>
144-
</goals>
145-
</execution>
146-
</executions>
147-
</plugin>
148-
<plugin>
149-
<groupId>org.apache.maven.plugins</groupId>
150-
<artifactId>maven-javadoc-plugin</artifactId>
151-
<version>2.9.1</version>
152-
<executions>
153-
<execution>
154-
<id>attach-javadocs</id>
155-
<goals>
156-
<goal>jar</goal>
157-
</goals>
158-
</execution>
159-
</executions>
160-
</plugin>
161-
<plugin>
162-
<groupId>org.apache.maven.plugins</groupId>
163-
<artifactId>maven-gpg-plugin</artifactId>
164-
<version>1.5</version>
165-
<executions>
166-
<execution>
167-
<id>sign-artifacts</id>
168-
<phase>verify</phase>
169-
<goals>
170-
<goal>sign</goal>
171-
</goals>
172-
</execution>
173-
</executions>
174-
</plugin>
175-
</plugins>
176-
</pluginManagement>
148+
<plugins>
149+
<plugin>
150+
<groupId>org.apache.maven.plugins</groupId>
151+
<artifactId>maven-surefire-plugin</artifactId>
152+
<version>3.0.0-M5</version>
153+
</plugin>
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-failsafe-plugin</artifactId>
157+
<version>3.0.0-M5</version>
158+
</plugin>
159+
<plugin>
160+
<groupId>org.apache.maven.plugins</groupId>
161+
<artifactId>maven-compiler-plugin</artifactId>
162+
<version>3.8.1</version>
163+
<configuration>
164+
<source>${project.java.version}</source>
165+
<target>${project.java.version}</target>
166+
<encoding>${project.build.sourceEncoding}</encoding>
167+
</configuration>
168+
</plugin>
169+
<plugin>
170+
<groupId>org.sonatype.plugins</groupId>
171+
<artifactId>nexus-staging-maven-plugin</artifactId>
172+
<version>1.6.8</version>
173+
<extensions>true</extensions>
174+
<configuration>
175+
<serverId>ossrh</serverId>
176+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
177+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
178+
</configuration>
179+
</plugin>
180+
<plugin>
181+
<groupId>org.jacoco</groupId>
182+
<artifactId>jacoco-maven-plugin</artifactId>
183+
<version>0.8.6</version>
184+
<executions>
185+
<execution>
186+
<id>prepare-agent</id>
187+
<goals>
188+
<goal>prepare-agent</goal>
189+
</goals>
190+
</execution>
191+
<execution>
192+
<id>report</id>
193+
<phase>test</phase>
194+
<goals>
195+
<goal>report</goal>
196+
</goals>
197+
</execution>
198+
</executions>
199+
</plugin>
200+
</plugins>
177201
</build>
178202
</project>

‎src/main/java/fr/umontp/edt/Groupe.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ private boolean possedeGroupeParent() {
278278
/**
279279
* Permet de savoir si ce groupe est contenu dans {@code autreGroupe}
280280
*
281-
* @param autreGroupe {@link Groupe} auquel on vérifie s'il contient le groupe
281+
* @param autreGroupes Les {@link Groupe} auquel on vérifie s'ils contiennent le groupe
282282
* actuel (this)
283283
*
284284
* @return {@code boolean}

0 commit comments

Comments
 (0)