Skip to content

Commit 571487b

Browse files
acoburnacoburn
committed
Adjust surefire argLine
1 parent 9789f42 commit 571487b

File tree

8 files changed

+149
-62
lines changed

8 files changed

+149
-62
lines changed

‎pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<checkstyle.tool.version>10.12.4</checkstyle.tool.version>
4949

5050
<!-- sonar -->
51-
<sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/trellis-bom/target/site/jacoco-merged/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
51+
<sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/report/target/site/jacoco-merged/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
5252
<sonar.projectKey>trellis</sonar.projectKey>
5353
<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
5454
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -80,6 +80,7 @@
8080
<module>trellis-webac</module>
8181
<module>trellis-webdav</module>
8282
<module>apps</module>
83+
<module>report</module>
8384
</modules>
8485

8586
<distributionManagement>

‎report/pom.xml

+141
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<?xml version="1.0"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.trellisldp</groupId>
7+
<artifactId>trellis-parent</artifactId>
8+
<version>0.20.0-SNAPSHOT</version>
9+
<relativePath>../trellis-parent</relativePath>
10+
</parent>
11+
12+
<groupId>org.trellisldp</groupId>
13+
<artifactId>trellis-report</artifactId>
14+
<version>0.20.0-SNAPSHOT</version>
15+
<name>Trellis Report</name>
16+
<url>https://www.trellisldp.org</url>
17+
<description>
18+
Trellis LDP Reports
19+
</description>
20+
<packaging>pom</packaging>
21+
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.trellisldp</groupId>
25+
<artifactId>trellis-api</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.trellisldp</groupId>
30+
<artifactId>trellis-common</artifactId>
31+
<version>${project.version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.trellisldp</groupId>
35+
<artifactId>trellis-http</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.trellisldp</groupId>
40+
<artifactId>trellis-vocabulary</artifactId>
41+
<version>${project.version}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.trellisldp</groupId>
45+
<artifactId>trellis-notification-jackson</artifactId>
46+
<version>${project.version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.trellisldp</groupId>
50+
<artifactId>trellis-notification-jsonb</artifactId>
51+
<version>${project.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.trellisldp</groupId>
55+
<artifactId>trellis-reactive</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.trellisldp</groupId>
60+
<artifactId>trellis-jwt</artifactId>
61+
<version>${project.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.trellisldp</groupId>
65+
<artifactId>trellis-webac</artifactId>
66+
<version>${project.version}</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.trellisldp</groupId>
70+
<artifactId>trellis-app</artifactId>
71+
<version>${project.version}</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.trellisldp</groupId>
75+
<artifactId>trellis-audit</artifactId>
76+
<version>${project.version}</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.trellisldp</groupId>
80+
<artifactId>trellis-cache</artifactId>
81+
<version>${project.version}</version>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.trellisldp</groupId>
85+
<artifactId>trellis-cdi</artifactId>
86+
<version>${project.version}</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.trellisldp</groupId>
90+
<artifactId>trellis-constraint</artifactId>
91+
<version>${project.version}</version>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.trellisldp</groupId>
95+
<artifactId>trellis-file</artifactId>
96+
<version>${project.version}</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.trellisldp</groupId>
100+
<artifactId>trellis-jdbc</artifactId>
101+
<version>${project.version}</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.trellisldp</groupId>
105+
<artifactId>trellis-jena</artifactId>
106+
<version>${project.version}</version>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.trellisldp</groupId>
110+
<artifactId>trellis-namespace</artifactId>
111+
<version>${project.version}</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.trellisldp</groupId>
115+
<artifactId>trellis-rdfa</artifactId>
116+
<version>${project.version}</version>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.trellisldp</groupId>
120+
<artifactId>trellis-triplestore</artifactId>
121+
<version>${project.version}</version>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.trellisldp</groupId>
125+
<artifactId>trellis-webdav</artifactId>
126+
<version>${project.version}</version>
127+
</dependency>
128+
</dependencies>
129+
130+
<build>
131+
<plugins>
132+
<plugin>
133+
<groupId>org.apache.maven.plugins</groupId>
134+
<artifactId>maven-deploy-plugin</artifactId>
135+
<configuration>
136+
<skip>true</skip>
137+
</configuration>
138+
</plugin>
139+
</plugins>
140+
</build>
141+
</project>

‎trellis-app/pom.xml

-13
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,5 @@
143143
<filtering>true</filtering>
144144
</resource>
145145
</resources>
146-
147-
<plugins>
148-
<plugin>
149-
<groupId>org.apache.maven.plugins</groupId>
150-
<artifactId>maven-surefire-plugin</artifactId>
151-
<configuration>
152-
<argLine>
153-
--add-modules jakarta.el
154-
--add-opens java.base/java.lang=ALL-UNNAMED
155-
</argLine>
156-
</configuration>
157-
</plugin>
158-
</plugins>
159146
</build>
160147
</project>

‎trellis-cdi/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,4 @@
9595
<scope>test</scope>
9696
</dependency>
9797
</dependencies>
98-
99-
<build>
100-
<plugins>
101-
<plugin>
102-
<groupId>org.apache.maven.plugins</groupId>
103-
<artifactId>maven-surefire-plugin</artifactId>
104-
<configuration>
105-
<argLine>
106-
--add-modules jakarta.el
107-
--add-opens java.base/java.lang=ALL-UNNAMED
108-
</argLine>
109-
</configuration>
110-
</plugin>
111-
</plugins>
112-
</build>
11398
</project>

‎trellis-http/pom.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
</description>
2020
<packaging>jar</packaging>
2121

22+
2223
<dependencyManagement>
2324
<dependencies>
2425
<dependency>
@@ -182,9 +183,10 @@
182183
<groupId>org.apache.maven.plugins</groupId>
183184
<artifactId>maven-surefire-plugin</artifactId>
184185
<configuration>
185-
<argLine>
186-
--add-opens java.base/java.net=ALL-UNNAMED
187-
</argLine>
186+
<argLine>
187+
${surefire.jacoco.args}
188+
--add-opens java.base/java.net=ALL-UNNAMED
189+
</argLine>
188190
</configuration>
189191
</plugin>
190192
</plugins>

‎trellis-jwt/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,4 @@
119119
<scope>test</scope>
120120
</dependency>
121121
</dependencies>
122-
123-
<build>
124-
<plugins>
125-
<plugin>
126-
<groupId>org.apache.maven.plugins</groupId>
127-
<artifactId>maven-surefire-plugin</artifactId>
128-
<configuration>
129-
<argLine>
130-
<!-- add-modules jakarta.eli -->
131-
--add-opens java.base/java.lang=ALL-UNNAMED
132-
</argLine>
133-
</configuration>
134-
</plugin>
135-
</plugins>
136-
</build>
137122
</project>

‎trellis-reactive/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,4 @@
127127
<scope>test</scope>
128128
</dependency>
129129
</dependencies>
130-
131-
<build>
132-
<plugins>
133-
<plugin>
134-
<groupId>org.apache.maven.plugins</groupId>
135-
<artifactId>maven-surefire-plugin</artifactId>
136-
<configuration>
137-
<argLine>
138-
--add-modules jakarta.el
139-
--add-opens java.base/java.lang=ALL-UNNAMED
140-
</argLine>
141-
</configuration>
142-
</plugin>
143-
</plugins>
144-
</build>
145130
</project>

‎trellis-webdav/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
<artifactId>maven-surefire-plugin</artifactId>
175175
<configuration>
176176
<argLine>
177+
${surefire.jacoco.args}
177178
--add-opens java.base/java.net=ALL-UNNAMED
178179
</argLine>
179180
</configuration>

0 commit comments

Comments
 (0)