Skip to content

Commit ac67e93

Browse files
committed
Update to Apache Aries SPI Fly 1.3.7
1 parent 0d7583d commit ac67e93

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

org.eclipse.m2e.logback.feature/feature.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
%copyright
1717
</copyright>
1818

19-
<requires>
20-
<import plugin="jakarta.servlet-api" version="5.0.0" match="compatible"/>
21-
</requires>
22-
2319
<plugin
2420
id="org.eclipse.m2e.logback"
2521
version="0.0.0"/>

products/m2e-ide/Eclipse-M2E-IDE.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
33
<setAttribute key="additional_plugins">
44
<setEntry value="ch.qos.logback.classic:1.4.11:default:true:default:true"/>
5-
<setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.6:default:true:2:true"/>
5+
<setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.7:default:true:2:true"/>
66
<setEntry value="org.apache.felix.scr:2.2.6:default:true:2:true"/>
77
<setEntry value="org.eclipse.core.runtime:3.29.0.v20230726-0617:default:true:default:true"/>
88
<setEntry value="org.eclipse.equinox.common:3.18.100.v20230730-1117:default:true:2:true"/>

target-platform/target-platform.target

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
1010
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
1111
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
12-
<unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
1312
<unit id="org.mockito.mockito-core" version="0.0.0"/>
1413
</location>
1514
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -59,7 +58,7 @@
5958
</dependency>
6059
</dependencies>
6160
</location>
62-
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Logging" missingManifest="generate" type="Maven">
61+
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Logging" missingManifest="error" type="Maven">
6362
<dependencies>
6463
<dependency>
6564
<groupId>ch.qos.logback</groupId>
@@ -68,10 +67,9 @@
6867
<type>jar</type>
6968
</dependency>
7069
<dependency>
71-
<!-- Logback provides a Servlet Container service which is also loaded and that needs servlet (by default optional) -->
72-
<groupId>jakarta.servlet</groupId>
73-
<artifactId>jakarta.servlet-api</artifactId>
74-
<version>5.0.0</version>
70+
<groupId>org.apache.aries.spifly</groupId>
71+
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
72+
<version>1.3.7</version>
7573
<type>jar</type>
7674
</dependency>
7775
</dependencies>
@@ -173,4 +171,4 @@ Import-Package: !*
173171
</location>
174172
<location type="Target" uri="file:${project_loc:/m2e-core}/target-platform/m2e-runtimes.target"/>
175173
</locations>
176-
</target>
174+
</target>

0 commit comments

Comments
 (0)