From 6223e7a55f2879d31bba5c6d0f2abc64c45c1157 Mon Sep 17 00:00:00 2001
From: Patrick Tasse <patrick.tasse@gmail.com>
Date: Mon, 30 Oct 2023 14:30:32 -0400
Subject: [PATCH] releng: Fix update site for simrel

Add org.apache.commons.lang3 to update site, as this plugin is not found
in default platform or dependent features simrel update sites.

Revert SLF4J bundle names to those of current platform.

Revert default releng files to be for the current platform, and use
staging folder for 4.30 platform version of releng files.

Change-Id: I86dc1527992807ef25873b95032389c7a7717adb
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/205227
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---
 pom.xml                                       |   7 +-
 .../tracing.product                           |   2 +-
 .../tracing.product                           |   2 +-
 rcp/org.eclipse.tracecompass.rcp/feature.xml  | 224 ++----------------
 .../{legacy => staging}/feature.xml           | 224 ++++++++++++++++--
 .../category.xml                              |   1 +
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../staging/MANIFEST.MF                       |   9 +
 8 files changed, 242 insertions(+), 229 deletions(-)
 rename rcp/org.eclipse.tracecompass.rcp.product/{legacy-e4.26-e4.29 => staging}/tracing.product (99%)
 rename rcp/org.eclipse.tracecompass.rcp/{legacy => staging}/feature.xml (68%)
 create mode 100644 releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/staging/MANIFEST.MF

diff --git a/pom.xml b/pom.xml
index 9ffd020a9b..9ea19ec1ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,9 @@
     <!-- Disable GTK3 because it's not quite usable yet and it can make the tests hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
     <SWT_GTK3>0</SWT_GTK3>
 
+    <slf4j-bundle>org.slf4j.binding.simple</slf4j-bundle>
+    <slf4j-version>1.7.30</slf4j-version>
+
     <!-- Sonar rule configuration -->
     <sonar-version>3.9.1.2184</sonar-version>
     <jacoco-version>0.8.10</jacoco-version>
@@ -298,8 +301,8 @@
                 <extraRequirements>
                   <requirement>
                     <type>eclipse-plugin</type>
-                    <id>slf4j.simple</id>
-                    <versionRange>1.7.30</versionRange>
+                    <id>${slf4j-bundle}</id>
+                    <versionRange>${slf4j-version}</versionRange>
                   </requirement>
                   <requirement>
                     <type>eclipse-plugin</type>
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product
similarity index 99%
rename from rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product
rename to rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product
index 1f86a0e3e1..f116cacb38 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product
@@ -141,7 +141,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
       <feature id="org.eclipse.tracecompass.rcp.incubator"/>
       <feature id="org.eclipse.tracecompass.jsontrace"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature"/>
       <feature id="org.eclipse.tracecompass.tmf.cli"/>
       <feature id="org.eclipse.equinox.executable"/>
    </features>
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
index f116cacb38..1f86a0e3e1 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -141,7 +141,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
       <feature id="org.eclipse.tracecompass.rcp.incubator"/>
       <feature id="org.eclipse.tracecompass.jsontrace"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
       <feature id="org.eclipse.tracecompass.tmf.cli"/>
       <feature id="org.eclipse.equinox.executable"/>
    </features>
diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index d072b3f397..571cde5907 100644
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -30,21 +30,21 @@
    </requires>
 
    <plugin
-         id="org.eclipse.orbit.xml-apis-ext"
+         id="javax.xml"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="jakarta.activation-api"
+         id="javax.activation"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="json"
+         id="org.json"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -135,7 +135,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.commons-io"
+         id="org.apache.commons.io"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -303,7 +303,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.commons-compress"
+         id="org.apache.commons.compress"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -352,7 +352,7 @@
          unpack="false"/>
 
    <plugin
-         id="jakarta.xml.bind-api"
+         id="jakarta.xml.bind"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -373,14 +373,14 @@
          unpack="false"/>
 
    <plugin
-         id="slf4j.api"
+         id="org.slf4j.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.mozilla.rhino"
+         id="org.mozilla.javascript"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -415,31 +415,17 @@
          unpack="false"/>
 
    <plugin
-         id="jakarta.annotation-api"
+         id="javax.annotation"
          download-size="0"
          install-size="0"
-         version="1.3.5"
-         unpack="false"/>
-
-   <plugin
-         id="jakarta.annotation-api"
-         download-size="0"
-         install-size="0"
-         version="2.1.1"
-         unpack="false"/>
-
-   <plugin
-         id="jakarta.inject.jakarta.inject-api"
-         download-size="0"
-         install-size="0"
-         version="1.0.5"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="jakarta.inject.jakarta.inject-api"
+         id="javax.inject"
          download-size="0"
          install-size="0"
-         version="2.0.1"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
@@ -464,196 +450,14 @@
          unpack="false"/>
 
    <plugin
-         id="bcpg"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="bcprov"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.mortbay.jasper.apache-jsp"
-         download-size="0"
-         install-size="0"
-         version="9.0.52"
-         unpack="false"/>
-
-   <plugin
-         id="com.google.guava.failureaccess"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.search.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.servlet-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.aries.spifly.dynamic.bundle"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm.commons"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm.tree"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm.tree.analysis"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ch.qos.logback.classic"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ch.qos.logback.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.css"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.i18n"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.constants"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.http"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.session"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.ee8.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.ee8.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.security"
+         id="org.bouncycastle.bcpg"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.ee8.security"
+         id="org.bouncycastle.bcprov"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/rcp/org.eclipse.tracecompass.rcp/legacy/feature.xml b/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
similarity index 68%
rename from rcp/org.eclipse.tracecompass.rcp/legacy/feature.xml
rename to rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
index 571cde5907..d072b3f397 100644
--- a/rcp/org.eclipse.tracecompass.rcp/legacy/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
@@ -30,21 +30,21 @@
    </requires>
 
    <plugin
-         id="javax.xml"
+         id="org.eclipse.orbit.xml-apis-ext"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="javax.activation"
+         id="jakarta.activation-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.json"
+         id="json"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -135,7 +135,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.io"
+         id="org.apache.commons.commons-io"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -303,7 +303,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.compress"
+         id="org.apache.commons.commons-compress"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -352,7 +352,7 @@
          unpack="false"/>
 
    <plugin
-         id="jakarta.xml.bind"
+         id="jakarta.xml.bind-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -373,14 +373,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.slf4j.api"
+         id="slf4j.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.mozilla.javascript"
+         id="org.mozilla.rhino"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -415,17 +415,31 @@
          unpack="false"/>
 
    <plugin
-         id="javax.annotation"
+         id="jakarta.annotation-api"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.3.5"
          unpack="false"/>
 
    <plugin
-         id="javax.inject"
+         id="jakarta.annotation-api"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.1.1"
+         unpack="false"/>
+
+   <plugin
+         id="jakarta.inject.jakarta.inject-api"
+         download-size="0"
+         install-size="0"
+         version="1.0.5"
+         unpack="false"/>
+
+   <plugin
+         id="jakarta.inject.jakarta.inject-api"
+         download-size="0"
+         install-size="0"
+         version="2.0.1"
          unpack="false"/>
 
    <plugin
@@ -450,14 +464,196 @@
          unpack="false"/>
 
    <plugin
-         id="org.bouncycastle.bcpg"
+         id="bcpg"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="bcprov"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.mortbay.jasper.apache-jsp"
+         download-size="0"
+         install-size="0"
+         version="9.0.52"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.guava.failureaccess"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.logging"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.search.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.servlet-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.aries.spifly.dynamic.bundle"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.objectweb.asm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.objectweb.asm.commons"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.objectweb.asm.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.objectweb.asm.tree"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.objectweb.asm.tree.analysis"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="ch.qos.logback.classic"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="ch.qos.logback.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.css"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.i18n"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.constants"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.http"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.server"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.session"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.ee8.servlet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.ee8.server"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.io"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.security"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.bouncycastle.bcprov"
+         id="org.eclipse.jetty.ee8.security"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/org.eclipse.tracecompass.releng-site/category.xml b/releng/org.eclipse.tracecompass.releng-site/category.xml
index f04712ab92..846a46e2fe 100644
--- a/releng/org.eclipse.tracecompass.releng-site/category.xml
+++ b/releng/org.eclipse.tracecompass.releng-site/category.xml
@@ -37,5 +37,6 @@
    <feature url="features/org.eclipse.tracecompass.tmf.cli.source_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.tmf.cli.source" version="0.0.0"/>
    <bundle id="org.eclipse.tracecompass.common.core"/>
    <bundle id="org.eclipse.tracecompass.common.core.source"/>
+   <bundle id="org.apache.commons.lang3"/>
    <category-def name="Trace Compass" label="Trace Compass Main Features"/>
 </site>
diff --git a/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/META-INF/MANIFEST.MF b/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/META-INF/MANIFEST.MF
index 1e7bd372d8..99663b9b5b 100644
--- a/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-Name: Trace Compass SLF4J Simple Binding Properties Fragment Plug-in
 Bundle-SymbolicName: org.eclipse.tracecompass.slf4j.binding.simple.properties
 Bundle-Version: 1.0.1.qualifier
 Bundle-Vendor: Eclipse Trace Compass
-Fragment-Host: slf4j.api
+Fragment-Host: org.slf4j.api
 Automatic-Module-Name: org.eclipse.tracecompass.slf4j.binding.simple.properties
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/staging/MANIFEST.MF b/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/staging/MANIFEST.MF
new file mode 100644
index 0000000000..1e7bd372d8
--- /dev/null
+++ b/releng/org.eclipse.tracecompass.slf4j.binding.simple.properties/staging/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Trace Compass SLF4J Simple Binding Properties Fragment Plug-in
+Bundle-SymbolicName: org.eclipse.tracecompass.slf4j.binding.simple.properties
+Bundle-Version: 1.0.1.qualifier
+Bundle-Vendor: Eclipse Trace Compass
+Fragment-Host: slf4j.api
+Automatic-Module-Name: org.eclipse.tracecompass.slf4j.binding.simple.properties
+Bundle-RequiredExecutionEnvironment: JavaSE-11