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

Updated to Eclipse 2023-06 #21

Merged
merged 16 commits into from Mar 20, 2024
Merged

Updated to Eclipse 2023-06 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1a3c388
Update partially to Java 8.
Mailaender Dec 4, 2023
c6c29ff
Update to latest Tycho minor release.
Mailaender Dec 5, 2023
dfa5d3c
Update to Eclipse 2023-06
Mailaender Jun 19, 2023
4a86a3c
org.eclipse.core.net.linux.x86_64 was removed.
Mailaender Feb 7, 2024
3f7e8a7
org.eclipse.jetty.continuation was removed in Eclipse 4.20
Mailaender Feb 7, 2024
35bc47d
Add missing dependencies of org.eclipse.pde.core #21
basilevs Mar 13, 2024
b9593b0
Ignore Tycho volatiles
basilevs Mar 14, 2024
694b817
Build aarch64 product for macos
basilevs Mar 14, 2024
bdc0055
Merge remote-tracking branch 'origin/master' into pr-21
basilevs Mar 14, 2024
1cba0c5
Fix OOM error by increasing heap size
basilevs Mar 14, 2024
ba0ef0d
Merge branch 'master' into pr-21
basilevs Mar 14, 2024
5dde14b
Adapt test to menus change in 2023-06
basilevs Mar 15, 2024
e0ec0b0
Fix AUT launch
basilevs Mar 15, 2024
a4990c9
Ensure no workign set is selected before searching the workspace in
basilevs Mar 18, 2024
bb2c9df
Merge branch 'master' into 2023-06
basilevs Mar 19, 2024
1bd8638
Merge remote-tracking branch 'origin/master' into pr-21
basilevs Mar 20, 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
109 changes: 16 additions & 93 deletions devenv/launches/RCPTT IDE AUT.launch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion devenv/launches/RCPTT IDE Self AUT.launch
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions devenv/launches/RCPTT IDE.launch
View file
Open in desktop
Expand Up @@ -326,8 +326,7 @@
<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"/>
<setEntry value="org.eclipse.jdt.compiler.apt@default:false"/>
<setEntry value="org.eclipse.jdt.compiler.tool@default:false"/>
<setEntry value="org.eclipse.jdt.core.compiler.batch@default:default"/>
<setEntry value="org.eclipse.jdt.core.formatterapp@default:default"/>
<setEntry value="org.eclipse.jdt.core.manipulation@default:default"/>
<setEntry value="org.eclipse.jdt.core@default:default"/>
Expand Down
29 changes: 14 additions & 15 deletions launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/ide.target
View file
Open in desktop
@@ -1,39 +1,38 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target includeMode="feature" name="2022-03" sequenceNumber="95">
<target includeMode="feature" name="2023-06" sequenceNumber="95">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<unit id="org.apache.commons.lang3" version="0.0.0"/>
<unit id="org.apache.poi" version="0.0.0"/>
<unit id="org.apache.poi.ooxml" version="0.0.0"/>
<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
<unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
<unit id="com.sun.xml.bind" version="0.0.0"/>
<unit id="javax.activation" version="0.0.0"/>
<unit id="javax.xml" version="0.0.0"/>
<unit id="org.apache.httpcomponents.httpcore" version="0.0.0"/>
<unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/nebula/releases/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/2022-03"/>
<repository location="http://download.eclipse.org/releases/2023-06"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.eclipse.emf.common.feature.group" version="2.25.0.v20220123-0838"/>
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.23.0.v20220226-1304"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.29.0.v20220226-1304"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/>
<unit id="org.eclipse.gmf.feature.group" version="1.14.1.202202190902"/>
<unit id="org.jsoup" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2022-03"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.aspectj.runtime" version="0.0.0"/>
Expand All @@ -43,8 +42,8 @@
<repository location="http://download.eclipse.org/tools/ajdt/410/dev/update"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/swtchart/releases/0.12.0/repository"/>
<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.12.0.202003130409"/>
<repository location="https://download.eclipse.org/swtchart/releases/0.14.0/repository"/>
<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.rcptt.core;bundle-version="2.5.5",
org.eclipse.rcptt.reporting;bundle-version="2.5.5",
org.apache.httpcomponents.httpcore;bundle-version="4.3.3",
org.apache.httpcomponents.httpclient;bundle-version="4.3.6",
org.apache.httpcomponents.httpcore;bundle-version="4.4.14",
org.apache.httpcomponents.httpclient;bundle-version="4.5.13",
com.google.gson;bundle-version="2.2.4",
org.eclipse.rcptt.reporting.util;bundle-version="2.5.5",
org.eclipse.debug.core,
Expand Down
4 changes: 2 additions & 2 deletions modules/zephyr/plugins/org.eclipse.rcptt.zephyr/META-INF/MANIFEST.MF
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.equinox.security,
org.eclipse.rcptt.util,
org.eclipse.rcptt.launching;bundle-version="2.5.5",
org.apache.httpcomponents.httpclient,
org.apache.httpcomponents.httpcore,
org.apache.httpcomponents.httpclient;bundle-version="4.5.13",
org.apache.httpcomponents.httpcore;bundle-version="4.4.14",
org.apache.commons.lang3
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.rcptt.internal.zephyr,
Expand Down
5 changes: 2 additions & 3 deletions rcp/org.eclipse.rcptt.search/src/org/eclipse/rcptt/search/Q7SearchResultPage.java
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@
import org.eclipse.ui.part.IShowInTargetList;
import org.eclipse.ui.part.ResourceTransfer;
import org.eclipse.ui.part.ShowInContext;
import org.eclipse.ui.views.navigator.NavigatorDragAdapter;
import org.eclipse.search.internal.ui.text.NavigatorDragAdapter;

import org.eclipse.rcptt.search.utils.ScenarioTableContentProvider;
import org.eclipse.rcptt.search.utils.ScenarioTreeContentProvider;
Expand Down Expand Up @@ -129,8 +129,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
private SortAction fSortByNameAction;
private SortAction fSortByPathAction;

@SuppressWarnings("deprecation")
private static final String[] SHOW_IN_TARGETS = new String[] { IPageLayout.ID_RES_NAV };
private static final String[] SHOW_IN_TARGETS = new String[] { IPageLayout.ID_PROJECT_EXPLORER };
private static final IShowInTargetList SHOW_IN_TARGET_LIST = new IShowInTargetList() {
public String[] getShowInTargetIds() {
return SHOW_IN_TARGETS;
Expand Down
6 changes: 3 additions & 3 deletions rcpttTests/ECL_IDE_module/selfAUTTests/q7commands/GetMenu.test
View file
Open in desktop
Expand Up @@ -5,15 +5,15 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _76u9cK8lEee2w7lxIxf6bQ
Runtime-Version: 2.3.0.qualifier
Save-Time: 10/12/17 3:19 PM
Runtime-Version: 2.5.5.202403150112
Save-Time: 3/15/24, 3:12 PM
Testcase-Type: ecl

------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
Entry-Name: .content

get-view "Test Explorer" | get-tree | get-menu -path "New/.*" -index 2 | click
get-view "Test Explorer" | get-tree | get-menu -path "New/.*" -index 1 | click
get-window "New Project" | close

verify-error {
Expand Down
37 changes: 33 additions & 4 deletions releng/ide/pom.xml
View file
Open in desktop
Expand Up @@ -31,6 +31,35 @@
</modules>
<build>
<plugins>
<plugin>
<groupId>${tycho-groupid}</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<resolver>p2</resolver>
<environments>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
<properties>
Expand All @@ -42,14 +71,14 @@
</properties>
<repositories>
<repository>
<id>2020-03-updates</id>
<id>2023-06-updates</id>
<layout>p2</layout>
<url>http://download.eclipse.org/eclipse/updates/4.15</url>
<url>https://download.eclipse.org/eclipse/updates/4.28/</url>
</repository>
<repository>
<id>2020-09</id>
<id>2023-06</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/2022-09</url>
<url>http://download.eclipse.org/releases/2023-06</url>
</repository>
<repository>
<id>orbit</id>
Expand Down
2 changes: 1 addition & 1 deletion releng/pom.xml
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
<version>2.5.5-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho-version>2.7.1</tycho-version>
<tycho-version>2.7.5</tycho-version>
<tycho-groupid>org.eclipse.tycho</tycho-groupid>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ajdt43repository>http://download.eclipse.org/tools/ajdt/43/update/</ajdt43repository>
Expand Down
49 changes: 49 additions & 0 deletions releng/target-platforms/2023-06/ide.target
View file
Open in desktop
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target includeMode="feature" name="2023-06" sequenceNumber="95">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<unit id="org.apache.commons.lang3" version="0.0.0"/>
<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
<unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
<unit id="com.sun.xml.bind" version="0.0.0"/>
<unit id="javax.activation" version="0.0.0"/>
<unit id="javax.xml" version="0.0.0"/>
<unit id="org.apache.httpcomponents.httpcore" version="0.0.0"/>
<unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/nebula/releases/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/2023-06"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.jsoup" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.aspectj.runtime" version="0.0.0"/>
<unit id="org.aspectj.weaver" version="0.0.0"/>
<unit id="org.eclipse.equinox.weaving.aspectj" version="0.0.0"/>
<unit id="org.eclipse.equinox.weaving.hook" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/ajdt/423/dev/update"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/swtchart/releases/0.14.0/repository"/>
<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>
</location>
</locations>
</target>
10 changes: 6 additions & 4 deletions repository/full/org.eclipse.rcptt.product
View file
Open in desktop
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="RCP Testing Tool IDE" uid="org.eclipse.rcptt.platform.product" id="org.eclipse.rcptt.platform.product" application="org.eclipse.ui.ide.workbench" version="2.5.5.qualifier" useFeatures="true" includeLaunchers="true">
<product name="RCP Testing Tool IDE" uid="org.eclipse.rcptt.platform.product" id="org.eclipse.rcptt.platform.product" application="org.eclipse.ui.ide.workbench" version="2.5.5.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<aboutInfo>
<image path="icons/about.png"/>
<text>%productBlurb</text>
<text>
%productBlurb
</text>
</aboutInfo>

<configIni use="default">
Expand All @@ -15,7 +17,7 @@
<programArgs>-showsplash org.eclipse.rcptt.platform
</programArgs>
<vmArgs>-Xms200m
-Xmx1G
-Xmx2G
--add-modules=ALL-SYSTEM
</vmArgs>
<vmArgsMac>-XstartOnFirstThread
Expand Down Expand Up @@ -305,7 +307,6 @@
<feature id="org.eclipse.rcptt.updates"/>
<feature id="org.eclipse.rcptt.ecl.core"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
<feature id="org.eclipse.help"/>
<feature id="org.eclipse.emf.common"/>
<feature id="org.eclipse.equinox.p2.core.feature"/>
Expand All @@ -323,6 +324,7 @@
<feature id="org.eclipse.equinox.p2.discovery.feature"/>
<feature id="org.eclipse.rcptt.module.nebula"/>
<feature id="org.eclipse.rcptt.launching"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" installMode="root"/>
</features>

<configurations>
Expand Down
10 changes: 1 addition & 9 deletions runner/features/org.eclipse.rcptt.runner.runner-feature/feature.xml
View file
Open in desktop
Expand Up @@ -111,15 +111,7 @@
unpack="false"/>

<plugin
id="org.eclipse.jdt.compiler.apt"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>

<plugin
id="org.eclipse.jdt.compiler.tool"
id="org.eclipse.jdt.core.compiler.batch"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
6 changes: 3 additions & 3 deletions runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF
View file
Open in desktop
Expand Up @@ -35,9 +35,9 @@ 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.bouncycastle.bcpg;bundle-version="1.70.0",
org.slf4j.api;bundle-version="1.7.30",
org.bouncycastle.bcprov;bundle-version="1.70.0",
jakarta.servlet-api;bundle-version="4.0.0"
jakarta.servlet-api;bundle-version="4.0.0",
Mailaender marked this conversation as resolved.
Show resolved Hide resolved
bcpg;bundle-version="1.73.0",
bcprov;bundle-version="1.73.0"
Bundle-Activator: org.eclipse.rcptt.runner.HeadlessRunnerPlugin
Bundle-ActivationPolicy: lazy