From 864f2308ae170ce05f3684d3b32f5b208782669b Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Wed, 7 Aug 2024 18:09:06 +0200
Subject: [PATCH] Force org.apache.commons.logging version 1.2.0 into the
 target platform

- This ensures the products and repositories have this version.

https://github.com/eclipse-orbit/orbit-simrel/issues/40
---
 .../org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target | 3 ++-
 setups/Oomph.setup                                          | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
index c4082470b..4eed06dcc 100644
--- a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
+++ b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from Oomph" sequenceNumber="145">
+<target name="Generated from Oomph" sequenceNumber="146">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.apache.commons.logging" version="1.2.0"/>
       <unit id="org.eclipse.core.runtime.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
diff --git a/setups/Oomph.setup b/setups/Oomph.setup
index 91e86dc87..861e2eee1 100644
--- a/setups/Oomph.setup
+++ b/setups/Oomph.setup
@@ -493,7 +493,7 @@
         </detail>
         <detail
             key="extraUnits">
-          <value>org.eclipse.equinox.executable.feature.group</value>
+          <value>org.eclipse.equinox.executable.feature.group,org.apache.commons.logging_1.2.0</value>
         </detail>
         <detail
             key="singleLocation">
@@ -523,6 +523,10 @@
             key="generateImplicitUnits">
           <value>false</value>
         </detail>
+        <detail
+            key="generateVersions">
+          <value>org.apache.commons.logging</value>
+        </detail>
       </annotation>
       <requirement
           name="*"/>