Skip to content

Commit 9161782

Browse files
author
jan
committed
Fix the SDK build #1616
1 parent 85c7639 commit 9161782

File tree

12 files changed

+40
-24
lines changed

12 files changed

+40
-24
lines changed

io.sloeber.parent/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<!--
8181
<source>11</source>
8282
<target>11</target> -->
83-
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>
8483

8584
</configuration>
8685
</plugin>
@@ -96,7 +95,6 @@
9695
<plugin>
9796
<groupId>org.apache.maven.plugins</groupId>
9897
<artifactId>maven-release-plugin</artifactId>
99-
<version>2.5.3</version>
10098
<configuration>
10199
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
102100
</configuration>

io.sloeber.product.sdk/arduino.product

+16-17
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Sloeber" uid="io.sloeber.product" id="io.sloeber.application.product" application="org.eclipse.ui.ide.workbench" version="4.4.2.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
4+
<product name="Sloeber" uid="io.sloeber.product" id="io.sloeber.application.product" application="org.eclipse.ui.ide.workbench" version="4.4.2.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="false">
55

66
<aboutInfo>
7-
<image path="/io.sloeber.application/icons/eclipse_lg.png"/>
7+
<image path="/io.sloeber.product.sdk/icons/eclipse_lg.png"/>
88
<text>
99
Sloeber, the Eclipse IDE for Arduino Developers
1010

@@ -36,10 +36,10 @@ https://github.com/sloeber/arduino-eclipse-plugin/graphs/contributors
3636
</vmArgsMac>
3737
</launcherArgs>
3838

39-
<windowImages i16="/io.sloeber.application/icons/logo_16.png" i32="/io.sloeber.application/icons/logo_32.png" i48="/io.sloeber.application/icons/logo_48.png" i256="/io.sloeber.application/icons/logo_256.png"/>
39+
<windowImages i16="/io.sloeber.product.sdk/icons/logo_16.png" i32="/io.sloeber.product.sdk/icons/logo_32.png" i48="/io.sloeber.product.sdk/icons/logo_48.png" i256="/io.sloeber.product.sdk/icons/logo_256.png"/>
4040

4141
<splash
42-
location="io.sloeber.application"
42+
location="io.sloeber.product"
4343
startupProgressRect="97,370,100,4"
4444
startupMessageRect="400,370,441,20"
4545
startupForegroundColor="C8D5EA" />
@@ -207,7 +207,6 @@ United States, other countries, or both.
207207
</plugins>
208208

209209
<features>
210-
<feature id="ilg.gnumcueclipse.debug.gdbjtag.openocd.feature" installMode="root"/>
211210
<feature id="org.eclipse.cdt.autotools" installMode="root"/>
212211
<feature id="org.eclipse.cdt.gdb" installMode="root"/>
213212
<feature id="org.eclipse.cdt.gnu.build" installMode="root"/>
@@ -224,7 +223,6 @@ United States, other countries, or both.
224223
<feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
225224
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" installMode="root"/>
226225
<feature id="org.eclipse.ecf.filetransfer.ssl.feature" installMode="root"/>
227-
<feature id="org.eclipse.egit" installMode="root"/>
228226
<feature id="org.eclipse.emf.common" installMode="root"/>
229227
<feature id="org.eclipse.emf.ecore" installMode="root"/>
230228
<feature id="org.eclipse.epp.mpc" installMode="root"/>
@@ -240,18 +238,13 @@ United States, other countries, or both.
240238
<feature id="org.eclipse.jgit" installMode="root"/>
241239
<feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
242240
<feature id="org.eclipse.mylyn_feature" installMode="root"/>
243-
<feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
244241
<feature id="org.eclipse.mylyn.commons.identity" installMode="root"/>
245242
<feature id="org.eclipse.mylyn.commons.notifications" installMode="root"/>
246243
<feature id="org.eclipse.mylyn.commons.repositories" installMode="root"/>
247244
<feature id="org.eclipse.mylyn.commons" installMode="root"/>
248245
<feature id="org.eclipse.mylyn.context_feature" installMode="root"/>
249246
<feature id="org.eclipse.mylyn.discovery" installMode="root"/>
250-
<feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
251247
<feature id="org.eclipse.mylyn.monitor" installMode="root"/>
252-
<feature id="org.eclipse.mylyn.tasks.ide" installMode="root"/>
253-
<feature id="org.eclipse.mylyn.team_feature" installMode="root"/>
254-
<feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
255248
<feature id="org.eclipse.nebula.widgets.oscilloscope.feature" installMode="root"/>
256249
<feature id="org.eclipse.pde.source" installMode="root"/>
257250
<feature id="org.eclipse.pde" installMode="root"/>
@@ -266,6 +259,13 @@ United States, other countries, or both.
266259
<feature id="org.eclipse.rse.ssh" installMode="root"/>
267260
<feature id="org.eclipse.rse.telnet" installMode="root"/>
268261
<feature id="org.eclipse.rse" installMode="root"/>
262+
<feature id="org.eclipse.equinox.p2.core.feature.source" installMode="root"/>
263+
<feature id="org.eclipse.help.source" installMode="root"/>
264+
<feature id="org.eclipse.equinox.p2.user.ui.source" installMode="root"/>
265+
<feature id="org.eclipse.equinox.p2.extras.feature.source" installMode="root"/>
266+
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature" installMode="root"/>
267+
<feature id="org.eclipse.equinox.p2.rcp.feature.source" installMode="root"/>
268+
<feature id="org.eclipse.egit" installMode="root"/>
269269
</features>
270270

271271
<configurations>
@@ -280,12 +280,11 @@ United States, other countries, or both.
280280
</configurations>
281281

282282
<repositories>
283-
<repository location="https://eclipse.baeyens.it/update/V4/stable/" enabled="true" />
284-
<repository location="https://download.eclipse.org/technology/babel/update-site/latest/" enabled="false" />
285-
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest/" enabled="true" />
286-
<repository location="https://download.eclipse.org/releases/latest/" enabled="true" />
287-
<repository location="https://download.eclipse.org/eclipse/updates/latest" enabled="true" />
288-
<repository location="https://download.eclipse.org/nebula/releases/latest/" enabled="true" />
283+
<repository location="https://download.eclipse.org/technology/babel/update-site/latest/" name="" enabled="false" />
284+
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest/" name="" enabled="true" />
285+
<repository location="https://download.eclipse.org/releases/latest/" name="" enabled="true" />
286+
<repository location="https://download.eclipse.org/eclipse/updates/latest" name="" enabled="true" />
287+
<repository location="https://download.eclipse.org/nebula/releases/latest/" name="" enabled="true" />
289288
</repositories>
290289

291290
<preferencesInfo>
36.5 KB
Loading
10.4 KB
Loading
901 Bytes
Loading
21.7 KB
Loading
2.08 KB
Loading
3.54 KB
Loading
4.89 KB
Loading
332 Bytes
Loading
526 Bytes
Loading

io.sloeber.product/sloeber.target

+24-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
<?pde version="3.8"?>
33
<target includeMode="feature" name="Sloeber">
44
<locations>
5-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<repository location="https://download.eclipse.org/nebula/releases/latest/"/>
7-
<unit id="org.eclipse.nebula.widgets.oscilloscope.css.feature.feature.group" version="0.0.0"/>
8-
<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="0.0.0"/>
9-
</location>
105
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
116
<repository location="https://download.eclipse.org/releases/latest"/>
127
<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
@@ -30,6 +25,30 @@
3025
<unit id="org.eclipse.ecf.core.feature.group" version="0.0.0"/>
3126
<unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="0.0.0"/>
3227
</location>
28+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
29+
<repository location="https://download.eclipse.org/nebula/releases/latest/"/>
30+
<unit id="org.eclipse.nebula.widgets.oscilloscope.css.feature.feature.group" version="0.0.0"/>
31+
<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="0.0.0"/>
32+
</location>
33+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
34+
<repository location="http://download.eclipse.org/mylyn/releases/latest"/>
35+
<unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.26.0.v20221229-1738"/>
36+
<unit id="org.eclipse.mylyn_feature.feature.group" version="3.26.0.v20230416-1636"/>
37+
</location>
38+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
39+
<repository location="https://download.eclipse.org/egit/updates"/>
40+
<unit id="org.eclipse.egit.feature.group" version="6.8.0.202311291450-r"/>
41+
<unit id="org.eclipse.egit.source.feature.group" version="6.8.0.202311291450-r"/>
42+
<unit id="org.eclipse.jgit.feature.group" version="6.8.0.202311291450-r"/>
43+
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.8.0.202311291450-r"/>
44+
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.8.0.202311291450-r"/>
45+
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.8.0.202311291450-r"/>
46+
<unit id="org.eclipse.jgit.lfs.feature.group" version="6.8.0.202311291450-r"/>
47+
<unit id="org.eclipse.jgit.pgm.feature.group" version="6.8.0.202311291450-r"/>
48+
<unit id="org.eclipse.jgit.source.feature.group" version="6.8.0.202311291450-r"/>
49+
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.8.0.202311291450-r"/>
50+
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.8.0.202311291450-r"/>
51+
</location>
3352
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="DirectFromMaven" missingManifest="error" type="Maven">
3453
<dependencies>
3554
<dependency>

0 commit comments

Comments
 (0)