target: Update target to match TraceCompass's

Also update the main pom.xml to fix the jacoco agent for unit tests. Change-Id: I134745fce95e2d4db8e804e8e4033d99cce8f90e Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net> Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/169918 Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org> Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
eclipse-tracecompass-incubator · Sep 29, 2020 · 1be03e1 · 1be03e1
1 parent 30a03bc
commit 1be03e1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-incubator-master" sequenceNumber="44">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-incubator-master" sequenceNumber="45">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/releases/9.11/cdt-9.11.1/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/10.0/cdt-10.0.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -38,7 +38,7 @@
 <unit id="javax.xml.stream" version="0.0.0"/>
 <unit id="org.apache.felix.scr" version="0.0.0"/>
 <unit id="org.mozilla.javascript" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
@@ -103,7 +103,7 @@
 <unit id="org.eclipse.ui.trace" version="0.0.0"/>
 <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.16/R-4.16-202006040540/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -113,11 +113,11 @@
 <unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
 <unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
 <unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
-<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.18.0/R-3.18.0-20200605032700/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.19.0/R-3.19.0-20200828030223/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xsd" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.22/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.23/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>

diff --git a/pom.xml b/pom.xml
@@ -35,6 +35,8 @@
        available under the terms of the Eclipse Public License 2.0
        which accompanies this distribution, and is available at
        https://www.eclipse.org/legal/epl-2.0/
+
+       SPDX-License-Identifier: EPL-2.0
       </comments>
     </license>
   </licenses>
@@ -153,7 +155,7 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.7.9</version>
+            <version>0.8.4</version>
             <executions>
               <execution>
                 <id>pre-test</id>
@@ -162,22 +164,20 @@
                 </goals>
                 <configuration>
                   <!-- Where to put jacoco coverage report -->
-                  <destFile>${sonar.jacoco.reportPath}</destFile>
+                  <destFile>${jacoco.destFile}</destFile>
                   <includes>
                     <include>org.eclipse.tracecompass.incubator.*</include>
                   </includes>
                   <append>true</append>
                 </configuration>
               </execution>
               <execution>
-                <id>post-test</id>
-                <phase>post-integration-test</phase>
+                <id>jacoco-report</id>
+                <phase>verify</phase>
                 <goals>
                   <goal>report</goal>
+                  <goal>report-aggregate</goal>
                 </goals>
-                <configuration>
-                  <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                </configuration>
               </execution>
             </executions>
           </plugin>