Skip to content

Commit

Permalink
releng: Upgrade to current latest Orbit (2023-06)
Browse files Browse the repository at this point in the history 
Upgrade to the current latest Orbit drop R20230531010532. Basically
finish upgrading from R20220302172233 to R20230531010532, except for
org.json which cannot be uplifted yet because of Maven build issues.

Replace tycho-source-feature-plugin:source-feature with
tycho-source-plugin:feature-source, to fix the local Maven build warning
[1] (with this change). Not doing so lends the resulting errors [2,3].

[1] "Mojo tycho-source-feature-plugin:source-feature is replaced by the
tycho-source-plugin:feature-source which offers equivalent and even
enhanced functionality".

[2] "Failed to execute goal
o.e.tycho.extras:tycho-source-feature-plugin:2.7.5:source-feature
(source-feature) on project org.eclipse.tracecompass.rcp:
Could not generate source feature for project MavenProject:
org.eclipse.tracecompass:org.eclipse.tracecompass.rcp:9.0.0-SNAPSHOT @
(...)/rcp/org.eclipse.tracecompass.rcp/.tycho-consumer-pom.xml".

[3] "Missing sources for plugins
[org.apache.commons.jxpath_1.3.0.v200911051830]".

Change-Id: Ib3d45963fb27a6bb701830fc51fed9b5ae827cfd
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/202642
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>
  • Loading branch information
@marco-miller
marco-miller committed Jun 22, 2023
1 parent a87a692 commit 5602e1d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 39 deletions.
10 changes: 5 additions & 5 deletions pom.xml
View file
Expand Up @@ -453,18 +453,18 @@
</plugin>

<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-extras-version}</version>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<includeBinaryFeature>false</includeBinaryFeature>
</configuration>
<executions>
<execution>
<id>source-feature</id>
<id>feature-source</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
</execution>
</executions>
Expand Down
8 changes: 4 additions & 4 deletions rcp/org.eclipse.tracecompass.rcp.branding.feature/pom.xml
View file
Expand Up @@ -27,15 +27,15 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>source-feature</id>
<id>feature-source</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
Expand Down
14 changes: 0 additions & 14 deletions rcp/org.eclipse.tracecompass.rcp/feature.xml
View file
Expand Up @@ -43,13 +43,6 @@
version="0.0.0"
unpack="false"/>

<plugin
id="javax.xml.stream"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.json"
download-size="0"
Expand Down Expand Up @@ -365,13 +358,6 @@
version="0.0.0"
unpack="false"/>

<plugin
id="javax.xml.bind"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.sat4j.core"
download-size="0"
Expand Down
10 changes: 4 additions & 6 deletions rcp/org.eclipse.tracecompass.rcp/pom.xml
View file
Expand Up @@ -27,24 +27,22 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<executions>
<execution>
<id>source-feature</id>
<id>feature-source</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
<configuration>
<excludes>
<plugin id="javax.xml"/>
<plugin id="javax.xml.bind"/>
<plugin id="jakarta.xml.bind"/>
<plugin id="javax.activation"/>
<plugin id="javax.annotation"/>
<plugin id="javax.inject"/>
<plugin id="javax.xml.stream"/>
<plugin id="org.apache.commons.cli"/>
<plugin id="org.apache.commons.compress"/>
<plugin id="org.apache.commons.lang"/>
Expand Down
7 changes: 2 additions & 5 deletions releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.28" sequenceNumber="7">
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.28" sequenceNumber="8">
<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"/>
Expand Down Expand Up @@ -30,14 +30,11 @@
<unit id="org.mozilla.javascript" version="1.7.10.v20221112-0806"/>
<unit id="org.slf4j.api" version="0.0.0"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="javax.activation" version="1.2.2.v20221203-1659"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<!-- Add dependencies that only exists with older orbit version -->
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.activation" version="1.1.0.v201211130549"/>
<unit id="javax.xml.bind" version="0.0.0"/>
<unit id="javax.xml.stream" version="0.0.0"/>
<unit id="org.apache.derby" version="0.0.0"/>
<unit id="org.json" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
Expand Down
7 changes: 2 additions & 5 deletions releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="210">
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="211">
<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"/>
Expand Down Expand Up @@ -30,14 +30,11 @@
<unit id="org.mozilla.javascript" version="1.7.10.v20221112-0806"/>
<unit id="org.slf4j.api" version="0.0.0"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="javax.activation" version="1.2.2.v20221203-1659"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<!-- Add dependencies that only exists with older orbit version -->
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.activation" version="1.1.0.v201211130549"/>
<unit id="javax.xml.bind" version="0.0.0"/>
<unit id="javax.xml.stream" version="0.0.0"/>
<unit id="org.apache.derby" version="0.0.0"/>
<unit id="org.json" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
Expand Down

0 comments on commit 5602e1d

Please sign in to comment.