Skip to content

Commit

Permalink
Update to Eclipse 2023-06
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mailaender
Mailaender committed Nov 22, 2023
1 parent f078e13 commit 55b3362
Show file tree
Hide file tree
Showing 10 changed files with 89 additions and 46 deletions.
35 changes: 17 additions & 18 deletions launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/ide.target
View file
@@ -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 @@ -42,9 +41,9 @@
<unit id="org.eclipse.equinox.weaving.hook" version="0.0.0"/>
<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"/>
</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>
</target>
4 changes: 2 additions & 2 deletions modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF
View file
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
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
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
8 changes: 4 additions & 4 deletions releng/ide/pom.xml
View file
Expand Up @@ -42,14 +42,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/runtime/pom.xml
View file
Expand Up @@ -62,7 +62,7 @@
<repository>
<id>swtchart</id>
<layout>p2</layout>
<url>https://download.eclipse.org/swtchart/releases/0.12.0/repository</url>
<url>https://download.eclipse.org/swtchart/releases/0.14.0/repository</url>
</repository>
</repositories>
</profile>
Expand Down
49 changes: 49 additions & 0 deletions releng/target-platforms/2023-06/ide.target
View file
@@ -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/410/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>
3 changes: 1 addition & 2 deletions repository/full/org.eclipse.rcptt.product
View file
Expand Up @@ -305,7 +305,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 @@ -320,9 +319,9 @@
<feature id="org.eclipse.e4.rcp"/>
<feature id="org.eclipse.egit"/>
<feature id="org.eclipse.jgit"/>
<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
6 changes: 3 additions & 3 deletions runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF
View file
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",
bcpg;bundle-version="1.73.0",
bcprov;bundle-version="1.73.0"
Bundle-Activator: org.eclipse.rcptt.runner.HeadlessRunnerPlugin
Bundle-ActivationPolicy: lazy
19 changes: 8 additions & 11 deletions runner/product/rcptt.runner.product
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="RCPTT Runner" uid="org.eclipse.rcptt.runner.headless" id="org.eclipse.rcptt.runner.product" application="org.eclipse.rcptt.runner.headless" version="2.5.5.qualifier" useFeatures="false" includeLaunchers="false" autoIncludeRequirements="true">
<product name="RCPTT Runner" uid="org.eclipse.rcptt.runner.headless" id="org.eclipse.rcptt.runner.product" application="org.eclipse.rcptt.runner.headless" version="2.5.5.qualifier" type="bundles" includeLaunchers="false" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand Down Expand Up @@ -30,6 +30,8 @@
</vm>

<plugins>
<plugin id="bcpg"/>
<plugin id="bcprov"/>
<plugin id="com.google.gson"/>
<plugin id="com.google.guava"/>
<plugin id="com.google.guava.failureaccess"/>
Expand All @@ -56,10 +58,8 @@
<plugin id="org.apache.httpcomponents.httpclient"/>
<plugin id="org.apache.httpcomponents.httpcore"/>
<plugin id="org.apache.jasper.glassfish"/>
<plugin id="org.apache.lucene.analysis"/>
<plugin id="org.apache.lucene.analysis-common"/>
<plugin id="org.apache.lucene.core"/>
<plugin id="org.bouncycastle.bcpg"/>
<plugin id="org.bouncycastle.bcprov"/>
<plugin id="org.eclipse.ant.core"/>
<plugin id="org.eclipse.ant.launching"/>
<plugin id="org.eclipse.compare.core"/>
Expand All @@ -73,7 +73,7 @@
<plugin id="org.eclipse.core.externaltools"/>
<plugin id="org.eclipse.core.filebuffers"/>
<plugin id="org.eclipse.core.filesystem"/>
<plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
<plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
<plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
Expand All @@ -96,7 +96,7 @@
<plugin id="org.eclipse.ecf.filetransfer"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.provider.filetransfer"/>
<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
<plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
<plugin id="org.eclipse.emf.common"/>
Expand All @@ -123,7 +123,7 @@
<plugin id="org.eclipse.equinox.launcher"/>
<plugin id="org.eclipse.equinox.launcher.cocoa.macosx.aarch64" fragment="true"/>
<plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.p2.artifact.repository"/>
<plugin id="org.eclipse.equinox.p2.console"/>
Expand Down Expand Up @@ -159,8 +159,6 @@
<plugin id="org.eclipse.jdt.annotation"/>
<plugin id="org.eclipse.jdt.apt.core"/>
<plugin id="org.eclipse.jdt.apt.pluggable.core"/>
<plugin id="org.eclipse.jdt.compiler.apt" fragment="true"/>
<plugin id="org.eclipse.jdt.compiler.tool" fragment="true"/>
<plugin id="org.eclipse.jdt.core"/>
<plugin id="org.eclipse.jdt.core.manipulation"/>
<plugin id="org.eclipse.jdt.debug"/>
Expand All @@ -171,7 +169,6 @@
<plugin id="org.eclipse.jdt.launching"/>
<plugin id="org.eclipse.jdt.launching.macosx"/>
<plugin id="org.eclipse.jdt.launching.ui.macosx"/>
<plugin id="org.eclipse.jetty.continuation"/>
<plugin id="org.eclipse.jetty.http"/>
<plugin id="org.eclipse.jetty.io"/>
<plugin id="org.eclipse.jetty.security"/>
Expand Down Expand Up @@ -282,7 +279,7 @@
<plugin id="org.eclipse.swt"/>
<plugin id="org.eclipse.swt.cocoa.macosx.aarch64" fragment="true"/>
<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.x86_64"/>
<plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.team.core"/>
<plugin id="org.eclipse.text"/>
Expand Down

0 comments on commit 55b3362

Please sign in to comment.