Revert "Bug 582075 - [Releng] Remove old orbit dependency"

This reverts commit 754805bd4d07b27cd3e894fbacb620a7d3d87bc7.

Reason for revert: Eclipse does not launch any more after Papyrus installation

Change-Id: I36324820985a60621735bc6a59dbba443fdaead8

11 files changed, 52 insertions, 28 deletions

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index 55fd16ac968..0766c6ec65d 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -68,10 +68,10 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.logging.log4j.api"
+         id="org.apache.logging.log4j"
          download-size="0"
          install-size="0"
-         version="2.21.1"
+         version="2.17.1.v20220106-2156"
          unpack="false"/>
 
    <plugin
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index cae2c41094e..d5417afb0d1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Export-Package: org.eclipse.papyrus.infra.tools,
  org.eclipse.papyrus.infra.tools.notify,
  org.eclipse.papyrus.infra.tools.spi,
  org.eclipse.papyrus.infra.tools.util
-Require-Bundle: org.apache.commons.commons-io;bundle-version="[2.15.0,3.0.0)",
+Require-Bundle: org.apache.commons.io;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
@@ -22,7 +22,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Import-Package: com.google.common.base;version="[32.0.0,33.0.0)",
- com.google.common.collect;version="[32.0.0,33.0.0)",
- com.google.common.util.concurrent;version="[32.0.0,33.0.0)"
+Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)",
+ com.google.common.collect;version="[32.0.0, 33.0.0)",
+ com.google.common.util.concurrent;version="[32.0.0, 33.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.infra.tools
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/META-INF/MANIFEST.MF
index d52cc706ef7..772c87a03b7 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.fonts.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.117.0,4.0.0)",
- jakarta.annotation-api;bundle-version="[1.3.5,2.0.0)"
+ javax.annotation;bundle-version="[1.3.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.papyrus.infra.ui.fonts
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/META-INF/MANIFEST.MF
index 0f21b754e4b..ceeca4b1b8f 100755
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.views.properties.services;singleton:=tr
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.views.properties.services.Activator
 Bundle-Vendor: %providerName
-Require-Bundle: org.apache.logging.log4j.api;bundle-version="[2.21.1,3.0.0)",
+Require-Bundle: org.apache.logging.log4j;bundle-version="[2.17.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
  org.eclipse.papyrus.infra.tools;bundle-version="[4.2.0,5.0.0)",
  org.eclipse.ui;bundle-version="[3.201.0,4.0.0)",
diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
index b5b4ba785aa..8e0480eb5fd 100755
--- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
+++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Main" sequenceNumber="1704464184">
+<target name="Papyrus Main" sequenceNumber="1704448694">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -18,6 +18,11 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
+      <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
+      <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="32.1.3.jre"/>
       <unit id="com.google.guava.source" version="32.1.3.jre"/>
       <unit id="com.google.gson" version="2.10.1"/>
@@ -28,8 +33,6 @@
       <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/>
       <unit id="com.google.inject" version="7.0.0"/>
       <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
-      <unit id="org.apache.logging.log4j.api" version="2.21.1"/>
-      <unit id="org.apache.commons.logging" version="1.2.0"/>
       <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd
index d724e1eb4ba..0d48a46d590 100755
--- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd
+++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd
@@ -20,9 +20,17 @@ location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repositor
 }
 
 // manualUpdate
+location orbit2 "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/" {
+	org.apache.commons.io [2.8.0,3.0.0)
+	org.apache.logging.log4j [2.17.1,3.0.0)
+}
+
+// manualUpdate
 location orbit "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/" {
 	com.google.guava [32.1.3,32.2.0)
 	com.google.guava.source [32.1.3,32.2.0)
+	// This disappeared from the baseline, need to look at simrel messages
+	//org.apache.commons.io 
 	// update dependencies to be in adequation with latest gmf runtime
 	com.google.gson [2.9.1,3.0.0)
 	com.google.gson.source [2.9.1,3.0.0) 
@@ -32,8 +40,6 @@ location orbit "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregatio
 	org.apache.batik.xml [1.17.0,1.18.0)
 	com.google.inject [7.0.0,8.0.0)
 	org.eclipse.orbit.xml-apis-ext [1.0.0,2.0.0] // for org.w3c.css.sac + org.w3c.dom.svg package
-	org.apache.logging.log4j.api [2.21.1,3.0.0)
-	org.apache.commons.logging [1.2.0,2.0.0)
 }
 
 // manualUpdate
diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
index 70bd56811d8..96b4baa4759 100755
--- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
+++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus RCP" sequenceNumber="1704464184">
+<target name="Papyrus RCP" sequenceNumber="1704448694">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -18,6 +18,11 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
+      <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
+      <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="32.1.3.jre"/>
       <unit id="com.google.guava.source" version="32.1.3.jre"/>
       <unit id="com.google.gson" version="2.10.1"/>
@@ -28,8 +33,6 @@
       <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/>
       <unit id="com.google.inject" version="7.0.0"/>
       <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
-      <unit id="org.apache.logging.log4j.api" version="2.21.1"/>
-      <unit id="org.apache.commons.logging" version="1.2.0"/>
       <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
index e23027d3050..fe8ee0bac66 100755
--- a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Tests" sequenceNumber="1704464185">
+<target name="Papyrus CDO Tests" sequenceNumber="1704448694">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -18,6 +18,11 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
+      <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
+      <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="32.1.3.jre"/>
       <unit id="com.google.guava.source" version="32.1.3.jre"/>
       <unit id="com.google.gson" version="2.10.1"/>
@@ -28,8 +33,6 @@
       <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/>
       <unit id="com.google.inject" version="7.0.0"/>
       <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
-      <unit id="org.apache.logging.log4j.api" version="2.21.1"/>
-      <unit id="org.apache.commons.logging" version="1.2.0"/>
       <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
index 258a67e2b30..87d4116a901 100755
--- a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
+++ b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Tests" sequenceNumber="1704464184">
+<target name="Papyrus Tests" sequenceNumber="1704448694">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -18,6 +18,11 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
+      <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
+      <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="32.1.3.jre"/>
       <unit id="com.google.guava.source" version="32.1.3.jre"/>
       <unit id="com.google.gson" version="2.10.1"/>
@@ -28,8 +33,6 @@
       <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/>
       <unit id="com.google.inject" version="7.0.0"/>
       <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
-      <unit id="org.apache.logging.log4j.api" version="2.21.1"/>
-      <unit id="org.apache.commons.logging" version="1.2.0"/>
       <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
index 0a82edb4057..02ffc2d7ee2 100755
--- a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
+++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Releng" sequenceNumber="1704464188">
+<target name="Papyrus Releng" sequenceNumber="1704448696">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -18,6 +18,11 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
+      <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
+      <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="32.1.3.jre"/>
       <unit id="com.google.guava.source" version="32.1.3.jre"/>
       <unit id="com.google.gson" version="2.10.1"/>
@@ -28,8 +33,6 @@
       <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/>
       <unit id="com.google.inject" version="7.0.0"/>
       <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
-      <unit id="org.apache.logging.log4j.api" version="2.21.1"/>
-      <unit id="org.apache.commons.logging" version="1.2.0"/>
       <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
index c7a41061547..f14f8d3a0fd 100755
--- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1704464188">
+<target name="Papyrus Toolsmiths" sequenceNumber="1704448696">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -18,6 +18,11 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
+      <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
+      <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="32.1.3.jre"/>
       <unit id="com.google.guava.source" version="32.1.3.jre"/>
       <unit id="com.google.gson" version="2.10.1"/>
@@ -28,8 +33,6 @@
       <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/>
       <unit id="com.google.inject" version="7.0.0"/>
       <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
-      <unit id="org.apache.logging.log4j.api" version="2.21.1"/>
-      <unit id="org.apache.commons.logging" version="1.2.0"/>
       <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">