Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Configure start behavior of logback-class through m2e.logback.feature #1512

Merged
merged 1 commit into from
Aug 19, 2023
Merged

Configure start behavior of logback-class through m2e.logback.feature #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion org.eclipse.m2e.logback.feature/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
bin.includes = feature.xml,\
feature.properties
feature.properties,\
p2.inf
6 changes: 6 additions & 0 deletions org.eclipse.m2e.logback.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
%copyright
</copyright>

<requires>
<!-- This is only necessary until Aries can handle the absence of the servlet-api for logback:
https://github.com/apache/aries/pull/233 -->
<import plugin="jakarta.servlet-api" version="5.0.0" match="compatible"/>
</requires>

<plugin
id="org.eclipse.m2e.logback"
download-size="0"
Expand Down
25 changes: 25 additions & 0 deletions org.eclipse.m2e.logback.feature/p2.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#The purpose of the following advices is to configure ch.qos.logback.classic as auto-started with start-level 2 when installing this feature
#Create a requirement on the fragment we are creating
requires.0.namespace=org.eclipse.equinox.p2.iu
requires.0.name=configure.logback.classic
requires.0.range=[$version$,$version$]
requires.0.greedy=true

#Create a IU fragment named configure.logback.classic
units.0.id=configure.logback.classic
units.0.version=$version$
units.0.provides.0.namespace=org.eclipse.equinox.p2.iu
units.0.provides.0.name=configure.logback.classic
units.0.provides.0.version=$version$
units.0.instructions.install=org.eclipse.equinox.p2.touchpoint.eclipse.installBundle(bundle:${artifact});
units.0.instructions.uninstall=org.eclipse.equinox.p2.touchpoint.eclipse.uninstallBundle(bundle:${artifact});
units.0.instructions.configure= \
org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel:2); \
org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started:true);
units.0.instructions.unconfigure= \
org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel:-1); \
org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started:false);
units.0.hostRequirements.0.namespace=osgi.bundle
units.0.hostRequirements.0.name=ch.qos.logback.classic
units.0.hostRequirements.0.range=[1.3,1.5]
units.0.hostRequirements.0.greedy=false
3 changes: 1 addition & 2 deletions products/m2e-ide/Eclipse-M2E-IDE.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<setAttribute key="additional_plugins">
<setEntry value="ch.qos.logback.classic:1.4.8:default:true:default:true"/>
<setEntry value="jakarta.servlet-api:5.0.0:default:true:default:default"/>
<setEntry value="ch.qos.logback.classic:1.4.11:default:true:default:true"/>
<setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.6:default:true:2:true"/>
<setEntry value="org.apache.felix.scr:2.2.6:default:true:2:true"/>
<setEntry value="org.apache.xml.resolver:1.2.0.v20220715-1206:default:true:default:default"/>
Expand Down
10 changes: 1 addition & 9 deletions products/m2e-ide/m2e-ide.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="M2Eclipse IDE" uid="m2e-ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="2.0.0" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
<product name="M2Eclipse IDE" uid="m2e-ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="2.0.0" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand All @@ -23,13 +23,6 @@
</win>
</launcher>

<vm>
</vm>

<plugins>
<plugin id="jakarta.servlet-api" version="5.0.0"/>
</plugins>

<features>
<feature id="org.eclipse.m2e.feature" installMode="root"/>
<feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
Expand All @@ -39,7 +32,6 @@
</features>

<configurations>
<plugin id="ch.qos.logback.classic" autoStart="true" startLevel="0" />
<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="0" />
Expand Down
Loading