Skip to content

Commit 9370abe

Browse files
aptmacaptmac
committed
8219: Missing coverage in application reports
Reviewed-by: clanger, hirt
1 parent 7135063 commit 9370abe

File tree

7 files changed

+29
-107
lines changed

7 files changed

+29
-107
lines changed

‎application/coverage/pom.xml

Lines changed: 17 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -124,102 +124,42 @@
124124
</dependency>
125125
<dependency>
126126
<groupId>org.openjdk.jmc</groupId>
127-
<artifactId>org.openjdk.jmc.docs</artifactId>
128-
<version>${project.version}</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>org.openjdk.jmc</groupId>
132-
<artifactId>org.openjdk.jmc.feature.console</artifactId>
127+
<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui</artifactId>
133128
<version>${project.version}</version>
134129
</dependency>
135130
<dependency>
136131
<groupId>org.openjdk.jmc</groupId>
137-
<artifactId>org.openjdk.jmc.feature.console.ui.subscriptions</artifactId>
138-
<version>0.0.3-SNAPSHOT</version>
139-
</dependency>
140-
<dependency>
141-
<groupId>org.openjdk.jmc</groupId>
142-
<artifactId>org.openjdk.jmc.feature.core</artifactId>
132+
<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</artifactId>
143133
<version>${project.version}</version>
144134
</dependency>
145135
<dependency>
146136
<groupId>org.openjdk.jmc</groupId>
147-
<artifactId>org.openjdk.jmc.feature.flightrecorder</artifactId>
137+
<artifactId>org.openjdk.jmc.flightrecorder.dependencyview</artifactId>
148138
<version>${project.version}</version>
149139
</dependency>
150140
<dependency>
151141
<groupId>org.openjdk.jmc</groupId>
152-
<artifactId>org.openjdk.jmc.feature.flightrecorder.ext.g1</artifactId>
142+
<artifactId>org.openjdk.jmc.flightrecorder.ext.g1</artifactId>
153143
<version>1.0.0-SNAPSHOT</version>
154144
</dependency>
155145
<dependency>
156146
<groupId>org.openjdk.jmc</groupId>
157-
<artifactId>org.openjdk.jmc.feature.flightrecorder.ext.jfx</artifactId>
158-
<version>${project.version}</version>
159-
</dependency>
160-
<dependency>
161-
<groupId>org.openjdk.jmc</groupId>
162-
<artifactId>org.openjdk.jmc.feature.flightrecorder.metadata</artifactId>
163-
<version>${project.version}</version>
164-
</dependency>
165-
<dependency>
166-
<groupId>org.openjdk.jmc</groupId>
167-
<artifactId>org.openjdk.jmc.feature.ide</artifactId>
168-
<version>${project.version}</version>
169-
</dependency>
170-
<dependency>
171-
<groupId>org.openjdk.jmc</groupId>
172-
<artifactId>org.openjdk.jmc.feature.ide.launch</artifactId>
173-
<version>0.0.4-SNAPSHOT</version>
174-
</dependency>
175-
<dependency>
176-
<groupId>org.openjdk.jmc</groupId>
177-
<artifactId>org.openjdk.jmc.feature.jconsole</artifactId>
178-
<version>${project.version}</version>
179-
</dependency>
180-
<dependency>
181-
<groupId>org.openjdk.jmc</groupId>
182-
<artifactId>org.openjdk.jmc.feature.joverflow</artifactId>
183-
<version>1.0.1-SNAPSHOT</version>
184-
</dependency>
185-
<dependency>
186-
<groupId>org.openjdk.jmc</groupId>
187-
<artifactId>org.openjdk.jmc.feature.license</artifactId>
188-
<version>${project.version}</version>
189-
</dependency>
190-
<dependency>
191-
<groupId>org.openjdk.jmc</groupId>
192-
<artifactId>org.openjdk.jmc.feature.pde</artifactId>
193-
<version>2.0.0-SNAPSHOT</version>
194-
</dependency>
195-
<dependency>
196-
<groupId>org.openjdk.jmc</groupId>
197-
<artifactId>org.openjdk.jmc.feature.rcp</artifactId>
198-
<version>${project.version}</version>
199-
</dependency>
200-
<dependency>
201-
<groupId>org.openjdk.jmc</groupId>
202-
<artifactId>org.openjdk.jmc.feature.rcp.update</artifactId>
147+
<artifactId>org.openjdk.jmc.flightrecorder.ext.jfx</artifactId>
203148
<version>${project.version}</version>
204149
</dependency>
205150
<dependency>
206151
<groupId>org.openjdk.jmc</groupId>
207-
<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui</artifactId>
152+
<artifactId>org.openjdk.jmc.flightrecorder.flamegraph</artifactId>
208153
<version>${project.version}</version>
209154
</dependency>
210155
<dependency>
211156
<groupId>org.openjdk.jmc</groupId>
212-
<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</artifactId>
157+
<artifactId>org.openjdk.jmc.flightrecorder.graphview</artifactId>
213158
<version>${project.version}</version>
214159
</dependency>
215160
<dependency>
216161
<groupId>org.openjdk.jmc</groupId>
217-
<artifactId>org.openjdk.jmc.flightrecorder.ext.g1</artifactId>
218-
<version>1.0.0-SNAPSHOT</version>
219-
</dependency>
220-
<dependency>
221-
<groupId>org.openjdk.jmc</groupId>
222-
<artifactId>org.openjdk.jmc.flightrecorder.ext.jfx</artifactId>
162+
<artifactId>org.openjdk.jmc.flightrecorder.heatmap</artifactId>
223163
<version>${project.version}</version>
224164
</dependency>
225165
<dependency>
@@ -270,12 +210,12 @@
270210
<dependency>
271211
<groupId>org.openjdk.jmc</groupId>
272212
<artifactId>org.openjdk.jmc.joverflow</artifactId>
273-
<version>1.0.0-SNAPSHOT</version>
213+
<version>${project.version}</version>
274214
</dependency>
275215
<dependency>
276216
<groupId>org.openjdk.jmc</groupId>
277217
<artifactId>org.openjdk.jmc.joverflow.ui</artifactId>
278-
<version>1.0.1-SNAPSHOT</version>
218+
<version>${project.version}</version>
279219
</dependency>
280220
<dependency>
281221
<groupId>org.openjdk.jmc</groupId>
@@ -285,7 +225,7 @@
285225
<dependency>
286226
<groupId>org.openjdk.jmc</groupId>
287227
<artifactId>org.openjdk.jmc.pde</artifactId>
288-
<version>1.0.2-SNAPSHOT</version>
228+
<version>${project.version}</version>
289229
</dependency>
290230
<dependency>
291231
<groupId>org.openjdk.jmc</groupId>
@@ -297,17 +237,6 @@
297237
<artifactId>org.openjdk.jmc.rcp.intro</artifactId>
298238
<version>${project.version}</version>
299239
</dependency>
300-
<dependency>
301-
<groupId>org.openjdk.jmc</groupId>
302-
<artifactId>org.openjdk.jmc.rcp.product</artifactId>
303-
<version>${project.version}</version>
304-
<type>pom</type>
305-
</dependency>
306-
<dependency>
307-
<groupId>org.openjdk.jmc</groupId>
308-
<artifactId>org.openjdk.jmc.rcp.product.feature</artifactId>
309-
<version>${project.version}</version>
310-
</dependency>
311240
<dependency>
312241
<groupId>org.openjdk.jmc</groupId>
313242
<artifactId>org.openjdk.jmc.rjmx</artifactId>
@@ -328,18 +257,6 @@
328257
<artifactId>org.openjdk.jmc.rjmx.ui</artifactId>
329258
<version>${project.version}</version>
330259
</dependency>
331-
<dependency>
332-
<groupId>org.openjdk.jmc</groupId>
333-
<artifactId>org.openjdk.jmc.updatesite.ide</artifactId>
334-
<version>${revision}${changelist}</version>
335-
<type>pom</type>
336-
</dependency>
337-
<dependency>
338-
<groupId>org.openjdk.jmc</groupId>
339-
<artifactId>org.openjdk.jmc.updatesite.rcp</artifactId>
340-
<version>${revision}${changelist}</version>
341-
<type>pom</type>
342-
</dependency>
343260
<dependency>
344261
<groupId>org.openjdk.jmc</groupId>
345262
<artifactId>org.openjdk.jmc.ui</artifactId>
@@ -368,6 +285,12 @@
368285
<scope>test</scope>
369286
<version>${project.version}</version>
370287
</dependency>
288+
<dependency>
289+
<groupId>org.openjdk.jmc</groupId>
290+
<artifactId>org.openjdk.jmc.flightrecorder.graphview.test</artifactId>
291+
<scope>test</scope>
292+
<version>${project.version}</version>
293+
</dependency>
371294
<dependency>
372295
<groupId>org.openjdk.jmc</groupId>
373296
<artifactId>org.openjdk.jmc.flightrecorder.ui.test</artifactId>

‎application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
3+
Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
44
55
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
66
@@ -50,7 +50,7 @@
5050
<artifactId>tycho-surefire-plugin</artifactId>
5151
<version>${tycho.version}</version>
5252
<configuration>
53-
<argLine>-Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
53+
<argLine>${tycho.testArgLine.local} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
5454
</configuration>
5555
</plugin>
5656
</plugins>

‎application/tests/org.openjdk.jmc.jolokia.test/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@
7474
<includes>${test.includes}</includes>
7575
<!-- Start jolokia on a random free port to avoid requiring specific ports to run test -->
7676
<!-- Agent version may differ from client version, in fact it may be a good test -->
77-
<argLine>
78-
-javaagent:${settings.localRepository}/org/jolokia/jolokia-agent-jvm/${jolokia.agent.version}/jolokia-agent-jvm-${jolokia.agent.version}-javaagent.jar=port=0,discoveryEnabled=true</argLine>
77+
<argLine>${tycho.testArgLine.local} -javaagent:${settings.localRepository}/org/jolokia/jolokia-agent-jvm/${jolokia.agent.version}/jolokia-agent-jvm-${jolokia.agent.version}-javaagent.jar=port=0,discoveryEnabled=true</argLine>
7978
</configuration>
8079
</plugin>
8180

‎application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
3+
Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
44
55
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
66
@@ -50,7 +50,7 @@
5050
<artifactId>tycho-surefire-plugin</artifactId>
5151
<version>${tycho.version}</version>
5252
<configuration>
53-
<argLine>-Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
53+
<argLine>${tycho.testArgLine.local} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
5454
<failIfNoTests>false</failIfNoTests>
5555
</configuration>
5656
</plugin>

‎application/tests/org.openjdk.jmc.rjmx.test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
3+
Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
44
55
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
66
@@ -50,7 +50,7 @@
5050
<artifactId>tycho-surefire-plugin</artifactId>
5151
<version>${tycho.version}</version>
5252
<configuration>
53-
<argLine>-Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi</argLine>
53+
<argLine>${tycho.testArgLine.local} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi</argLine>
5454
</configuration>
5555
</plugin>
5656
</plugins>

‎application/tests/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<test.excludes.default>**/*$*</test.excludes.default>
6060
<fail.if.no.tests>true</fail.if.no.tests>
6161
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
62+
<tycho.testArgLine.local></tycho.testArgLine.local>
6263
</properties>
6364
<profiles>
6465
<profile>
@@ -107,6 +108,9 @@
107108
</profile>
108109
<profile>
109110
<id>coverage</id>
111+
<properties>
112+
<tycho.testArgLine.local>${tycho.testArgLine}</tycho.testArgLine.local>
113+
</properties>
110114
<build>
111115
<plugins>
112116
<plugin>
@@ -119,9 +123,6 @@
119123
<goals>
120124
<goal>prepare-agent</goal>
121125
</goals>
122-
<configuration>
123-
<propertyName>surefireArgLine</propertyName>
124-
</configuration>
125126
</execution>
126127
<execution>
127128
<id>post-unit-test</id>
@@ -150,7 +151,6 @@
150151
<artifactId>tycho-surefire-plugin</artifactId>
151152
<version>${tycho.version}</version>
152153
<configuration>
153-
<argLine>${surefireArgLine}</argLine>
154154
<appArgLine>-nl en</appArgLine>
155155
<includes>${test.includes}</includes>
156156
<excludes>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<download.maven.plugin.version>1.6.8</download.maven.plugin.version>
109109
<maven.deploy.version>3.1.1</maven.deploy.version>
110110
<spotbugs.version>4.7.3.5</spotbugs.version>
111-
<jacoco.plugin.version>0.8.7</jacoco.plugin.version>
111+
<jacoco.plugin.version>0.8.10</jacoco.plugin.version>
112112
</properties>
113113
<scm>
114114
<connection>${scmConnection}</connection>

0 commit comments

Comments
 (0)