diff --git a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/ide.target b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/ide.target index 9c06f123b..94421413e 100644 --- a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/ide.target +++ b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/ide.target @@ -1,6 +1,6 @@ - + @@ -8,11 +8,13 @@ - - + + + + @@ -20,20 +22,17 @@ - + - - + + + + + + - - - - - - - @@ -42,9 +41,9 @@ - - - - + + + + - \ No newline at end of file + diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF b/modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF index 8d32fe12d..fc78d9cb3 100644 --- a/modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF +++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF @@ -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, diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/META-INF/MANIFEST.MF b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/META-INF/MANIFEST.MF index 487a59f53..a3f50ad67 100644 --- a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/META-INF/MANIFEST.MF +++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/META-INF/MANIFEST.MF @@ -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, diff --git a/rcp/org.eclipse.rcptt.search/src/org/eclipse/rcptt/search/Q7SearchResultPage.java b/rcp/org.eclipse.rcptt.search/src/org/eclipse/rcptt/search/Q7SearchResultPage.java index 7d6493aa1..9c6f42526 100644 --- a/rcp/org.eclipse.rcptt.search/src/org/eclipse/rcptt/search/Q7SearchResultPage.java +++ b/rcp/org.eclipse.rcptt.search/src/org/eclipse/rcptt/search/Q7SearchResultPage.java @@ -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; @@ -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; diff --git a/releng/ide/pom.xml b/releng/ide/pom.xml index 5123764fb..393ae5672 100644 --- a/releng/ide/pom.xml +++ b/releng/ide/pom.xml @@ -42,14 +42,14 @@ - 2020-03-updates + 2023-06-updates p2 - http://download.eclipse.org/eclipse/updates/4.15 + https://download.eclipse.org/eclipse/updates/4.28/ - 2020-09 + 2023-06 p2 - http://download.eclipse.org/releases/2022-09 + http://download.eclipse.org/releases/2023-06 orbit diff --git a/releng/runtime/pom.xml b/releng/runtime/pom.xml index 85cb8f6f4..ec00172a1 100644 --- a/releng/runtime/pom.xml +++ b/releng/runtime/pom.xml @@ -62,7 +62,7 @@ swtchart p2 - https://download.eclipse.org/swtchart/releases/0.12.0/repository + https://download.eclipse.org/swtchart/releases/0.14.0/repository diff --git a/releng/target-platforms/2023-06/ide.target b/releng/target-platforms/2023-06/ide.target new file mode 100644 index 000000000..94421413e --- /dev/null +++ b/releng/target-platforms/2023-06/ide.target @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repository/full/org.eclipse.rcptt.product b/repository/full/org.eclipse.rcptt.product index 037d6893c..f35421648 100644 --- a/repository/full/org.eclipse.rcptt.product +++ b/repository/full/org.eclipse.rcptt.product @@ -305,7 +305,6 @@ - @@ -320,9 +319,9 @@ - + diff --git a/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF b/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF index edcbcc022..0a770bc8b 100644 --- a/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF +++ b/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF @@ -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 diff --git a/runner/product/rcptt.runner.product b/runner/product/rcptt.runner.product index afb2124ed..fdb5e8a7d 100644 --- a/runner/product/rcptt.runner.product +++ b/runner/product/rcptt.runner.product @@ -1,7 +1,7 @@ - + @@ -30,6 +30,8 @@ + + @@ -56,10 +58,8 @@ - + - - @@ -73,7 +73,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -159,8 +159,6 @@ - - @@ -171,7 +169,6 @@ - @@ -282,7 +279,7 @@ - +