Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eclipse Platform 2024-03 #57

Merged
merged 19 commits into from Mar 27, 2024
Merged

Eclipse Platform 2024-03 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a14813f
Merge remote-tracking branch 'origin/master' into pr-21
basilevs Mar 18, 2024
9007022
TP draft 2024-03
basilevs Mar 18, 2024
e68cb72
Merge branch 'master' into platform_2024-03
basilevs Mar 20, 2024
7c166bd
Fix changed units in target definition
basilevs Mar 20, 2024
4da1028
Fix compilation errors #28
basilevs Mar 20, 2024
cca1994
Merge remote-tracking branch 'origin/master' into platform_2024-03
basilevs Mar 22, 2024
e590d18
Fix tests
basilevs Mar 22, 2024
d8c684a
Do not use Eclipse Neon, as the oldest AUT we support in 2019-03
basilevs Mar 22, 2024
913c5f7
Fix RAP build in context of 2024-03
basilevs Mar 22, 2024
332f28c
Fix runner dependencies for 2024-03
basilevs Mar 22, 2024
bbce5e6
Deprecate RAP support #56
basilevs Mar 22, 2024
0a4a89b
Fix package dependencies in Runner
basilevs Mar 22, 2024
56a01cf
Fix Cut/Copy/Paste editor action labels
basilevs Mar 22, 2024
1e69e44
Adapt to increased memory requirements of Eclipse Platform 2024-03
basilevs Mar 22, 2024
5170cf1
Merge branch 'master' into platform_2024-03
basilevs Mar 22, 2024
918d946
Merge branch 'master' into platform_2024-03
basilevs Mar 26, 2024
ee7e69a
Merge branch 'master' into platform_2024-03
basilevs Mar 26, 2024
087c9ba
Merge branch 'master' into platform_2024-03
basilevs Mar 26, 2024
4990b7f
Merge branch 'master' into platform_2024-03
basilevs Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
63 changes: 12 additions & 51 deletions devenv/launches/RCPTT IDE.launch
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="true"/>
<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticIncludeRequirements" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
Expand All @@ -12,7 +13,7 @@
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RCPTT IDE"/>
<booleanAttribute key="default" value="false"/>
<setAttribute key="deselected_workspace_bundles"/>
<booleanAttribute key="includeOptional" value="true"/>
<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-rcpttIde"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
Expand All @@ -32,22 +33,17 @@
<setEntry value="bcpg@default:default"/>
<setEntry value="bcprov@default:default"/>
<setEntry value="com.google.gson@default:default"/>
<setEntry value="com.google.guava*33.0.0.jre@default:default"/>
<setEntry value="com.google.guava.failureaccess@default:default"/>
<setEntry value="com.google.guava@default:default"/>
<setEntry value="com.ibm.icu@default:default"/>
<setEntry value="com.jcraft.jsch@default:default"/>
<setEntry value="com.sun.el@default:default"/>
<setEntry value="com.sun.jna.platform@default:default"/>
<setEntry value="com.sun.jna@default:default"/>
<setEntry value="com.sun.xml.bind@default:default"/>
<setEntry value="jakarta.activation@default:default"/>
<setEntry value="jakarta.servlet-api@default:default"/>
<setEntry value="jakarta.xml.bind@default:default"/>
<setEntry value="javax.activation@default:default"/>
<setEntry value="javax.annotation@default:default"/>
<setEntry value="javax.el@default:default"/>
<setEntry value="javax.inject@default:default"/>
<setEntry value="javax.servlet.jsp-api@default:default"/>
<setEntry value="javax.xml@default:default"/>
<setEntry value="junit-jupiter-api@default:default"/>
<setEntry value="junit-jupiter-engine@default:default"/>
Expand All @@ -70,49 +66,35 @@
<setEntry value="org.apache.batik.awt.util@default:default"/>
<setEntry value="org.apache.batik.bridge@default:default"/>
<setEntry value="org.apache.batik.codec@default:default"/>
<setEntry value="org.apache.batik.constants*1.16.0.v20221027-0840@default:default"/>
<setEntry value="org.apache.batik.constants*1.9.1.v20180227-1645@default:default"/>
<setEntry value="org.apache.batik.css*1.16.0.v20221027-0840@default:default"/>
<setEntry value="org.apache.batik.css*1.9.1.v20181015-1528@default:default"/>
<setEntry value="org.apache.batik.dom*1.16.0.v20221027-0840@default:default"/>
<setEntry value="org.apache.batik.dom*1.9.1.v20190730-1743@default:default"/>
<setEntry value="org.apache.batik.constants@default:default"/>
<setEntry value="org.apache.batik.css@default:default"/>
<setEntry value="org.apache.batik.dom.svg@default:default"/>
<setEntry value="org.apache.batik.ext.awt@default:default"/>
<setEntry value="org.apache.batik.dom@default:default"/>
<setEntry value="org.apache.batik.ext@default:default"/>
<setEntry value="org.apache.batik.gvt@default:default"/>
<setEntry value="org.apache.batik.i18n*1.16.0.v20221027-0840@default:default"/>
<setEntry value="org.apache.batik.i18n*1.9.1.v20180227-1645@default:default"/>
<setEntry value="org.apache.batik.i18n@default:default"/>
<setEntry value="org.apache.batik.parser@default:default"/>
<setEntry value="org.apache.batik.script@default:default"/>
<setEntry value="org.apache.batik.svggen*1.16.0.v20221027-0840@default:default"/>
<setEntry value="org.apache.batik.svggen*1.9.1.v20190730-1743@default:default"/>
<setEntry value="org.apache.batik.svggen@default:default"/>
<setEntry value="org.apache.batik.transcoder@default:default"/>
<setEntry value="org.apache.batik.util*1.16.0.v20221027-0840@default:default"/>
<setEntry value="org.apache.batik.util*1.9.1.v20180703-1553@default:default"/>
<setEntry value="org.apache.batik.xml*1.16.0.v20221027-0840@default:default"/>
<setEntry value="org.apache.batik.xml*1.9.1.v20190730-1743@default:default"/>
<setEntry value="org.apache.batik.util@default:default"/>
<setEntry value="org.apache.batik.xml@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/>
<setEntry value="org.apache.commons.collections4@default:default"/>
<setEntry value="org.apache.commons.commons-io@default:default"/>
<setEntry value="org.apache.commons.jxpath@default:default"/>
<setEntry value="org.apache.commons.lang3.source@default:default"/>
<setEntry value="org.apache.commons.lang3@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.math3@default:default"/>
<setEntry value="org.apache.felix.gogo.command@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.httpcomponents.client5.httpclient5@default:default"/>
<setEntry value="org.apache.httpcomponents.core5.httpcore5-h2@default:default"/>
<setEntry value="org.apache.httpcomponents.core5.httpcore5@default:default"/>
<setEntry value="org.apache.jasper.glassfish@default:default"/>
<setEntry value="org.apache.lucene.analyzers-common@default:default"/>
<setEntry value="org.apache.lucene.analyzers-smartcn@default:default"/>
<setEntry value="org.apache.lucene.core@default:default"/>
<setEntry value="org.apache.poi.ooxml@default:default"/>
<setEntry value="org.apache.poi@default:default"/>
<setEntry value="org.apache.xalan@default:default"/>
<setEntry value="org.apache.xmlgraphics@default:default"/>
<setEntry value="org.apiguardian.api@default:default"/>
<setEntry value="org.aspectj.runtime@default:default"/>
Expand Down Expand Up @@ -150,8 +132,6 @@
<setEntry value="org.eclipse.e4.core.di@default:default"/>
<setEntry value="org.eclipse.e4.core.services@default:default"/>
<setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
<setEntry value="org.eclipse.e4.tools.emf.ui@default:default"/>
<setEntry value="org.eclipse.e4.tools.services@default:default"/>
<setEntry value="org.eclipse.e4.ui.bindings@default:default"/>
<setEntry value="org.eclipse.e4.ui.css.core@default:default"/>
<setEntry value="org.eclipse.e4.ui.css.swt.theme@default:default"/>
Expand Down Expand Up @@ -238,7 +218,6 @@
<setEntry value="org.eclipse.equinox.jsp.jasper.registry@default:default"/>
<setEntry value="org.eclipse.equinox.jsp.jasper@default:default"/>
<setEntry value="org.eclipse.equinox.launcher.cocoa.macosx.aarch64@default:false"/>
<setEntry value="org.eclipse.equinox.launcher.cocoa.macosx@default:false"/>
<setEntry value="org.eclipse.equinox.launcher@default:default"/>
<setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
<setEntry value="org.eclipse.equinox.p2.console@default:default"/>
Expand Down Expand Up @@ -276,7 +255,6 @@
<setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
<setEntry value="org.eclipse.equinox.weaving.aspectj@default:default"/>
<setEntry value="org.eclipse.equinox.weaving.hook@default:false"/>
<setEntry value="org.eclipse.gef.doc.isv@default:default"/>
<setEntry value="org.eclipse.gef@default:default"/>
<setEntry value="org.eclipse.gmf.runtime.common.core@default:default"/>
<setEntry value="org.eclipse.gmf.runtime.common.ui.action.ide@default:default"/>
Expand Down Expand Up @@ -321,8 +299,6 @@
<setEntry value="org.eclipse.help.ui@default:default"/>
<setEntry value="org.eclipse.help.webapp@default:default"/>
<setEntry value="org.eclipse.help@default:default"/>
<setEntry value="org.eclipse.jdt.annotation*1.2.100.v20220826-1026@default:default"/>
<setEntry value="org.eclipse.jdt.annotation*2.2.700.v20220826-1026@default:default"/>
<setEntry value="org.eclipse.jdt.apt.core@default:default"/>
<setEntry value="org.eclipse.jdt.apt.pluggable.core@default:default"/>
<setEntry value="org.eclipse.jdt.apt.ui@default:default"/>
Expand All @@ -347,8 +323,6 @@
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/>
<setEntry value="org.eclipse.jetty.server@default:default"/>
<setEntry value="org.eclipse.jetty.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.util.ajax@default:default"/>
<setEntry value="org.eclipse.jetty.util@default:default"/>
<setEntry value="org.eclipse.jface.databinding@default:default"/>
<setEntry value="org.eclipse.jface.notifications@default:default"/>
Expand All @@ -365,7 +339,6 @@
<setEntry value="org.eclipse.ocl.ecore@default:default"/>
<setEntry value="org.eclipse.ocl@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.eclipse.pde.api.tools.annotations@default:default"/>
Expand All @@ -381,13 +354,6 @@
<setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
<setEntry value="org.eclipse.pde.launching@default:default"/>
<setEntry value="org.eclipse.pde.runtime@default:default"/>
<setEntry value="org.eclipse.pde.spy.bundle@default:default"/>
<setEntry value="org.eclipse.pde.spy.context@default:default"/>
<setEntry value="org.eclipse.pde.spy.core@default:default"/>
<setEntry value="org.eclipse.pde.spy.css@default:default"/>
<setEntry value="org.eclipse.pde.spy.event@default:default"/>
<setEntry value="org.eclipse.pde.spy.model@default:default"/>
<setEntry value="org.eclipse.pde.spy.preferences@default:default"/>
<setEntry value="org.eclipse.pde.ua.core@default:default"/>
<setEntry value="org.eclipse.pde.ua.ui@default:default"/>
<setEntry value="org.eclipse.pde.ui.templates@default:default"/>
Expand All @@ -408,7 +374,6 @@
<setEntry value="org.eclipse.team.ui@default:default"/>
<setEntry value="org.eclipse.text.quicksearch@default:default"/>
<setEntry value="org.eclipse.text@default:default"/>
<setEntry value="org.eclipse.tools.layout.spy@default:default"/>
<setEntry value="org.eclipse.ui.browser@default:default"/>
<setEntry value="org.eclipse.ui.cheatsheets@default:default"/>
<setEntry value="org.eclipse.ui.cocoa@default:false"/>
Expand Down Expand Up @@ -436,11 +401,11 @@
<setEntry value="org.eclipse.ui@default:default"/>
<setEntry value="org.eclipse.update.configurator@3:true"/>
<setEntry value="org.eclipse.urischeme@default:default"/>
<setEntry value="org.hamcrest*2.2.0@default:default"/>
<setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="org.hamcrest.integration@default:default"/>
<setEntry value="org.hamcrest.library@default:default"/>
<setEntry value="org.hamcrest.text@default:default"/>
<setEntry value="org.hamcrest@default:default"/>
<setEntry value="org.jsoup@default:default"/>
<setEntry value="org.junit@default:default"/>
<setEntry value="org.mockito@default:default"/>
Expand Down Expand Up @@ -468,12 +433,7 @@
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/>
<setEntry value="org.slf4j.api@default:default"/>
<setEntry value="org.tukaani.xz@default:default"/>
<setEntry value="org.w3c.css.sac@default:default"/>
<setEntry value="org.w3c.dom.events@default:default"/>
<setEntry value="org.w3c.dom.smil@default:default"/>
<setEntry value="org.w3c.dom.svg@default:default"/>
</setAttribute>
<setAttribute key="selected_workspace_bundles">
<setEntry value="org.eclipse.rcptt.core.builder@default:default"/>
Expand Down Expand Up @@ -533,6 +493,7 @@
<setEntry value="org.eclipse.rcptt.launching.ext@default:default"/>
<setEntry value="org.eclipse.rcptt.launching.injection@default:default"/>
<setEntry value="org.eclipse.rcptt.launching.p2utils@default:default"/>
<setEntry value="org.eclipse.rcptt.launching.rap.ui@default:default"/>
<setEntry value="org.eclipse.rcptt.launching.remote.ui@default:default"/>
<setEntry value="org.eclipse.rcptt.launching.remote@default:default"/>
<setEntry value="org.eclipse.rcptt.launching.tests@default:false"/>
Expand Down
2 changes: 1 addition & 1 deletion launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java
View file
Open in desktop
Expand Up @@ -392,7 +392,7 @@ public static void expandFeatures(IProgressMonitor monitor, IMetadataRepository
false); // slicingOptions.followOnlyFilteredRequirements());

IQueryable<IInstallableUnit> slice = slicer
.slice(availableUnits.toArray(new IInstallableUnit[availableUnits.size()]), monitor);
.slice(availableUnits, monitor);
availableUnits.addAll(slice.query(QueryUtil.ALL_UNITS, monitor).toSet());
}
}
48 changes: 35 additions & 13 deletions launching/tests/pom.xml
View file
Open in desktop
Expand Up @@ -10,17 +10,39 @@
Xored Software Inc - initial API and implementation and/or initial documentation
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rcptt.launching</artifactId>
<groupId>org.eclipse.rcptt</groupId>
<version>2.5.5-SNAPSHOT</version>
</parent>
<artifactId>launching.tests</artifactId>
<packaging>pom</packaging>
<modules>
<module>org.eclipse.rcptt.launching.ext.tests</module>
<module>org.eclipse.rcptt.launching.tests</module>
<module>org.eclipse.rcptt.reporting.html.tests</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rcptt.launching</artifactId>
<groupId>org.eclipse.rcptt</groupId>
<version>2.5.5-SNAPSHOT</version>
</parent>
<artifactId>launching.tests</artifactId>
<packaging>pom</packaging>
<modules>
<module>org.eclipse.rcptt.launching.ext.tests</module>
<module>org.eclipse.rcptt.launching.tests</module>
<module>org.eclipse.rcptt.reporting.html.tests</module>
</modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<!-- Tycho 2.7.5 surefire JUnit4 support imports javax.annotation package, but fails to add it to dependencies -->
<type>eclipse-plugin</type>
<id>javax.annotation</id>
<versionRange>1.3.5</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
2 changes: 2 additions & 0 deletions ...tt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java
View file
Open in desktop
Expand Up @@ -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()) {
Expand Down
80 changes: 36 additions & 44 deletions modules/rap/bundles/runtime/pom.xml
View file
Open in desktop
Expand Up @@ -9,49 +9,41 @@
Contributors:
Xored Software Inc - initial API and implementation and/or initial documentation
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>bundles</artifactId>
<groupId>org.eclipse.rcptt.module.rap</groupId>
<version>2.5.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>runtime</artifactId>
<packaging>pom</packaging>



<profiles>
<profile>
<id>core</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>contexts</module>
<module>ecl</module>
<module>org.eclipse.rcptt.core.ecl.debug.rap</module>
<module>org.eclipse.rcptt.forms.impl.rap</module>
<module>org.eclipse.rcptt.runtime.ui.rap</module>
<module>org.eclipse.rcptt.util.swt.rap</module>
<module>org.eclipse.rcptt.rap.aspects</module>
<module>tesla</module>
<module>verifications</module>
<module>watson</module>
</modules>
</profile>

<profile>
<id>ide</id>
<modules>
<module>updates</module>
</modules>
</profile>

</profiles>

xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>bundles</artifactId>
<groupId>org.eclipse.rcptt.module.rap</groupId>
<version>2.5.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>runtime</artifactId>
<packaging>pom</packaging>
<profiles>
<profile>
<id>core</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>contexts</module>
<module>ecl</module>
<module>org.eclipse.rcptt.core.ecl.debug.rap</module>
<module>org.eclipse.rcptt.forms.impl.rap</module>
<module>org.eclipse.rcptt.runtime.ui.rap</module>
<module>org.eclipse.rcptt.util.swt.rap</module>
<module>org.eclipse.rcptt.rap.aspects</module>
<module>tesla</module>
<module>verifications</module>
<module>watson</module>
</modules>
</profile>
<profile>
<id>ide</id>
<modules>
<module>updates</module>
</modules>
</profile>
</profiles>
</project>