Skip to content

Commit f8301d5

Browse files
committed
#321 - Frameworkerrors during startup
* Added reconciler property * Added bundle reference to apache commons io
1 parent 3bc5517 commit f8301d5

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

it.baeyens.arduino.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Bundle-ActivationPolicy: lazy
99
Import-Package: it.baeyens.arduino.arduino,
1010
it.baeyens.arduino.common,
1111
it.baeyens.arduino.monitor,
12-
org.apache.commons.io,
1312
org.eclipse.cdt.core,
1413
org.eclipse.cdt.core.envvar,
1514
org.eclipse.cdt.core.language.settings.providers,
@@ -45,4 +44,5 @@ Require-Bundle: org.eclipse.core.resources,
4544
org.eclipse.ui.forms,
4645
org.eclipse.ui.workbench,
4746
org.eclipse.core.runtime,
48-
org.eclipse.core.commands
47+
org.eclipse.core.commands,
48+
org.apache.commons.io;bundle-version="2.2.0"

it.baeyens.arduino.product/arduino.product

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ https://github.com/jantje/arduino-eclipse-plugin/graphs/contributors
2828
--launcher.appendVmargs
2929
</programArgs>
3030
<vmArgs>-Dosgi.requiredJavaVersion=1.8
31+
-Dorg.eclipse.update.reconcile=false
3132
-Xms40m
3233
-Xmx512m
3334
</vmArgs>
@@ -340,6 +341,7 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
340341
<feature id="org.eclipse.rcp" installMode="root"/>
341342
<feature id="org.eclipse.rse" installMode="root"/>
342343
<feature id="org.eclipse.cdt.testsrunner.feature"/>
344+
<feature id="org.eclipse.equinox.core.sdk"/>
343345
</features>
344346

345347
<configurations>
@@ -357,6 +359,15 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
357359
<repository location="http://download.eclipse.org/eclipse/updates/4.5" enabled="true" />
358360
<repository location="http://eclipse.baeyens.it/nightly" enabled="false" />
359361
<repository location="http://eclipse.baeyens.it/V3" enabled="true" />
362+
<repository location="http://download.eclipse.org/tools/cdt/releases/8.8.1" enabled="true" />
363+
<repository location="http://download.eclipse.org/releases/mars" enabled="true" />
364+
<repository location="http://download.eclipse.org/eclipse/updates/4.5" enabled="true" />
365+
<repository location="http://eclipse.baeyens.it/nightly" enabled="false" />
366+
<repository location="http://eclipse.baeyens.it/V3" enabled="true" />
367+
<repository location="http://download.eclipse.org/releases/mars" enabled="true" />
368+
<repository location="http://download.eclipse.org/eclipse/updates/4.5" enabled="true" />
369+
<repository location="http://eclipse.baeyens.it/nightly" enabled="false" />
370+
<repository location="http://eclipse.baeyens.it/V3" enabled="true" />
360371
</repositories>
361372

362373
<preferencesInfo>

0 commit comments

Comments
 (0)