Skip to content

Commit 0d25470

Browse files
committed
mvn: update maven plugin versions and fix build messages
Signed-off-by: Arnaud Fiorini <fiorini.arnaud@gmail.com>
1 parent 3c40d1c commit 0d25470

7 files changed

Lines changed: 27 additions & 34 deletions

File tree

  • doc
    • org.eclipse.tracecompass.doc.dev
    • org.eclipse.tracecompass.doc.user
    • org.eclipse.tracecompass.gdbtrace.doc.user
    • org.eclipse.tracecompass.rcp.doc.user
    • org.eclipse.tracecompass.tmf.pcap.doc.user
  • tmf/org.eclipse.tracecompass.tmf.ui

doc/org.eclipse.tracecompass.doc.dev/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<id>generate-documentation</id>
3535
<phase>generate-sources</phase>
3636
<configuration>
37-
<echo>Generating TMF Help Files</echo>
3837
<target>
38+
<echo message="Generating TMF Help Files"/>
3939
<property name="compile_classpath" refid="maven.compile.classpath" />
4040
<ant target="build" inheritRefs="true" antfile="build.xml" />
4141
</target>
@@ -48,8 +48,8 @@
4848
<id>clean-documentation</id>
4949
<phase>clean</phase>
5050
<configuration>
51-
<echo>Cleaning up generated TMF Help Files</echo>
5251
<target>
52+
<echo message="Cleaning up generated TMF Help Files"/>
5353
<ant target="clean" antfile="build.xml" />
5454
</target>
5555
</configuration>

doc/org.eclipse.tracecompass.doc.user/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<id>generate-documentation</id>
3535
<phase>generate-sources</phase>
3636
<configuration>
37-
<echo>Generating Help Files</echo>
3837
<target>
38+
<echo message="Generating Help Files"/>
3939
<property name="compile_classpath" refid="maven.compile.classpath" />
4040
<ant target="build" inheritRefs="true" antfile="build.xml" />
4141
</target>
@@ -48,8 +48,8 @@
4848
<id>clean-documentation</id>
4949
<phase>clean</phase>
5050
<configuration>
51-
<echo>Cleaning up generated Help Files</echo>
5251
<target>
52+
<echo message="Cleaning up generated Help Files"/>
5353
<ant target="clean" antfile="build.xml" />
5454
</target>
5555
</configuration>

doc/org.eclipse.tracecompass.gdbtrace.doc.user/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<id>generate-documentation</id>
3535
<phase>generate-sources</phase>
3636
<configuration>
37-
<echo>Generating GDB Tracepoint Analysis Help Files</echo>
3837
<target>
38+
<echo message="Generating GDB Tracepoint Analysis Help Files"/>
3939
<property name="compile_classpath" refid="maven.compile.classpath" />
4040
<ant target="build" inheritRefs="true" antfile="build.xml" />
4141
</target>
@@ -48,8 +48,8 @@
4848
<id>clean-documentation</id>
4949
<phase>clean</phase>
5050
<configuration>
51-
<echo>Cleaning up generated GDB Tracepoint Analysis Help Files</echo>
5251
<target>
52+
<echo message="Cleaning up generated GDB Tracepoint Analysis Help Files"/>
5353
<ant target="clean" antfile="build.xml" />
5454
</target>
5555
</configuration>

doc/org.eclipse.tracecompass.rcp.doc.user/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<id>generate-documentation</id>
3535
<phase>generate-sources</phase>
3636
<configuration>
37-
<echo>Generating Trace Compass RCP Help Files</echo>
3837
<target>
38+
<echo message="Generating Trace Compass RCP Help Files"/>
3939
<property name="compile_classpath" refid="maven.compile.classpath" />
4040
<ant target="build" inheritRefs="true" antfile="build.xml" />
4141
</target>
@@ -48,8 +48,8 @@
4848
<id>clean-documentation</id>
4949
<phase>clean</phase>
5050
<configuration>
51-
<echo>Cleaning up generated Trace Compass RCP Help Files</echo>
5251
<target>
52+
<echo message="Cleaning up generated Trace Compass RCP Help Files"/>
5353
<ant target="clean" antfile="build.xml" />
5454
</target>
5555
</configuration>

doc/org.eclipse.tracecompass.tmf.pcap.doc.user/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<id>generate-documentation</id>
3535
<phase>generate-sources</phase>
3636
<configuration>
37-
<echo>Generating Pcap Help Files</echo>
3837
<target>
38+
<echo message="Generating Pcap Help Files"/>
3939
<property name="compile_classpath" refid="maven.compile.classpath" />
4040
<ant target="build" inheritRefs="true" antfile="build.xml" />
4141
</target>
@@ -48,8 +48,8 @@
4848
<id>clean-documentation</id>
4949
<phase>clean</phase>
5050
<configuration>
51-
<echo>Cleaning up generated Pcap Help Files</echo>
5251
<target>
52+
<echo message="Cleaning up generated Pcap Help Files"/>
5353
<ant target="clean" antfile="build.xml" />
5454
</target>
5555
</configuration>

pom.xml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@
5252
<skip-short-tc-ui-tests>false</skip-short-tc-ui-tests>
5353
<skip-long-tc-ui-tests>false</skip-long-tc-ui-tests>
5454

55-
<tycho-version>4.0.11</tycho-version>
56-
<tycho-extras-version>4.0.11</tycho-extras-version>
55+
<tycho-version>5.0.2</tycho-version>
56+
<tycho-extras-version>5.0.2</tycho-extras-version>
5757
<tycho-use-project-settings>true</tycho-use-project-settings>
5858
<tycho.scmUrl>scm:git:https://github.com/eclipse-tracecompass/org.eclipse.tracecompass</tycho.scmUrl>
59-
<cbi-plugins.version>1.4.2</cbi-plugins.version>
59+
<cbi-plugins.version>1.5.4</cbi-plugins.version>
6060
<target-platform>tracecompass-e4.39</target-platform>
6161

62-
<rcptt-version>2.5.4</rcptt-version>
62+
<rcptt-version>2.8.1</rcptt-version>
6363
<!-- Disable GTK3 because it's not quite usable yet and it can make the tests hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
6464
<SWT_GTK3>0</SWT_GTK3>
6565

6666
<slf4j-bundle>slf4j.simple</slf4j-bundle>
6767
<slf4j-version>2.0.9</slf4j-version>
6868

6969
<!-- Sonar rule configuration -->
70-
<sonar-version>3.9.1.2184</sonar-version>
71-
<jacoco-version>0.8.10</jacoco-version>
70+
<sonar-version>5.5.0.6356</sonar-version>
71+
<jacoco-version>0.8.14</jacoco-version>
7272
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
7373
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
7474
<sonar.java.source>${jdk.version}</sonar.java.source>
@@ -449,13 +449,6 @@
449449
<goal>plugin-source</goal>
450450
</goals>
451451
</execution>
452-
<execution>
453-
<id>feature-source</id>
454-
<phase>package</phase>
455-
<goals>
456-
<goal>feature-source</goal>
457-
</goals>
458-
</execution>
459452
</executions>
460453
</plugin>
461454

@@ -610,7 +603,7 @@
610603
<plugin>
611604
<groupId>org.apache.maven.plugins</groupId>
612605
<artifactId>maven-resources-plugin</artifactId>
613-
<version>3.3.1</version>
606+
<version>3.5.0</version>
614607
<configuration>
615608
<encoding>UTF-8</encoding>
616609
</configuration>
@@ -619,13 +612,13 @@
619612
<plugin>
620613
<groupId>org.apache.maven.plugins</groupId>
621614
<artifactId>maven-antrun-plugin</artifactId>
622-
<version>3.1.0</version>
615+
<version>3.2.0</version>
623616
</plugin>
624617

625618
<plugin>
626619
<groupId>org.apache.maven.plugins</groupId>
627620
<artifactId>maven-dependency-plugin</artifactId>
628-
<version>3.6.0</version>
621+
<version>3.10.0</version>
629622
</plugin>
630623

631624
<plugin>
@@ -637,37 +630,37 @@
637630
<plugin>
638631
<groupId>org.apache.maven.plugins</groupId>
639632
<artifactId>maven-site-plugin</artifactId>
640-
<version>4.0.0-M9</version>
633+
<version>4.0.0-M16</version>
641634
</plugin>
642635

643636
<plugin>
644637
<groupId>org.apache.maven.plugins</groupId>
645638
<artifactId>maven-clean-plugin</artifactId>
646-
<version>3.3.1</version>
639+
<version>3.5.0</version>
647640
</plugin>
648641

649642
<plugin>
650643
<groupId>org.apache.maven.plugins</groupId>
651644
<artifactId>maven-deploy-plugin</artifactId>
652-
<version>3.1.1</version>
645+
<version>3.1.4</version>
653646
</plugin>
654647

655648
<plugin>
656649
<groupId>org.apache.maven.plugins</groupId>
657650
<artifactId>maven-install-plugin</artifactId>
658-
<version>2.5.2</version>
651+
<version>3.1.4</version>
659652
</plugin>
660653

661654
<plugin>
662655
<groupId>org.apache.maven.plugins</groupId>
663656
<artifactId>maven-project-info-reports-plugin</artifactId>
664-
<version>3.4.5</version>
657+
<version>3.9.0</version>
665658
</plugin>
666659

667660
<plugin>
668661
<groupId>org.apache.maven.plugins</groupId>
669662
<artifactId>maven-javadoc-plugin</artifactId>
670-
<version>3.6.2</version>
663+
<version>3.12.0</version>
671664
<configuration>
672665
<groups>
673666
<group>

tmf/org.eclipse.tracecompass.tmf.ui/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<id>fix-dark-theme-css</id>
3535
<phase>validate</phase>
3636
<configuration>
37-
<echo>Fix Dark Theme CSS</echo>
3837
<target>
38+
<echo message="Fix Dark Theme CSS"/>
3939
<property name="targetPlatform" value="${target-platform}" />
4040
<ant antfile="build.xml"/>
4141
</target>
@@ -48,8 +48,8 @@
4848
<id>cleanup-dark-theme-css</id>
4949
<phase>verify</phase>
5050
<configuration>
51-
<echo>Clean-up Dark Theme CSS</echo>
5251
<target>
52+
<echo message="Clean-up Dark Theme CSS"/>
5353
<property name="targetPlatform" value="${target-platform}" />
5454
<ant antfile="build.xml" target="resetCSS"/>
5555
</target>

0 commit comments

Comments
 (0)