From 900702247730a1d1b74428212d83a1ac20c8c21a Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Mon, 18 Mar 2024 18:56:50 +0400 Subject: [PATCH 01/11] TP draft 2024-03 --- releng/target-platforms/2024-03/ide.target | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 releng/target-platforms/2024-03/ide.target diff --git a/releng/target-platforms/2024-03/ide.target b/releng/target-platforms/2024-03/ide.target new file mode 100644 index 000000000..38ed6ef1d --- /dev/null +++ b/releng/target-platforms/2024-03/ide.target @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7c166bd60e2bc3efdc60f119670ea6b654d4818e Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Wed, 20 Mar 2024 16:22:11 +0400 Subject: [PATCH 02/11] Fix changed units in target definition --- releng/target-platforms/2024-03/ide.target | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releng/target-platforms/2024-03/ide.target b/releng/target-platforms/2024-03/ide.target index 38ed6ef1d..25cab0e6e 100644 --- a/releng/target-platforms/2024-03/ide.target +++ b/releng/target-platforms/2024-03/ide.target @@ -24,14 +24,14 @@ - + - + From 4da1028b0223abe47aaeaa5e0e7ced71f75dc6ec Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Wed, 20 Mar 2024 16:59:37 +0400 Subject: [PATCH 03/11] Fix compilation errors #28 --- .../org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF | 2 +- .../src/org/eclipse/rcptt/launching/p2utils/P2Utils.java | 2 +- releng/ide/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF index 04c7c7262..3f269875f 100644 --- a/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF +++ b/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.rcptt.launching.injection;bundle-version="[2.5.5,3.0.0)", org.eclipse.pde.core, org.eclipse.equinox.p2.repository.tools, - org.eclipse.equinox.p2.director, + org.eclipse.equinox.p2.director;bundle-version="2.6.200", org.eclipse.rcptt.util;bundle-version="[2.5.5,3.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/launching/org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java b/launching/org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java index b344561d5..049c12656 100644 --- a/launching/org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java +++ b/launching/org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java @@ -392,7 +392,7 @@ public static void expandFeatures(IProgressMonitor monitor, IMetadataRepository false); // slicingOptions.followOnlyFilteredRequirements()); IQueryable slice = slicer - .slice(availableUnits.toArray(new IInstallableUnit[availableUnits.size()]), monitor); + .slice(availableUnits, monitor); availableUnits.addAll(slice.query(QueryUtil.ALL_UNITS, monitor).toSet()); } } diff --git a/releng/ide/pom.xml b/releng/ide/pom.xml index 6b686f0e0..74b907f56 100644 --- a/releng/ide/pom.xml +++ b/releng/ide/pom.xml @@ -78,7 +78,7 @@ 2023-06 p2 - http://download.eclipse.org/releases/2023-06 + http://download.eclipse.org/releases/2024-03 orbit From e590d18705749a53b82f05df820059b2c39ff0c9 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Fri, 22 Mar 2024 13:26:36 +0400 Subject: [PATCH 04/11] Fix tests Tycho needs javax.annotation, but fails to add it to TP --- launching/tests/pom.xml | 48 ++++++++++++++++------ releng/ide/pom.xml | 2 +- releng/target-platforms/2024-03/ide.target | 2 +- runtime/tests/pom.xml | 19 +++++++++ 4 files changed, 56 insertions(+), 15 deletions(-) diff --git a/launching/tests/pom.xml b/launching/tests/pom.xml index 4a58adfb7..8ab020abf 100644 --- a/launching/tests/pom.xml +++ b/launching/tests/pom.xml @@ -10,17 +10,39 @@ Xored Software Inc - initial API and implementation and/or initial documentation --> - 4.0.0 - - rcptt.launching - org.eclipse.rcptt - 2.5.5-SNAPSHOT - - launching.tests - pom - - org.eclipse.rcptt.launching.ext.tests - org.eclipse.rcptt.launching.tests - org.eclipse.rcptt.reporting.html.tests - + 4.0.0 + + rcptt.launching + org.eclipse.rcptt + 2.5.5-SNAPSHOT + + launching.tests + pom + + org.eclipse.rcptt.launching.ext.tests + org.eclipse.rcptt.launching.tests + org.eclipse.rcptt.reporting.html.tests + + + + + + org.eclipse.tycho + target-platform-configuration + + + + + + eclipse-plugin + javax.annotation + 1.3.5 + + + + + + + + \ No newline at end of file diff --git a/releng/ide/pom.xml b/releng/ide/pom.xml index 74b907f56..3fe618de5 100644 --- a/releng/ide/pom.xml +++ b/releng/ide/pom.xml @@ -73,7 +73,7 @@ 2023-06-updates p2 - https://download.eclipse.org/eclipse/updates/4.28/ + https://download.eclipse.org/eclipse/updates/4.31/ 2023-06 diff --git a/releng/target-platforms/2024-03/ide.target b/releng/target-platforms/2024-03/ide.target index 25cab0e6e..eb0f96a3e 100644 --- a/releng/target-platforms/2024-03/ide.target +++ b/releng/target-platforms/2024-03/ide.target @@ -22,7 +22,7 @@ - + diff --git a/runtime/tests/pom.xml b/runtime/tests/pom.xml index bbd23150c..f867140f6 100644 --- a/runtime/tests/pom.xml +++ b/runtime/tests/pom.xml @@ -68,6 +68,25 @@ + + aarch64 + + + aarch64 + + + + + + tycho-surefire-plugin + org.eclipse.tycho + + true + + + + + runtime4x From d8c684a12577d59f2ebf87647944e109e2b64ed6 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Fri, 22 Mar 2024 13:35:16 +0400 Subject: [PATCH 05/11] Do not use Eclipse Neon, as the oldest AUT we support in 2019-03 2019-03 is already read by ecl/pom.xml parent --- releng/runtime/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/releng/runtime/pom.xml b/releng/runtime/pom.xml index 85cb8f6f4..d077b71e8 100644 --- a/releng/runtime/pom.xml +++ b/releng/runtime/pom.xml @@ -49,11 +49,6 @@ ../../repository/e4x - - neon - p2 - http://download.eclipse.org/releases/neon - ajdt48 p2 From 913c5f79d48d43e0e07b818f50664e72099a3d2d Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Fri, 22 Mar 2024 14:39:28 +0400 Subject: [PATCH 06/11] Fix RAP build in context of 2024-03 --- modules/rap/bundles/runtime/pom.xml | 80 +++++++++---------- .../feature.xml | 26 +----- releng/rap/pom.xml | 2 +- 3 files changed, 41 insertions(+), 67 deletions(-) diff --git a/modules/rap/bundles/runtime/pom.xml b/modules/rap/bundles/runtime/pom.xml index 9f76f7a9f..ceb2d501c 100644 --- a/modules/rap/bundles/runtime/pom.xml +++ b/modules/rap/bundles/runtime/pom.xml @@ -9,49 +9,41 @@ Contributors: Xored Software Inc - initial API and implementation and/or initial documentation --> - - 4.0.0 - - bundles - org.eclipse.rcptt.module.rap - 2.5.5-SNAPSHOT - ../pom.xml - - - runtime - pom - - - - - - core - - true - - - contexts - ecl - org.eclipse.rcptt.core.ecl.debug.rap - org.eclipse.rcptt.forms.impl.rap - org.eclipse.rcptt.runtime.ui.rap - org.eclipse.rcptt.util.swt.rap - org.eclipse.rcptt.rap.aspects - tesla - verifications - watson - - - - - ide - - updates - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + bundles + org.eclipse.rcptt.module.rap + 2.5.5-SNAPSHOT + ../pom.xml + + runtime + pom + + + core + + true + + + contexts + ecl + org.eclipse.rcptt.core.ecl.debug.rap + org.eclipse.rcptt.forms.impl.rap + org.eclipse.rcptt.runtime.ui.rap + org.eclipse.rcptt.util.swt.rap + org.eclipse.rcptt.rap.aspects + tesla + verifications + watson + + + + ide + + updates + + + diff --git a/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml b/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml index b50f64808..fa04f314d 100644 --- a/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml +++ b/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml @@ -38,9 +38,12 @@ - + + + + - - - - - - diff --git a/releng/rap/pom.xml b/releng/rap/pom.xml index 6c4cd7038..f798a1396 100644 --- a/releng/rap/pom.xml +++ b/releng/rap/pom.xml @@ -51,7 +51,7 @@ file:/${user.dir} ${buildUrl}/ ${buildUrl}/repository/full/target/repository/ - http://download.eclipse.org/rt/rap/3.1 + http://download.eclipse.org/rt/rap/3.8 ${buildUrl}/repository/dependencies/target/repository From 332f28c4dbbe1c76445bc32407c33eb2d4adf129 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Fri, 22 Mar 2024 15:25:27 +0400 Subject: [PATCH 07/11] Fix runner dependencies for 2024-03 --- releng/target-platforms/2024-03/ide.target | 1 + runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/releng/target-platforms/2024-03/ide.target b/releng/target-platforms/2024-03/ide.target index eb0f96a3e..b72a45bdc 100644 --- a/releng/target-platforms/2024-03/ide.target +++ b/releng/target-platforms/2024-03/ide.target @@ -33,6 +33,7 @@ + diff --git a/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF b/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF index 0a770bc8b..586043b17 100644 --- a/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF +++ b/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF @@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.rcptt.core, org.eclipse.rcptt.reporting.util;bundle-version="[2.5.5,3.0.0)", org.eclipse.rcptt.launching.rap;bundle-version="[2.5.5,3.0.0)", org.eclipse.swt, - org.slf4j.api;bundle-version="1.7.30", + slf4j.api;bundle-version="2.0.12", jakarta.servlet-api;bundle-version="4.0.0", bcpg;bundle-version="1.73.0", bcprov;bundle-version="1.73.0" From bbce5e62a39a4861b3946c55dcd0c1f129f762bc Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Fri, 22 Mar 2024 15:45:16 +0400 Subject: [PATCH 08/11] Deprecate RAP support #56 --- .../rcptt/internal/launching/rap/ui/AUTLocationBlock.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java index 3219449af..7243dde6e 100644 --- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java +++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java @@ -93,6 +93,8 @@ public void updateInfo() { IStatus status = PDELocationUtils.validateProductLocation(location); if (!status.isOK()) { setStatus(status); + } else { + setStatus(Status.warning("RCPTT RAP supoprt will be removed in a following release. See https://github.com/eclipse/org.eclipse.rcptt/issues/56")); } if (needUpdate && status.isOK()) { From 0a4a89bda7016d70ebf2b93949a39abbddf622ff Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Fri, 22 Mar 2024 17:40:58 +0400 Subject: [PATCH 09/11] Fix package dependencies in Runner --- devenv/launches/RCPTT IDE.launch | 63 +++++----------------- rcpttTests/pom-base.xml | 2 +- releng/target-platforms/2024-03/ide.target | 1 + runner/product/rcptt.runner.product | 32 +++++------ 4 files changed, 30 insertions(+), 68 deletions(-) diff --git a/devenv/launches/RCPTT IDE.launch b/devenv/launches/RCPTT IDE.launch index 4810266a5..5ab0f2b9f 100644 --- a/devenv/launches/RCPTT IDE.launch +++ b/devenv/launches/RCPTT IDE.launch @@ -3,6 +3,7 @@ + @@ -12,7 +13,7 @@ - + @@ -32,22 +33,17 @@ + - - - - - - @@ -70,35 +66,25 @@ - - - - - - + + - + - - + - - + - - - - + + - - @@ -106,13 +92,9 @@ - - - - @@ -150,8 +132,6 @@ - - @@ -238,7 +218,6 @@ - @@ -276,7 +255,6 @@ - @@ -321,8 +299,6 @@ - - @@ -347,8 +323,6 @@ - - @@ -365,7 +339,6 @@ - @@ -381,13 +354,6 @@ - - - - - - - @@ -408,7 +374,6 @@ - @@ -436,11 +401,11 @@ + - @@ -468,12 +433,7 @@ - - - - - @@ -533,6 +493,7 @@ + diff --git a/rcpttTests/pom-base.xml b/rcpttTests/pom-base.xml index 27cd65e89..9301bd29f 100644 --- a/rcpttTests/pom-base.xml +++ b/rcpttTests/pom-base.xml @@ -21,7 +21,7 @@ rcptt-releases RCPTT Maven repository Releases - http://repo.eclipse.org/content/repositories/rcptt-releases/ + https://repo.eclipse.org/content/repositories/rcptt-releases/ rcptt-snapshots diff --git a/releng/target-platforms/2024-03/ide.target b/releng/target-platforms/2024-03/ide.target index b72a45bdc..fcc9334d3 100644 --- a/releng/target-platforms/2024-03/ide.target +++ b/releng/target-platforms/2024-03/ide.target @@ -34,6 +34,7 @@ + diff --git a/runner/product/rcptt.runner.product b/runner/product/rcptt.runner.product index 7e7db833f..2ed6538b8 100644 --- a/runner/product/rcptt.runner.product +++ b/runner/product/rcptt.runner.product @@ -40,6 +40,9 @@ + + + @@ -49,7 +52,9 @@ + + @@ -57,6 +62,9 @@ + + + @@ -116,11 +124,9 @@ - + - - @@ -162,21 +168,13 @@ - - - - - - - - - + @@ -189,9 +187,7 @@ - - @@ -205,8 +201,6 @@ - - @@ -286,15 +280,20 @@ + + + + + @@ -307,6 +306,7 @@ + From 56a01cfeda65d9052d6d0a317981d256cb25d320 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Fri, 22 Mar 2024 21:33:53 +0400 Subject: [PATCH 10/11] Fix Cut/Copy/Paste editor action labels --- .../ecl/EclEditorPluginResources.properties | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ecl/EclEditorPluginResources.properties b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ecl/EclEditorPluginResources.properties index 906af046c..1df72351d 100644 --- a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ecl/EclEditorPluginResources.properties +++ b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ecl/EclEditorPluginResources.properties @@ -20,4 +20,19 @@ ContentAssistTip.tooltip=Content Tip ContentAssistTip.image= ContentAssistTip.description=Content Tip Editor.Undo.label=Undo -Editor.Redo.label=Redo \ No newline at end of file +Editor.Redo.label=Redo + +Editor.Cut.label=Cu&t +Editor.Cut.tooltip=Cut +Editor.Cut.image= +Editor.Cut.description=Cut + +Editor.Copy.label=&Copy +Editor.Copy.tooltip=Copy +Editor.Copy.image= +Editor.Copy.description=Copy + +Editor.Paste.label=&Paste +Editor.Paste.tooltip=Paste +Editor.Paste.image= +Editor.Paste.description=Paste From 1e69e44fd656aa1f456018b4206b5e720e0e754c Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Fri, 22 Mar 2024 21:56:35 +0400 Subject: [PATCH 11/11] Adapt to increased memory requirements of Eclipse Platform 2024-03 --- .../src/main/java/org/eclipse/rcptt/maven/ExecuteMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugin/rcptt-maven-plugin/src/main/java/org/eclipse/rcptt/maven/ExecuteMojo.java b/maven-plugin/rcptt-maven-plugin/src/main/java/org/eclipse/rcptt/maven/ExecuteMojo.java index 5bf366f67..7a85e399b 100644 --- a/maven-plugin/rcptt-maven-plugin/src/main/java/org/eclipse/rcptt/maven/ExecuteMojo.java +++ b/maven-plugin/rcptt-maven-plugin/src/main/java/org/eclipse/rcptt/maven/ExecuteMojo.java @@ -84,7 +84,7 @@ public class ExecuteMojo extends AbstractRCPTTMojo { private static final String ENABLE_SOFTWARE_INSTALLATION = "-enableSoftwareInstallation"; private static int shutdownListenerPort; - private static final String[] DEFAULT_Q7_VM_ARGS = new String[] { "-Xms128m", "-Xmx256m", + private static final String[] DEFAULT_Q7_VM_ARGS = new String[] { "-Xms256m", "-Xmx512m", "-Dorg.eclipse.rcptt.runner.returnTestFailure=true" }; // TODO: Replace this random number with carefully thought one