Always include slf4j.simple or m2e.logback in each package

Fixes eclipse-packaging#27 specifically a follow up for eclipse-packaging#47: eclipse-packaging#47 (comment)
jonahgraham · Aug 25, 2023 · c13a224 · c13a224
1 parent 65cfd12
commit c13a224
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 10 deletions.
diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -274,7 +274,7 @@ United States, other countries, or both.
  <feature id="org.eclipse.mylyn.pde.feature" installMode="root"/>
  </features>
  <plugins>
- <plugin id="slf4j.api"/>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
  <plugin id="slf4j.simple"/>
  </plugins>
 

diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
  <aboutInfo>
  <image path="/org.eclipse.epp.package.cpp/eclipse_lg.png"/>
@@ -277,6 +277,9 @@ United States, other countries, or both.
  <feature id="org.eclipse.tracecompass.lttng2.ust" installMode="root"/>
  <feature id="org.eclipse.mylyn.cdt.feature" installMode="root"/>
  </features>
-
+ <plugins>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+ <plugin id="slf4j.simple"/>
+ </plugins>
 
 </product>
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -246,6 +246,7 @@ United States, other countries, or both.
  <feature id="org.eclipse.lsp4j.sdk" installMode="root"/>
  <feature id="org.eclipse.m2e.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
  <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
  <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
  <feature id="org.eclipse.buildship" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Embedded C/C++ Developers" uid="epp.package.embedcpp" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse IDE for Embedded C/C++ Developers" uid="epp.package.embedcpp" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
  <aboutInfo>
  <image path="/org.eclipse.epp.package.embedcpp/eclipse_lg.png"/>
@@ -293,6 +293,9 @@ United States, other countries, or both.
  <feature id="org.eclipse.embedcdt.templates.xpack" installMode="root"/>
  <feature id="org.eclipse.mylyn.cdt.feature" installMode="root"/>
  </features>
-
+ <plugins>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+ <plugin id="slf4j.simple"/>
+ </plugins>
 
 </product>
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -253,6 +253,7 @@ United States, other countries, or both.
  <feature id="org.eclipse.jdt.bcoview.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
  <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
  <feature id="org.eclipse.wildwebdeveloper.xml.feature" installMode="root"/>
  <feature id="org.eclipse.tips.feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -310,6 +310,7 @@ United States, other countries, or both.
  <feature id="org.eclipse.m2e.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.pde.feature" installMode="root"/>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
  <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.wtp.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.wtp.jaxrs.feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
  <aboutInfo>
  <image path="/org.eclipse.epp.package.modeling/eclipse_lg.png"/>
@@ -277,6 +277,10 @@ United States, other countries, or both.
  <feature id="org.eclipse.mylyn.jdt.feature" installMode="root"/>
  <feature id="org.eclipse.mylyn.pde.feature" installMode="root"/>
  </features>
+ <plugins>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+ <plugin id="slf4j.simple"/>
+ </plugins>
 
 
 </product>
diff --git a/packages/org.eclipse.epp.package.parallel.product/epp.product b/packages/org.eclipse.epp.package.parallel.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for Scientific Computing" uid="epp.package.parallel" id="org.eclipse.epp.package.parallel.product" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse for Scientific Computing" uid="epp.package.parallel" id="org.eclipse.epp.package.parallel.product" application="org.eclipse.ui.ide.workbench" version="4.29.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
  <aboutInfo>
  <image path="/org.eclipse.epp.package.parallel/eclipse_lg.png"/>
@@ -269,7 +269,10 @@ United States, other countries, or both.
  <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
  <feature id="org.eclipse.mylyn.cdt.feature" installMode="root"/>
  </features>
-
+ <plugins>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
+ <plugin id="slf4j.simple"/>
+ </plugins>
 
  <preferencesInfo>
  <targetfile overwrite="false"/>

diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -261,7 +261,7 @@ United States, other countries, or both.
  <feature id="org.eclipse.php.mylyn" installMode="root"/>
  </features>
  <plugins>
- <plugin id="slf4j.api"/>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
  <plugin id="slf4j.simple"/>
  </plugins>
 

diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -261,6 +261,7 @@ United States, other countries, or both.
  <feature id="org.eclipse.m2e.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.pde.feature" installMode="root"/>
  <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
  <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
  <feature id="org.eclipse.rap.tools.feature" installMode="root"/>
  <feature id="org.eclipse.swtbot.eclipse.gef" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -262,7 +262,7 @@ United States, other countries, or both.
  <feature id="org.eclipse.mylyn.jdt.feature" installMode="root"/>
  </features>
  <plugins>
- <plugin id="slf4j.api"/>
+ <!-- either m2e.logback or slf4j.simple should be provided in each package -->
  <plugin id="slf4j.simple"/>
  </plugins>