Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
with:
maven-version: 3.9.5
maven-version: 3.9.14
- name: Build with Maven
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
with:
Expand Down
4 changes: 2 additions & 2 deletions doc/org.eclipse.tracecompass.doc.dev/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<id>generate-documentation</id>
<phase>generate-sources</phase>
<configuration>
<echo>Generating TMF Help Files</echo>
<target>
<echo message="Generating TMF Help Files"/>
<property name="compile_classpath" refid="maven.compile.classpath" />
<ant target="build" inheritRefs="true" antfile="build.xml" />
</target>
Expand All @@ -48,8 +48,8 @@
<id>clean-documentation</id>
<phase>clean</phase>
<configuration>
<echo>Cleaning up generated TMF Help Files</echo>
<target>
<echo message="Cleaning up generated TMF Help Files"/>
<ant target="clean" antfile="build.xml" />
</target>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions doc/org.eclipse.tracecompass.doc.user/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<id>generate-documentation</id>
<phase>generate-sources</phase>
<configuration>
<echo>Generating Help Files</echo>
<target>
<echo message="Generating Help Files"/>
<property name="compile_classpath" refid="maven.compile.classpath" />
<ant target="build" inheritRefs="true" antfile="build.xml" />
</target>
Expand All @@ -48,8 +48,8 @@
<id>clean-documentation</id>
<phase>clean</phase>
<configuration>
<echo>Cleaning up generated Help Files</echo>
<target>
<echo message="Cleaning up generated Help Files"/>
<ant target="clean" antfile="build.xml" />
</target>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions doc/org.eclipse.tracecompass.gdbtrace.doc.user/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<id>generate-documentation</id>
<phase>generate-sources</phase>
<configuration>
<echo>Generating GDB Tracepoint Analysis Help Files</echo>
<target>
<echo message="Generating GDB Tracepoint Analysis Help Files"/>
<property name="compile_classpath" refid="maven.compile.classpath" />
<ant target="build" inheritRefs="true" antfile="build.xml" />
</target>
Expand All @@ -48,8 +48,8 @@
<id>clean-documentation</id>
<phase>clean</phase>
<configuration>
<echo>Cleaning up generated GDB Tracepoint Analysis Help Files</echo>
<target>
<echo message="Cleaning up generated GDB Tracepoint Analysis Help Files"/>
<ant target="clean" antfile="build.xml" />
</target>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions doc/org.eclipse.tracecompass.rcp.doc.user/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<id>generate-documentation</id>
<phase>generate-sources</phase>
<configuration>
<echo>Generating Trace Compass RCP Help Files</echo>
<target>
<echo message="Generating Trace Compass RCP Help Files"/>
<property name="compile_classpath" refid="maven.compile.classpath" />
<ant target="build" inheritRefs="true" antfile="build.xml" />
</target>
Expand All @@ -48,8 +48,8 @@
<id>clean-documentation</id>
<phase>clean</phase>
<configuration>
<echo>Cleaning up generated Trace Compass RCP Help Files</echo>
<target>
<echo message="Cleaning up generated Trace Compass RCP Help Files"/>
<ant target="clean" antfile="build.xml" />
</target>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions doc/org.eclipse.tracecompass.tmf.pcap.doc.user/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<id>generate-documentation</id>
<phase>generate-sources</phase>
<configuration>
<echo>Generating Pcap Help Files</echo>
<target>
<echo message="Generating Pcap Help Files"/>
<property name="compile_classpath" refid="maven.compile.classpath" />
<ant target="build" inheritRefs="true" antfile="build.xml" />
</target>
Expand All @@ -48,8 +48,8 @@
<id>clean-documentation</id>
<phase>clean</phase>
<configuration>
<echo>Cleaning up generated Pcap Help Files</echo>
<target>
<echo message="Cleaning up generated Pcap Help Files"/>
<ant target="clean" antfile="build.xml" />
</target>
</configuration>
Expand Down
41 changes: 17 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</licenses>

<properties>
<required-maven-version>3.9</required-maven-version>
<required-maven-version>3.9.9</required-maven-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<testArgLine></testArgLine>
Expand All @@ -52,23 +52,23 @@
<skip-short-tc-ui-tests>false</skip-short-tc-ui-tests>
<skip-long-tc-ui-tests>false</skip-long-tc-ui-tests>

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

<rcptt-version>2.5.4</rcptt-version>
<rcptt-version>2.8.1</rcptt-version>
<!-- 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) -->
<SWT_GTK3>0</SWT_GTK3>

<slf4j-bundle>slf4j.simple</slf4j-bundle>
<slf4j-version>2.0.9</slf4j-version>

<!-- Sonar rule configuration -->
<sonar-version>3.9.1.2184</sonar-version>
<jacoco-version>0.8.10</jacoco-version>
<sonar-version>5.5.0.6356</sonar-version>
<jacoco-version>0.8.14</jacoco-version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.java.source>${jdk.version}</sonar.java.source>
Expand Down Expand Up @@ -320,7 +320,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.12.0</version>
<configuration>
<groups>
<group>
Expand Down Expand Up @@ -449,13 +449,6 @@
<goal>plugin-source</goal>
</goals>
</execution>
<execution>
<id>feature-source</id>
<phase>package</phase>
<goals>
<goal>feature-source</goal>
</goals>
</execution>
</executions>
</plugin>

Expand Down Expand Up @@ -610,7 +603,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
Expand All @@ -619,13 +612,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.10.0</version>
</plugin>

<plugin>
Expand All @@ -637,37 +630,37 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>4.0.0-M9</version>
<version>4.0.0-M16</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.4</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<version>3.1.4</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.5</version>
<version>3.9.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.12.0</version>
<configuration>
<groups>
<group>
Expand Down
4 changes: 2 additions & 2 deletions tmf/org.eclipse.tracecompass.tmf.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<id>fix-dark-theme-css</id>
<phase>validate</phase>
<configuration>
<echo>Fix Dark Theme CSS</echo>
<target>
<echo message="Fix Dark Theme CSS"/>
<property name="targetPlatform" value="${target-platform}" />
<ant antfile="build.xml"/>
</target>
Expand All @@ -48,8 +48,8 @@
<id>cleanup-dark-theme-css</id>
<phase>verify</phase>
<configuration>
<echo>Clean-up Dark Theme CSS</echo>
<target>
<echo message="Clean-up Dark Theme CSS"/>
<property name="targetPlatform" value="${target-platform}" />
<ant antfile="build.xml" target="resetCSS"/>
</target>
Expand Down
Loading