Skip to content

Commit

Permalink
Update target platform to latest Eclipse Platform milestone
Browse files Browse the repository at this point in the history
This includes updating to 3rd party dependencies coming from Maven
so that everything resolves properly. In particular spifly
required asm, and by doing `includeDependencyDepth="direct"` that
dependency is included in the target platform.
  • Loading branch information
jonahgraham committed Jul 21, 2023
1 parent 899a386 commit 4aa5167
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
6 changes: 6 additions & 0 deletions debug/org.eclipse.cdt.debug.application.product/debug.product
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="javax.servlet.jsp-api"/>
<plugin id="javax.xml"/>
<plugin id="javax.xml.stream"/>
<plugin id="org.apache.aries.spifly.dynamic.bundle"/>
<plugin id="org.apache.batik.constants"/>
<plugin id="org.apache.batik.css"/>
<plugin id="org.apache.batik.i18n"/>
Expand Down Expand Up @@ -407,6 +408,11 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.eclipse.urischeme"/>
<plugin id="org.freemarker"/>
<plugin id="org.objectweb.asm"/>
<plugin id="org.objectweb.asm.commons"/>
<plugin id="org.objectweb.asm.tree"/>
<plugin id="org.objectweb.asm.tree.analysis"/>
<plugin id="org.objectweb.asm.util"/>
<plugin id="org.osgi.service.cm"/>
<plugin id="org.osgi.service.component"/>
<plugin id="org.osgi.service.device"/>
Expand Down
9 changes: 4 additions & 5 deletions releng/org.eclipse.cdt.target/cdt.target
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="cdt" sequenceNumber="141">
<target name="cdt" sequenceNumber="142">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/cbi/updates/license/" />
<unit id="org.eclipse.license.feature.group" version="0.0.0" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.28/R-4.28-202306050440" />
<repository location="https://download.eclipse.org/eclipse/updates/4.29-I-builds/I20230705-1800/" />
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" />
<unit id="org.eclipse.jdt.annotation" version="0.0.0" />
<unit id="org.eclipse.sdk.feature.group" version="0.0.0" />
Expand Down Expand Up @@ -66,8 +66,7 @@
<unit id="javax.xml.stream" version="0.0.0" />
<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0" />
</location>

<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
<location includeDependencyDepth="direct" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -157,4 +156,4 @@
-ea</vmArgs>
<programArgs>-consolelog</programArgs>
</launcherArgs>
</target>
</target>

0 comments on commit 4aa5167

Please sign in to comment.