Skip to content

Commit eb073d1

Browse files
EcljpseB0TEcljpseB0T
committed
JUnitTestRunnerInterceptor: Add missing dependency #1640
#1640
1 parent 3d8dc6a commit eb073d1

File tree

1 file changed

+49
-40
lines changed

1 file changed

+49
-40
lines changed

‎eclipse-platform-parent/pom.xml

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,20 @@
2929
for using plugins with older than they require Maven version.
3030
If version number changed in one place, be sure to change in the other.
3131
-->
32+
<dependencies>
33+
<dependency>
34+
<!-- for JUnitTestRunnerInterceptor plugin -->
35+
<groupId>com.atlassian.clover</groupId>
36+
<artifactId>clover</artifactId>
37+
<version>4.1.2</version>
38+
<scope>test</scope>
39+
</dependency>
40+
</dependencies>
3241
<prerequisites>
3342
<maven>3.9.0</maven>
3443
</prerequisites>
3544
<properties>
36-
<!-- As of Tycho 0.22, skipTests takes priority, if maven.test.skip also specified,
45+
<!-- As of Tycho 0.22, skipTests takes priority, if maven.test.skip also specified,
3746
with different value. See https://bugs.eclipse.org/442976.
3847
During production builds, we run with -DskipTests=true -->
3948
<skipTests>false</skipTests>
@@ -42,15 +51,15 @@
4251
<buildTimestamp>${maven.build.timestamp}</buildTimestamp>
4352
<buildType>I</buildType>
4453
<buildId>${buildType}${buildTimestamp}</buildId>
45-
<!--
54+
<!--
4655
releaseName should match the yearly "release train" name.
4756
For example, "Mars", "Mars.1", "Luna SR2", etc.
4857
It will show up in "about box",
4958
such as Version: Mars (4.5), for main features.
5059
See bug 328139.
5160
-->
5261
<releaseName>2024-03</releaseName>
53-
<!--
62+
<!--
5463
The releaseNumbers below, for SDK and Platform, might be
5564
thought of as the "marketing number" or "branding number",
5665
and in fact are used in the branding bundle of the corresponding products.
@@ -72,7 +81,7 @@
7281
<cbi-plugins.version>1.4.3</cbi-plugins.version>
7382
<surefire.version>3.2.2</surefire.version>
7483

75-
<!--
84+
<!--
7685
The tycho-eclipserun-plugin will create its instance of Eclipse from this
7786
'eclipiserun-repo' repository, such as for computing .api-descriptions and
7887
generating API Tools reports.
@@ -81,21 +90,21 @@
8190

8291
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.31-I-builds</comparator.repo>
8392

84-
<!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
93+
<!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
8594
<tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
8695

8796
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8897
<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
8998
<cbi-ecj-version>3.36.0.v20231114-0937</cbi-ecj-version>
9099

91-
<!--
100+
<!--
92101
Production bundles are produced by ignoring the compiler warnings specified
93102
by ${code.ignoredWarnings} (see further down).
94103
Good citizens don't override those default settings for their production bundles.
95104
-->
96105
<code.ignoredWarnings>-warn:-deprecation,unavoidableGenericProblems,warningToken</code.ignoredWarnings>
97106

98-
<!--
107+
<!--
99108
Test bundles may override the list of ignored warnings by setting this at the top of their pom.xml:
100109
<properties>
101110
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
@@ -104,7 +113,7 @@
104113
-->
105114
<tests.ignoredWarnings>-warn:-deprecation,raw,unchecked,discouraged,warningToken</tests.ignoredWarnings>
106115

107-
<!--
116+
<!--
108117
repo for released versions of CBI. Note, we intentionally use as specific a repo as possible.
109118
See bug 471835.
110119
-->
@@ -114,48 +123,48 @@
114123
<cbi-releases-repo.url>https://repo.eclipse.org/content/repositories/cbi-releases/</cbi-releases-repo.url>
115124

116125

117-
<!--
126+
<!--
118127
This eclipse-p2-repo.url is specifically for the build-individual-bundles profile.
119128
See that profile for longer comment.
120129
-->
121130
<eclipse-p2-repo.url>This_URL_set_in_build-individual-bundles_profile</eclipse-p2-repo.url>
122131

123-
<!--
132+
<!--
124133
If configuration is not specified at all, in signing plugin, the default
125134
is 'false' (do not exclude inner jars, that is inner jars are signed).
126135
-->
127136
<defaultSigning-excludeInnerJars>false</defaultSigning-excludeInnerJars>
128137

129-
<!--
138+
<!--
130139
Valid options: error, warning, and ignore
131140
jgit.dirtyWorkingTree checking was added as of Tycho 0.19.0
132141
see: https://bugs.eclipse.org/419030
133142
-->
134143
<jgit.dirtyWorkingTree-platformDefault>ignore</jgit.dirtyWorkingTree-platformDefault>
135144

136145
<tycho.buildqualifier.format>'v'yyyyMMdd-HHmm</tycho.buildqualifier.format>
137-
<!-- allows submodules to enable the inclusion of the pom descriptor in the final artifact -->
146+
<!-- allows submodules to enable the inclusion of the pom descriptor in the final artifact -->
138147
<tycho.addMavenDescriptor>false</tycho.addMavenDescriptor>
139-
<!-- allows submodules to enable the mapping of p2 artifacts to maven artifacts -->
148+
<!-- allows submodules to enable the mapping of p2 artifacts to maven artifacts -->
140149
<tycho.mapP2Dependencies>false</tycho.mapP2Dependencies>
141-
<!-- allows submodules to disable the usage of BREE for their builds -->
150+
<!-- allows submodules to disable the usage of BREE for their builds -->
142151
<tycho.useJDK>BREE</tycho.useJDK>
143152

144153
<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
145154
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</previous-release.baseline>
146155

147-
<!--
156+
<!--
148157
Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
149158
The properties are declared empty by default and are overridden by automatic activation
150159
of the profiles 'macos' and 'jdk9-or-newer' or specific configuration in modules.
151160
-->
152-
<!-- any additional surefire args; to be defined by a test-plugin -->
161+
<!-- any additional surefire args; to be defined by a test-plugin -->
153162
<surefire.testArgLine></surefire.testArgLine>
154-
<!-- platform/OS specific JVM args -->
163+
<!-- platform/OS specific JVM args -->
155164
<surefire.platformSystemProperties></surefire.platformSystemProperties>
156-
<!-- properties related to Java modules on Java 9+ -->
165+
<!-- properties related to Java modules on Java 9+ -->
157166
<surefire.moduleProperties></surefire.moduleProperties>
158-
<!-- system specific JVM args; if needed provided by system properties to the build command -->
167+
<!-- system specific JVM args; if needed provided by system properties to the build command -->
159168
<surefire.systemProperties></surefire.systemProperties>
160169
<java.version>17</java.version>
161170
</properties>
@@ -184,7 +193,7 @@
184193
</distributionManagement>
185194
<pluginRepositories>
186195

187-
<!-- Released Tycho versions are available on maven central, which is now mirrored to Eclipse.org.
196+
<!-- Released Tycho versions are available on maven central, which is now mirrored to Eclipse.org.
188197
The tycho-snapshot-repo is only needed when using snapshots. -->
189198
<pluginRepository>
190199
<id>tycho-snapshots</id>
@@ -247,7 +256,7 @@
247256
<groupId>org.eclipse.tycho</groupId>
248257
<artifactId>target-platform-configuration</artifactId>
249258
<configuration>
250-
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=453757
259+
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=453757
251260
<resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints>
252261
-->
253262
<target>
@@ -343,7 +352,7 @@
343352
</executions>
344353
</plugin>
345354
<plugin>
346-
<!--
355+
<!--
347356
This maven-enforcer-plugin configuration to actually break the build if
348357
run with older maven.
349358
prerequisites section is kept for now as even if it doesn't break the build, it
@@ -412,7 +421,7 @@
412421
<plugin>
413422
<groupId>org.eclipse.tycho.extras</groupId>
414423
<artifactId>tycho-eclipserun-plugin</artifactId>
415-
<!-- this is actually present in any 0.14+ version -->
424+
<!-- this is actually present in any 0.14+ version -->
416425
<version>${tycho.version}</version>
417426
<configuration>
418427
<executionEnvironment>JavaSE-17</executionEnvironment>
@@ -441,7 +450,7 @@
441450
<version>${surefire.version}</version>
442451
<configuration>
443452
<properties>
444-
<!-- Attach Clover's test interceptor in order to
453+
<!-- Attach Clover's test interceptor in order to
445454
record JUnit4 Parameterized tests -->
446455
<property>
447456
<name>listener</name>
@@ -481,12 +490,12 @@
481490
<args>-encoding</args>
482491
<args>${project.build.sourceEncoding}</args>
483492
<args>-proceedOnError</args>
484-
<!-- Use this form, for Tycho 22 or less.
493+
<!-- Use this form, for Tycho 22 or less.
485494
<args>-log</args>
486495
<args>${project.build.directory}/@dot.xml</args>
487496
-->
488497
</compilerArgs>
489-
<!-- Use this form for Tycho 23 or greater -->
498+
<!-- Use this form for Tycho 23 or greater -->
490499
<log>xml</log>
491500
<logDirectory>${project.build.directory}/compilelogs</logDirectory>
492501
<showWarnings>true</showWarnings>
@@ -699,7 +708,7 @@
699708
<head>Implementation Requirements:</head>
700709
</tag>
701710
</tags>
702-
<!-- These are provided by PDE/Tycho by default but javadoc do not know that ... -->
711+
<!-- These are provided by PDE/Tycho by default but javadoc do not know that ... -->
703712
<additionalDependencies>
704713
<additionalDependency>
705714
<groupId>org.osgi</groupId>
@@ -730,7 +739,7 @@
730739

731740
<featureToPatch>org.eclipse.jdt</featureToPatch>
732741

733-
<!--
742+
<!--
734743
For future versions, in addition to changing this value of "featureToPatchVersion",
735744
the same value needs to be edited in
736745
.../java21patch/org.eclipse.jdt.java21patch/feature.xml
@@ -743,11 +752,11 @@
743752
Also, when new patch created, should update the wiki at
744753
https://wiki.eclipse.org/Java21
745754
-->
746-
<!-- This needs the version of the feature to be patched. -->
755+
<!-- This needs the version of the feature to be patched. -->
747756
<featureToPatchVersion>3.19.200.v20230705-1800</featureToPatchVersion>
748-
<!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
757+
<!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
749758
<versionRangeForPatch>[3.19.200.v20230705-1800,3.19.249.v20231213-1800)</versionRangeForPatch>
750-
<!-- Comment this line when a patch is required on top of I-build -->
759+
<!-- Comment this line when a patch is required on top of I-build -->
751760
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</comparator.repo>
752761
</properties>
753762
<repositories>
@@ -759,7 +768,7 @@
759768
</repositories>
760769
</profile>
761770
<profile>
762-
<!-- This provile enables automatic version bumps when running the build -->
771+
<!-- This provile enables automatic version bumps when running the build -->
763772
<id>vb</id>
764773
<properties>
765774
<compare-version-with-baselines.skip>false</compare-version-with-baselines.skip>
@@ -789,12 +798,12 @@
789798
<id>build-individual-bundles</id>
790799
<activation>
791800
<property>
792-
<!-- Enable if aggregatorBuild system-property is not set -->
801+
<!-- Enable if aggregatorBuild system-property is not set -->
793802
<name>!aggregatorBuild</name>
794803
</property>
795804
</activation>
796805
<properties>
797-
<!--
806+
<!--
798807
This eclipse-p2-repo.url is specifically for the build individual bundles profile and Gerrit jobs.
799808
Default is set to I-builds for main development cycle.
800809
For maintenance streams should always be "M-builds".
@@ -829,7 +838,7 @@
829838
</executions>
830839
<configuration>
831840
<excludeInnerJars>${defaultSigning-excludeInnerJars}</excludeInnerJars>
832-
<!--
841+
<!--
833842
The default timeout is 0 seconds which means "wait forever": https://www.eclipse.org/cbi/sitedocs/eclipse-jarsigner-plugin/sign-mojo.html#timeoutMillis
834843
We don't want to wait until the build finally aborts, so, setting a timeout (see bug 507369).
835844
Increasing timeout from 60000 to 120000 (see bug 544823).
@@ -867,7 +876,7 @@
867876
<artifactId>tycho-compiler-plugin</artifactId>
868877
<version>${tycho.version}</version>
869878
<configuration>
870-
<!--
879+
<!--
871880
this tells Tycho to use JRE libraries that match bundle runtime execution environment see:
872881
https://tycho.eclipseprojects.io/doc/latest/tycho-compiler-plugin/compile-mojo.html#useJDK
873882
-->
@@ -985,8 +994,8 @@
985994
<profile>
986995
<id>coverage</id>
987996
<properties>
988-
<!-- Since we append output of various tests, write to a common folder besides tests -->
989-
<!-- it's recommended to override that to an absolute value in specific Hudson configurations
997+
<!-- Since we append output of various tests, write to a common folder besides tests -->
998+
<!-- it's recommended to override that to an absolute value in specific Hudson configurations
990999
and Sonar integration -->
9911000
<jacoco.destFile>${project.basedir}/../target/jacoco.exec</jacoco.destFile>
9921001
<sonar.jacoco.reportPath>${jacoco.destFile}</sonar.jacoco.reportPath>
@@ -1053,13 +1062,13 @@
10531062
<artifactId>maven-pmd-plugin</artifactId>
10541063
<version>3.21.2</version>
10551064
<configuration>
1056-
<!-- PMD options -->
1065+
<!-- PMD options -->
10571066
<targetJDK>${java.version}</targetJDK>
10581067
<aggregate>true</aggregate>
10591068
<failOnViolation>false</failOnViolation>
10601069
<format>xml</format>
10611070
<rulesets><ruleset>pmd/eclipse_ruleset.xml</ruleset></rulesets>
1062-
<!-- CPD options -->
1071+
<!-- CPD options -->
10631072
<minimumTokens>100</minimumTokens>
10641073
<ignoreIdentifiers>true</ignoreIdentifiers>
10651074
</configuration>

0 commit comments

Comments
 (0)