releng: Upgrade to Tycho 4.0.3

Update pom.xml files accordingly It requires maven 3.9.x Change-Id: I4d3ebc87477af134fd17bab5e9ae1b9eec9c4e79 Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com> Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/205447 Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
eclipse-tracecompass · Nov 14, 2023 · 9b04add · 9b04add
1 parent 7a7e472
commit 9b04add
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 62 deletions.
diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
   </licenses>
 
   <properties>
-    <required-maven-version>3.6.3</required-maven-version>
+    <required-maven-version>3.9</required-maven-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <testArgLine></testArgLine>
@@ -52,8 +52,8 @@
     <skip-short-tc-ui-tests>false</skip-short-tc-ui-tests>
     <skip-long-tc-ui-tests>false</skip-long-tc-ui-tests>
 
-    <tycho-version>2.7.5</tycho-version>
-    <tycho-extras-version>2.7.5</tycho-extras-version>
+    <tycho-version>4.0.3</tycho-version>
+    <tycho-extras-version>4.0.3</tycho-extras-version>
     <tycho-use-project-settings>true</tycho-use-project-settings>
     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass/org.eclipse.tracecompass.git</tycho.scmUrl>
     <cbi-plugins.version>1.4.2</cbi-plugins.version>
@@ -129,20 +129,6 @@
       <id>sign-update-site</id>
       <build>
         <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho-extras-version}</version>
-            <executions>
-              <execution>
-                <id>pack200-normalize</id>
-                <goals>
-                  <goal>normalize</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
 
           <plugin>
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
@@ -159,20 +145,6 @@
             </executions>
           </plugin>
 
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho-extras-version}</version>
-            <executions>
-              <execution>
-                <id>pack200-pack</id>
-                <goals>
-                  <goal>pack</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -417,7 +389,6 @@
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
           <executionEnvironment>JavaSE-${jdk.version}</executionEnvironment>
-          <includePackedArtifacts>true</includePackedArtifacts>
           <environments>
             <environment>
                 <os>win32</os>
@@ -462,24 +433,16 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-source-plugin</artifactId>
         <version>${tycho-version}</version>
+        <configuration>
+          <includeBinaryFeature>false</includeBinaryFeature>
+        </configuration>
         <executions>
           <execution>
             <id>plugin-source</id>
             <goals>
               <goal>plugin-source</goal>
             </goals>
           </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <includeBinaryFeature>false</includeBinaryFeature>
-        </configuration>
-        <executions>
           <execution>
             <id>feature-source</id>
             <phase>package</phase>
@@ -490,21 +453,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-pack200b-plugin</artifactId>
-        <version>${tycho-extras-version}</version>
-        <executions>
-          <execution>
-            <id>pack200-pack</id>
-            <goals>
-              <goal>pack</goal>
-            </goals>
-            <phase>package</phase>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-p2-plugin</artifactId>
@@ -618,6 +566,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-toolchains-plugin</artifactId>
+          <version>3.1.0</version>
           <executions>
             <execution>
               <goals>

diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/META-INF/MANIFEST.MF b/statesystem/org.eclipse.tracecompass.datastore.core.tests/META-INF/MANIFEST.MF
@@ -9,12 +9,13 @@ Fragment-Host: org.eclipse.tracecompass.datastore.core
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
-Export-Package: org.eclipse.tracecompass.internal.datastore.core.condition;x-internal:=true,
+Export-Package: org.eclipse.tracecompass.datastore.core.encoding,
+ org.eclipse.tracecompass.internal.datastore.core.condition;x-internal:=true,
  org.eclipse.tracecompass.internal.datastore.core.historytree;x-internal:=true,
  org.eclipse.tracecompass.internal.datastore.core.serialization;x-internal:=true,
  org.eclipse.tracecompass.internal.provisional.datastore.core.condition;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;x-internal:=true,
+ org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;x-friends:="org.eclipse.tracecompass.segmentstore.core.tests",
  org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;x-internal:=true
+ org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;x-friends:="org.eclipse.tracecompass.segmentstore.core.tests"
 Import-Package: com.google.common.collect
 Automatic-Module-Name: org.eclipse.tracecompass.datastore.core.tests
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/META-INF/MANIFEST.MF b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/META-INF/MANIFEST.MF
@@ -21,5 +21,7 @@ Export-Package: org.eclipse.tracecompass.segmentstore.core.tests,
  org.eclipse.tracecompass.segmentstore.core.tests.perf
 Import-Package: com.google.common.collect,
  org.apache.commons.io,
- org.eclipse.test.performance
+ org.eclipse.test.performance,
+ org.eclipse.tracecompass.internal.provisional.datastore.core.historytree,
+ org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping
 Automatic-Module-Name: org.eclipse.tracecompass.segmentstore.core.tests