Move Aries SPIFly bundle after simpleconfigurator to start it afterwards

Fixes eclipse-equinox/equinox#302
eclipse-platform · Aug 15, 2023 · bb805d3 · bb805d3
1 parent b0b4e28
commit bb805d3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
@@ -183,14 +183,14 @@ United States, other countries, or both.
  </features>
 
  <configurations>
- <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="1" />
+ <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
  <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
  <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
  <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
- <plugin id="slf4j.simple" autoStart="true" startLevel="1" />
+ <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
  <property name="org.eclipse.update.reconcile" value="false" />
  <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
  <property name="osgi.bundles.defaultStartLevel" value="4" />

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product
@@ -185,13 +185,13 @@ United States, other countries, or both.
  </features>
 
  <configurations>
- <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="1" />
+ <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
  <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
  <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="2" />
  <plugin id="slf4j.simple" autoStart="true" startLevel="1" />
  </configurations>
 

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
@@ -188,14 +188,14 @@ United States, other countries, or both.
  </features>
 
  <configurations>
- <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="1" />
+ <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
  <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
  <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
  <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
  <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
- <plugin id="slf4j.simple" autoStart="true" startLevel="1" />
+ <plugin id="slf4j.simple" autoStart="true" startLevel="2" />
  <property name="osgi.bundles.defaultStartLevel" value="4" />
  <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
  <property name="org.eclipse.update.reconcile" value="false" />