Skip to content

Commit d40594a

Browse files
jonahgrahamjonahgraham
committed
Use latest Eclipse Platform and all dependencies for CDT 12.1
Includes removal of references to Platform internals that have been changed. Note the removal of setHoverImageDescriptor matches the change made to platform in eclipse-platform/eclipse.platform@be4a4aa#diff-6b07181bf8beb80046741858e13f5721f608136e00ce17749b5fa6d550cece9b
1 parent 4a499fb commit d40594a

File tree

7 files changed

+30
-36
lines changed

7 files changed

+30
-36
lines changed

‎core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
5-
Bundle-Version: 9.0.0.qualifier
5+
Bundle-Version: 9.0.100.qualifier
66
Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true
5-
Bundle-Version: 8.5.600.qualifier
5+
Bundle-Version: 8.5.700.qualifier
66
Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

‎debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package org.eclipse.cdt.debug.internal.ui.views.signals;
1616

1717
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
18-
import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation;
1918
import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation;
2019
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
20+
import org.eclipse.debug.ui.IDebugUIConstants;
2121
import org.eclipse.jface.resource.ImageDescriptor;
2222

2323
/**
@@ -29,7 +29,7 @@ public class SignalsViewColumnPresentation implements IColumnPresentation {
2929

3030
public static final String ID = PREFIX + "signalsViewColumnPresentationId"; //$NON-NLS-1$
3131

32-
private static final String COLUMN_ID_NAME = VariableColumnPresentation.COLUMN_VARIABLE_NAME;
32+
private static final String COLUMN_ID_NAME = IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE;
3333
private static final String COLUMN_ID_PASS = PREFIX + "signalsColumn.pass"; //$NON-NLS-1$
3434
private static final String COLUMN_ID_STOP = PREFIX + "signalsColumn.stop"; //$NON-NLS-1$
3535
private static final String COLUMN_ID_DESC = PREFIX + "signalsColumn.desc"; //$NON-NLS-1$

‎memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.floatingpoint;singleton:=true
5-
Bundle-Version: 1.2.200.qualifier
5+
Bundle-Version: 1.2.300.qualifier
66
Bundle-Localization: plugin
77
Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.100",
88
org.eclipse.debug.ui;bundle-version="3.8.1",

‎memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRendering.java

-2
Original file line numberDiff line numberDiff line change
@@ -1197,8 +1197,6 @@ public CopyAction(Rendering rendering, int clipboardType) {
11971197
setToolTipText(DebugUIMessages.CopyViewToClipboardAction_tooltip);
11981198
setImageDescriptor(
11991199
DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COPY_VIEW_TO_CLIPBOARD));
1200-
setHoverImageDescriptor(
1201-
DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_COPY_VIEW_TO_CLIPBOARD));
12021200
setDisabledImageDescriptor(
12031201
DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COPY_VIEW_TO_CLIPBOARD));
12041202
}

‎releng/org.eclipse.cdt.repo/category.xml

-4
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,6 @@
214214
<bundle id="org.eclipse.cdt.util.source" version="0.0.0"/>
215215
<bundle id="org.eclipse.cdt.remote.core" version="0.0.0"/>
216216
<bundle id="org.eclipse.cdt.remote.core.source" version="0.0.0"/>
217-
<bundle id="com.sun.xml.bind" version="0.0.0"/>
218-
<bundle id="org.eclipse.orbit.xml-apis-ext" version="0.0.0"/>
219-
<bundle id="javax.activation" version="1.2.2.v20221203-1659"/>
220-
<bundle id="jakarta.xml.bind-api" version="2.3.3"/>
221217
<bundle id="com.google.gson" version="0.0.0"/>
222218
<bundle id="org.freemarker.freemarker" version="2.3.34.stable"/>
223219
<bundle id="org.yaml.snakeyaml" version="0.0.0"/>

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

+25-25
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="164">
3+
<target name="cdt" sequenceNumber="165">
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.34/" />
10+
<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/" />
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" />
@@ -18,15 +18,15 @@
1818
<repository location="https://download.eclipse.org/mylyn/updates/release/latest/" />
1919
</location>
2020
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
21-
<repository location="https://download.eclipse.org/egit/updates-7.0/" />
21+
<repository location="https://download.eclipse.org/egit/updates-stable-nightly/" />
2222
<unit id="org.eclipse.egit.feature.group" version="0.0.0" />
2323
</location>
2424
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
25-
<repository location="https://download.eclipse.org/linuxtools/update-docker-5.17.0/" />
25+
<repository location="https://download.eclipse.org/linuxtools/updates-docker-nightly/" />
2626
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0" />
2727
</location>
2828
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
29-
<repository location="https://download.eclipse.org/lsp4e/releases/0.26.7/" />
29+
<repository location="https://download.eclipse.org/lsp4e/snapshots/" />
3030
<unit id="org.eclipse.lsp4e" version="0.0.0" />
3131
<unit id="org.eclipse.lsp4e.debug" version="0.0.0" />
3232
</location>
@@ -40,7 +40,7 @@
4040
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0" />
4141
</location>
4242
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
43-
<repository location="https://download.eclipse.org/tm4e/releases/0.14.0/" />
43+
<repository location="https://download.eclipse.org/tm4e/releases/latest/" />
4444
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0" />
4545
<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0" />
4646
</location>
@@ -50,21 +50,21 @@
5050
<unit id="org.eclipse.cdt.feature.group" version="0.0.0" />
5151
</location>
5252
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
53-
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.9/" />
53+
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/latest/" />
5454
</location>
5555
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="DirectFromMaven" missingManifest="error" type="Maven">
5656
<dependencies>
5757
<dependency>
5858
<groupId>org.slf4j</groupId>
5959
<artifactId>slf4j-api</artifactId>
60-
<version>2.0.16</version>
60+
<version>2.0.17</version>
6161
<type>jar</type>
6262
</dependency>
6363
<!-- slf4j-api requires 1 impl, provide the one that is generally used in the final product, such as standalone debugger -->
6464
<dependency>
6565
<groupId>org.slf4j</groupId>
6666
<artifactId>slf4j-simple</artifactId>
67-
<version>2.0.16</version>
67+
<version>2.0.17</version>
6868
<type>jar</type>
6969
</dependency>
7070
<dependency>
@@ -76,7 +76,7 @@
7676
<dependency>
7777
<groupId>com.google.code.gson</groupId>
7878
<artifactId>gson</artifactId>
79-
<version>2.11.0</version>
79+
<version>2.13.1</version>
8080
<type>jar</type>
8181
</dependency>
8282
<dependency>
@@ -88,13 +88,13 @@
8888
<dependency>
8989
<groupId>commons-io</groupId>
9090
<artifactId>commons-io</artifactId>
91-
<version>2.18.0</version>
91+
<version>2.19.0</version>
9292
<type>jar</type>
9393
</dependency>
9494
<dependency>
9595
<groupId>org.assertj</groupId>
9696
<artifactId>assertj-core</artifactId>
97-
<version>3.27.2</version>
97+
<version>3.27.3</version>
9898
<type>jar</type>
9999
</dependency>
100100
<dependency>
@@ -106,43 +106,43 @@
106106
<dependency>
107107
<groupId>org.junit.jupiter</groupId>
108108
<artifactId>junit-jupiter-api</artifactId>
109-
<version>5.11.4</version>
109+
<version>5.12.2</version>
110110
<type>jar</type>
111111
</dependency>
112112
<dependency>
113113
<groupId>org.junit.jupiter</groupId>
114114
<artifactId>junit-jupiter-engine</artifactId>
115-
<version>5.11.4</version>
115+
<version>5.12.2</version>
116116
<type>jar</type>
117117
</dependency>
118118
<dependency>
119119
<groupId>org.mockito</groupId>
120120
<artifactId>mockito-core</artifactId>
121-
<version>5.15.2</version>
121+
<version>5.17.0</version>
122122
<type>jar</type>
123123
</dependency>
124124
<dependency>
125125
<groupId>org.yaml</groupId>
126126
<artifactId>snakeyaml</artifactId>
127-
<version>2.3</version>
127+
<version>2.4</version>
128128
<type>jar</type>
129129
</dependency>
130130
<dependency>
131131
<groupId>net.java.dev.jna</groupId>
132132
<artifactId>jna-platform</artifactId>
133-
<version>5.16.0</version>
133+
<version>5.17.0</version>
134134
<type>jar</type>
135135
</dependency>
136136
<dependency>
137137
<groupId>net.java.dev.jna</groupId>
138138
<artifactId>jna</artifactId>
139-
<version>5.16.0</version>
139+
<version>5.17.0</version>
140140
<type>jar</type>
141141
</dependency>
142142
<dependency>
143143
<groupId>com.google.guava</groupId>
144144
<artifactId>guava</artifactId>
145-
<version>33.4.0-jre</version>
145+
<version>33.4.8-jre</version>
146146
<type>jar</type>
147147
</dependency>
148148
<dependency>
@@ -158,31 +158,31 @@
158158
<dependency>
159159
<groupId>org.ow2.asm</groupId>
160160
<artifactId>asm-commons</artifactId>
161-
<version>9.7.1</version>
161+
<version>9.8</version>
162162
<type>jar</type>
163163
</dependency>
164164
<dependency>
165165
<groupId>org.ow2.asm</groupId>
166166
<artifactId>asm-util</artifactId>
167-
<version>9.7.1</version>
167+
<version>9.8</version>
168168
<type>jar</type>
169169
</dependency>
170170
<dependency>
171171
<groupId>org.ow2.asm</groupId>
172172
<artifactId>asm</artifactId>
173-
<version>9.7.1</version>
173+
<version>9.8</version>
174174
<type>jar</type>
175175
</dependency>
176176
<dependency>
177177
<groupId>org.ow2.asm</groupId>
178178
<artifactId>asm-tree</artifactId>
179-
<version>9.7.1</version>
179+
<version>9.8</version>
180180
<type>jar</type>
181181
</dependency>
182182
<dependency>
183183
<groupId>org.ow2.asm</groupId>
184184
<artifactId>asm-analysis</artifactId>
185-
<version>9.7.1</version>
185+
<version>9.8</version>
186186
<type>jar</type>
187187
</dependency>
188188
<dependency>
@@ -199,7 +199,7 @@
199199
</dependencies>
200200
</location>
201201
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
202-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
202+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06/"/>
203203
<unit id="org.junit" version="4.13.2.v20240929-1000" />
204204
<unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20240917-0534"/>
205205
<unit id="bcpg" version="0.0.0"/>

0 commit comments

Comments
 (0)