Skip to content

Commit ddc8470

Browse files
jonahgrahamjonahgraham
authored
Prepare repo for CDT 11.4.0 M3 (#618)
Includes updating to latest target platform. This should also fix #591 but it is hard to tell until after it is integrated into SimRel and the output checked in EPP. Fixes #591 Part of #548
1 parent 050770d commit ddc8470

File tree

5 files changed

+32
-27
lines changed

5 files changed

+32
-27
lines changed

‎debug/org.eclipse.cdt.debug.application.product/debug.product‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -185,34 +185,29 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
185185
<plugin id="bcprov"/>
186186
<plugin id="com.google.gson"/>
187187
<plugin id="com.ibm.icu"/>
188+
<plugin id="com.jcraft.jsch"/>
189+
<plugin id="com.sun.el.javax.el"/>
188190
<plugin id="com.sun.jna"/>
189191
<plugin id="com.sun.jna.platform"/>
190192
<plugin id="com.sun.xml.bind"/>
191193
<plugin id="jakarta.activation-api"/>
192194
<plugin id="jakarta.annotation-api"/>
193195
<plugin id="jakarta.inject.jakarta.inject-api"/>
194-
<plugin id="jakarta.servlet-api"/>
195196
<plugin id="jakarta.xml.bind-api"/>
196-
<plugin id="javax.el-api"/>
197-
<plugin id="javax.servlet.jsp-api"/>
198197
<plugin id="org.apache.aries.spifly.dynamic.bundle"/>
199198
<plugin id="org.apache.batik.constants"/>
200199
<plugin id="org.apache.batik.css"/>
201200
<plugin id="org.apache.batik.i18n"/>
202201
<plugin id="org.apache.batik.util"/>
203-
<plugin id="org.apache.commons.codec"/>
204202
<plugin id="org.apache.commons.collections"/>
205203
<plugin id="org.apache.commons.commons-beanutils"/>
206204
<plugin id="org.apache.commons.commons-io"/>
207205
<plugin id="org.apache.commons.jxpath"/>
208206
<plugin id="org.apache.commons.logging"/>
207+
<plugin id="org.apache.felix.gogo.command"/>
208+
<plugin id="org.apache.felix.gogo.runtime"/>
209+
<plugin id="org.apache.felix.gogo.shell"/>
209210
<plugin id="org.apache.felix.scr"/>
210-
<plugin id="org.apache.httpcomponents.client5.httpclient5"/>
211-
<plugin id="org.apache.httpcomponents.core5.httpcore5"/>
212-
<plugin id="org.apache.httpcomponents.core5.httpcore5-h2"/>
213-
<plugin id="org.apache.httpcomponents.httpclient"/>
214-
<plugin id="org.apache.httpcomponents.httpcore"/>
215-
<plugin id="org.apache.jasper.glassfish"/>
216211
<plugin id="org.apache.lucene.analysis-common"/>
217212
<plugin id="org.apache.lucene.analysis-smartcn"/>
218213
<plugin id="org.apache.lucene.core"/>
@@ -252,6 +247,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
252247
<plugin id="org.eclipse.core.commands"/>
253248
<plugin id="org.eclipse.core.contenttype"/>
254249
<plugin id="org.eclipse.core.databinding"/>
250+
<plugin id="org.eclipse.core.databinding.beans"/>
255251
<plugin id="org.eclipse.core.databinding.observable"/>
256252
<plugin id="org.eclipse.core.databinding.property"/>
257253
<plugin id="org.eclipse.core.expressions"/>
@@ -301,7 +297,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
301297
<plugin id="org.eclipse.ecf.filetransfer"/>
302298
<plugin id="org.eclipse.ecf.identity"/>
303299
<plugin id="org.eclipse.ecf.provider.filetransfer"/>
304-
<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
300+
<plugin id="org.eclipse.ecf.provider.filetransfer.httpclientjava"/>
305301
<plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
306302
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
307303
<plugin id="org.eclipse.emf.common"/>
@@ -358,26 +354,33 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
358354
<plugin id="org.eclipse.help.webapp"/>
359355
<plugin id="org.eclipse.jdt.core"/>
360356
<plugin id="org.eclipse.jdt.core.compiler.batch"/>
357+
<plugin id="org.eclipse.jetty.ee8.security"/>
358+
<plugin id="org.eclipse.jetty.ee8.server"/>
359+
<plugin id="org.eclipse.jetty.ee8.servlet"/>
361360
<plugin id="org.eclipse.jetty.http"/>
362361
<plugin id="org.eclipse.jetty.io"/>
363362
<plugin id="org.eclipse.jetty.security"/>
364363
<plugin id="org.eclipse.jetty.server"/>
365-
<plugin id="org.eclipse.jetty.servlet"/>
364+
<plugin id="org.eclipse.jetty.servlet-api"/>
365+
<plugin id="org.eclipse.jetty.session"/>
366366
<plugin id="org.eclipse.jetty.util"/>
367-
<plugin id="org.eclipse.jetty.util.ajax"/>
368367
<plugin id="org.eclipse.jface"/>
369368
<plugin id="org.eclipse.jface.databinding"/>
370369
<plugin id="org.eclipse.jface.notifications"/>
371370
<plugin id="org.eclipse.jface.text"/>
371+
<plugin id="org.eclipse.jsch.core"/>
372+
<plugin id="org.eclipse.jsch.ui"/>
372373
<plugin id="org.eclipse.launchbar.core"/>
373374
<plugin id="org.eclipse.launchbar.ui"/>
374375
<plugin id="org.eclipse.ltk.core.refactoring"/>
375376
<plugin id="org.eclipse.ltk.ui.refactoring"/>
377+
<plugin id="org.eclipse.orbit.xml-apis-ext"/>
376378
<plugin id="org.eclipse.osgi"/>
377379
<plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
378380
<plugin id="org.eclipse.osgi.services"/>
379381
<plugin id="org.eclipse.osgi.util"/>
380382
<plugin id="org.eclipse.search"/>
383+
<plugin id="org.eclipse.search.core"/>
381384
<plugin id="org.eclipse.swt"/>
382385
<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
383386
<plugin id="org.eclipse.swt.gtk.linux.aarch64" fragment="true"/>
@@ -408,6 +411,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
408411
<plugin id="org.eclipse.urischeme"/>
409412
<plugin id="org.freemarker.freemarker"/>
410413
<plugin id="org.jdom"/>
414+
<plugin id="org.mortbay.jasper.apache-jsp"/>
411415
<plugin id="org.objectweb.asm"/>
412416
<plugin id="org.objectweb.asm.commons"/>
413417
<plugin id="org.objectweb.asm.tree"/>
@@ -430,23 +434,20 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
430434
<plugin id="org.osgi.util.xml"/>
431435
<plugin id="org.sat4j.core"/>
432436
<plugin id="org.sat4j.pb"/>
433-
<plugin id="org.slf4j.api"/>
434437
<plugin id="org.tukaani.xz"/>
435-
<plugin id="org.w3c.css.sac"/>
436-
<plugin id="org.w3c.dom.events"/>
437-
<plugin id="org.w3c.dom.smil"/>
438-
<plugin id="org.w3c.dom.svg"/>
439438
<plugin id="slf4j.api"/>
440-
<plugin id="slf4j.nop"/>
439+
<plugin id="slf4j.simple"/>
441440
</plugins>
442441

443442
<configurations>
443+
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
444444
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
445445
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
446446
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
447447
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
448448
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
449449
<plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
450+
<plugin id="slf4j.simple" autoStart="true" startLevel="2" />
450451
</configurations>
451452

452453
<repositories>

‎debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ Require-Bundle: org.eclipse.ui,
2020
org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.1",
2121
org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="8.2.0",
2222
org.eclipse.cdt.debug.core,
23-
org.eclipse.ui.workbench
23+
org.eclipse.ui.workbench,
24+
org.eclipse.orbit.xml-apis-ext,
25+
jakarta.activation-api,
26+
jakarta.xml.bind-api
2427
Bundle-RequiredExecutionEnvironment: JavaSE-17
2528
Bundle-Localization: plugin
2629
Bundle-ActivationPolicy: lazy

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<cbi-plugins.version>1.3.4</cbi-plugins.version>
3131
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
3232
<cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
33-
<simrel-site>https://download.eclipse.org/staging/2023-09/</simrel-site>
33+
<simrel-site>https://download.eclipse.org/staging/2023-12/</simrel-site>
3434
<repo-path>tools/cdt/builds/master/nightly</repo-path>
3535
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
3636
<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>

‎releng/CDT.setup‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<setupTask
7575
xsi:type="setup:VariableTask"
7676
name="eclipse.target.platform"
77-
value="${eclipse.target.platform.latest.released}"
77+
value="${eclipse.target.platform.latest}"
7878
defaultValue=""
7979
storageURI="scope://Workspace"/>
8080
<setupTask

‎releng/org.eclipse.cdt.target/cdt.target‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
3-
<target name="cdt" sequenceNumber="150">
3+
<target name="cdt" sequenceNumber="151">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
66
<repository location="https://download.eclipse.org/cbi/updates/license/" />
77
<unit id="org.eclipse.license.feature.group" version="0.0.0" />
88
</location>
99
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
10-
<repository location="https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/" />
10+
<repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231109-0710/" />
1111
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" />
1212
<unit id="org.eclipse.jdt.annotation" version="0.0.0" />
1313
<unit id="org.eclipse.sdk.feature.group" version="0.0.0" />
@@ -57,10 +57,10 @@
5757
<version>2.0.7</version>
5858
<type>jar</type>
5959
</dependency>
60-
<!-- slf4j-api requires 1 impl, providing a dummy one... -->
60+
<!-- slf4j-api requires 1 impl, provide the one that is generally used in the final product, such as standalone debugger -->
6161
<dependency>
6262
<groupId>org.slf4j</groupId>
63-
<artifactId>slf4j-nop</artifactId>
63+
<artifactId>slf4j-simple</artifactId>
6464
<version>2.0.7</version>
6565
<type>jar</type>
6666
</dependency>
@@ -195,14 +195,15 @@
195195
</dependencies>
196196
</location>
197197
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
198-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release"/>
198+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202311141131"/>
199199
<!-- failureaccess is needed because the Linuxtools depends on it but doesn't republish it - https://github.com/eclipse-linuxtools/org.eclipse.linuxtools/issues/232
200200
This dep can't be added to maven section because of https://github.com/eclipse-pde/eclipse.pde/issues/675 -->
201201
<unit id="com.google.guava.failureaccess" version="0.0.0" />
202202

203203
<unit id="org.hamcrest.core" version="1.3.0.v20230809-1000" />
204204
<unit id="org.hamcrest.library" version="1.3.0.v20230809-1000" />
205205
<unit id="org.junit" version="4.13.2.v20230809-1000" />
206+
<unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
206207
</location>
207208
</locations>
208209
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17" />

0 commit comments

Comments
 (0)