From 46e8bd34051e58dd6d0f6b8cb0a184822367698c Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Thu, 27 Jul 2023 12:54:06 -0400 Subject: [PATCH] releng: Update e4.29 and eStaging targets for 2023-09 M2 Orbit project is undergoing major changes. Use new orbit-aggregation repository. The bundles org.apache.commons.compress and org.apache.commons.io are renamed to org.apache.commons.commons-compress and org.apache.commons.commons-io in the new repository. The bundles orb.bouncycastle.bcpg and org.bouncycastle.bcprov are renamed to bcpg and bcprov in the new repository. In order to keep backward compatibility with older targets, get these bundles with their old name from the previous 2023-06 Orbit repository. Change-Id: Ib6342e0c21041c084db01d680c07855c06a387ea Signed-off-by: Patrick Tasse Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/203398 Tested-by: Trace Compass Bot Tested-by: Marco Miller Reviewed-by: Marco Miller --- .../tracecompass-e4.29.target | 17 ++++++++++------- .../tracecompass-eStaging.target | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target index 1e757cc3ae..31c92e70b5 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target @@ -1,4 +1,4 @@ - + @@ -21,22 +21,25 @@ - - - - - + + + + + + + + @@ -61,7 +64,7 @@ - + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target index bef0d5ad97..4970d1076e 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target @@ -1,4 +1,4 @@ - + @@ -21,22 +21,25 @@ - - - - - + + + + + + + + @@ -61,7 +64,7 @@ - +