Skip to content

Commit 56e9e50

Browse files
committed
releng: Build with tracecompass-e4.39 by default
Signed-off-by: Arnaud Fiorini <fiorini.arnaud@gmail.com>
1 parent 1fa0d67 commit 56e9e50

5 files changed

Lines changed: 87 additions & 87 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
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>
5959
<cbi-plugins.version>1.4.2</cbi-plugins.version>
60-
<target-platform>tracecompass-e4.38</target-platform>
60+
<target-platform>tracecompass-e4.39</target-platform>
6161

6262
<rcptt-version>2.5.4</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) -->

rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product renamed to rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.30-e4.38/tracing.product

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
135135
<feature id="org.eclipse.tracecompass.ctf"/>
136136
<feature id="org.eclipse.tracecompass.tmf.ctf"/>
137137
<feature id="org.eclipse.tracecompass.tmf.pcap"/>
138+
<feature id="org.eclipse.ecf.core.ssl.feature"/>
139+
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
138140
<feature id="org.eclipse.ecf.core.feature"/>
139141
<feature id="org.eclipse.ecf.filetransfer.feature"/>
140142
<feature id="org.eclipse.tracecompass.rcp.incubator"/>

rcp/org.eclipse.tracecompass.rcp.product/tracing.product

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
135135
<feature id="org.eclipse.tracecompass.ctf"/>
136136
<feature id="org.eclipse.tracecompass.tmf.ctf"/>
137137
<feature id="org.eclipse.tracecompass.tmf.pcap"/>
138-
<feature id="org.eclipse.ecf.core.ssl.feature"/>
139-
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
140138
<feature id="org.eclipse.ecf.core.feature"/>
141139
<feature id="org.eclipse.ecf.filetransfer.feature"/>
142140
<feature id="org.eclipse.tracecompass.rcp.incubator"/>

rcp/org.eclipse.tracecompass.rcp/feature.xml

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,6 @@
205205
id="org.apache.commons.cli"
206206
version="0.0.0"/>
207207

208-
<plugin
209-
id="org.eclipse.swtchart"
210-
version="0.0.0"/>
211-
212208
<plugin
213209
id="jakarta.xml.bind-api"
214210
version="0.0.0"/>
@@ -445,4 +441,84 @@
445441
id="com.fasterxml.jackson.core.jackson-core"
446442
version="0.0.0"/>
447443

444+
<plugin
445+
id="org.apache.felix.gogo.command"
446+
version="0.0.0"/>
447+
448+
<plugin
449+
id="org.apache.felix.gogo.runtime"
450+
version="0.0.0"/>
451+
452+
<plugin
453+
id="org.apache.felix.gogo.shell"
454+
version="0.0.0"/>
455+
456+
<plugin
457+
id="org.osgi.service.cm"
458+
version="0.0.0"/>
459+
460+
<plugin
461+
id="org.osgi.service.component"
462+
version="0.0.0"/>
463+
464+
<plugin
465+
id="org.osgi.service.device"
466+
version="0.0.0"/>
467+
468+
<plugin
469+
id="org.osgi.service.event"
470+
version="0.0.0"/>
471+
472+
<plugin
473+
id="org.osgi.service.metatype"
474+
version="0.0.0"/>
475+
476+
<plugin
477+
id="org.osgi.service.provisioning"
478+
version="0.0.0"/>
479+
480+
<plugin
481+
id="org.osgi.service.upnp"
482+
version="0.0.0"/>
483+
484+
<plugin
485+
id="org.osgi.service.useradmin"
486+
version="0.0.0"/>
487+
488+
<plugin
489+
id="org.osgi.service.wireadmin"
490+
version="0.0.0"/>
491+
492+
<plugin
493+
id="org.osgi.util.function"
494+
version="0.0.0"/>
495+
496+
<plugin
497+
id="org.osgi.util.measurement"
498+
version="0.0.0"/>
499+
500+
<plugin
501+
id="org.osgi.util.position"
502+
version="0.0.0"/>
503+
504+
<plugin
505+
id="org.osgi.util.promise"
506+
version="0.0.0"/>
507+
508+
<plugin
509+
id="org.osgi.util.xml"
510+
version="0.0.0"/>
511+
512+
<plugin
513+
id="org.osgi.service.prefs"
514+
version="0.0.0"/>
515+
516+
<plugin
517+
id="org.apache.ant"
518+
version="0.0.0"/>
519+
520+
<plugin
521+
id="com.jcraft.jsch"
522+
version="0.0.0"/>
523+
448524
</feature>

rcp/org.eclipse.tracecompass.rcp/staging/feature.xml renamed to rcp/org.eclipse.tracecompass.rcp/legacy-e4.38/feature.xml

Lines changed: 4 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@
205205
id="org.apache.commons.cli"
206206
version="0.0.0"/>
207207

208+
<plugin
209+
id="org.eclipse.swtchart"
210+
version="0.0.0"/>
211+
208212
<plugin
209213
id="jakarta.xml.bind-api"
210214
version="0.0.0"/>
@@ -441,84 +445,4 @@
441445
id="com.fasterxml.jackson.core.jackson-core"
442446
version="0.0.0"/>
443447

444-
<plugin
445-
id="org.apache.felix.gogo.command"
446-
version="0.0.0"/>
447-
448-
<plugin
449-
id="org.apache.felix.gogo.runtime"
450-
version="0.0.0"/>
451-
452-
<plugin
453-
id="org.apache.felix.gogo.shell"
454-
version="0.0.0"/>
455-
456-
<plugin
457-
id="org.osgi.service.cm"
458-
version="0.0.0"/>
459-
460-
<plugin
461-
id="org.osgi.service.component"
462-
version="0.0.0"/>
463-
464-
<plugin
465-
id="org.osgi.service.device"
466-
version="0.0.0"/>
467-
468-
<plugin
469-
id="org.osgi.service.event"
470-
version="0.0.0"/>
471-
472-
<plugin
473-
id="org.osgi.service.metatype"
474-
version="0.0.0"/>
475-
476-
<plugin
477-
id="org.osgi.service.provisioning"
478-
version="0.0.0"/>
479-
480-
<plugin
481-
id="org.osgi.service.upnp"
482-
version="0.0.0"/>
483-
484-
<plugin
485-
id="org.osgi.service.useradmin"
486-
version="0.0.0"/>
487-
488-
<plugin
489-
id="org.osgi.service.wireadmin"
490-
version="0.0.0"/>
491-
492-
<plugin
493-
id="org.osgi.util.function"
494-
version="0.0.0"/>
495-
496-
<plugin
497-
id="org.osgi.util.measurement"
498-
version="0.0.0"/>
499-
500-
<plugin
501-
id="org.osgi.util.position"
502-
version="0.0.0"/>
503-
504-
<plugin
505-
id="org.osgi.util.promise"
506-
version="0.0.0"/>
507-
508-
<plugin
509-
id="org.osgi.util.xml"
510-
version="0.0.0"/>
511-
512-
<plugin
513-
id="org.osgi.service.prefs"
514-
version="0.0.0"/>
515-
516-
<plugin
517-
id="org.apache.ant"
518-
version="0.0.0"/>
519-
520-
<plugin
521-
id="com.jcraft.jsch"
522-
version="0.0.0"/>
523-
524448
</feature>

0 commit comments

Comments
 (0)