Update to Eclipse 2023-06

eclipse · Jun 19, 2023 · 5659940 · 5659940
1 parent 8b471e9
commit 5659940
Show file tree

Hide file tree

Showing 11 changed files with 127 additions and 71 deletions.
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
@@ -1,6 +1,6 @@
 <?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"/>
@@ -20,20 +20,20 @@
 <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"/>
+<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"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <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"/>
+<repository location="http://download.eclipse.org/releases/2023-06"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.aspectj.runtime" version="0.0.0"/>
@@ -43,8 +43,24 @@
 <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>
+	<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="org.apache.httpcomponents" missingManifest="generate" type="Maven">
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>4.5.14</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpcore</artifactId>
+				<version>4.4.16</version>
+				<type>jar</type>
+			</dependency>
+		</dependencies>
 	</location>
 </locations>
 </target>
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
@@ -7,15 +7,15 @@ 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",
  com.google.gson;bundle-version="2.2.4",
  org.eclipse.rcptt.reporting.util;bundle-version="2.5.5",
  org.eclipse.debug.core,
  org.eclipse.equinox.security,
  org.eclipse.rcptt.util,
  org.eclipse.rcptt.launching;bundle-version="2.5.5",
- org.eclipse.rcptt.testrail.ecl
+ org.eclipse.rcptt.testrail.ecl,
+ wrapped.org.apache.httpcomponents.httpclient;bundle-version="4.5.14",
+ wrapped.org.apache.httpcomponents.httpcore;bundle-version="4.4.16"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.rcptt.internal.testrail,
  org.eclipse.rcptt.testrail,

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
@@ -13,9 +13,9 @@ 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.commons.lang3
+ org.apache.commons.lang3,
+ wrapped.org.apache.httpcomponents.httpclient;bundle-version="4.5.14",
+ wrapped.org.apache.httpcomponents.httpcore;bundle-version="4.4.16"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.rcptt.internal.zephyr,
  org.eclipse.rcptt.zephyr

diff --git a/...r/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java b/...r/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java
@@ -13,13 +13,15 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.ParseException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.util.EntityUtils;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
@@ -48,13 +50,13 @@ public static Map<String, Long> getAllCycles(final ZephyrRestClient restClient,
 
 				final JsonObject projObj = new JsonParser().parse(string).getAsJsonObject();
 				for (int i = 0; i < projObj.size(); i++) {
-					final Set<String> keys = projObj.keySet();
+					final Set<Entry<String, JsonElement>> objects = projObj.entrySet();
 
-					for (final String key : keys) {
-						if (!key.trim().equals("recordsCount")) {
-							final JsonObject cycleObject = projObj.get(key).getAsJsonObject();
+					for (final Entry<String, JsonElement> entry : objects) {
+						if (!entry.getKey().trim().equals("recordsCount")) {
+							final JsonObject cycleObject = entry.getValue().getAsJsonObject();
 							final String cycleName = cycleObject.get("name").getAsString();
-							final long id = Long.parseLong(key);
+							final long id = Long.parseLong(entry.getKey());
 							cycles.put(cycleName, id);
 						}
 					}

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
@@ -62,7 +62,6 @@
 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.rcptt.search.utils.ScenarioTableContentProvider;
 import org.eclipse.rcptt.search.utils.ScenarioTreeContentProvider;
@@ -129,14 +128,6 @@ 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 IShowInTargetList SHOW_IN_TARGET_LIST = new IShowInTargetList() {
-		public String[] getShowInTargetIds() {
-			return SHOW_IN_TARGETS;
-		}
-	};
-
 	public Q7SearchResultPage() {
 		fSortByNameAction = new SortAction(
 				SearchMessages.FileSearchPage_sort_name_label, this,
@@ -158,12 +149,6 @@ public StructuredViewer getViewer() {
 		return super.getViewer();
 	}
 
-	@SuppressWarnings("deprecation")
-	private void addDragAdapters(StructuredViewer viewer) {
-		Transfer[] transfers = new Transfer[] { ResourceTransfer.getInstance() };
-		int ops = DND.DROP_COPY | DND.DROP_LINK;
-		viewer.addDragSupport(ops, transfers, new NavigatorDragAdapter(viewer));
-	}
 
 	protected void configureTableViewer(TableViewer viewer) {
 		viewer.setUseHashlookup(true);
@@ -176,7 +161,6 @@ protected void configureTableViewer(TableViewer viewer) {
 				innerLabelProvider));
 		fContentProvider = (IFileSearchContentProvider) viewer
 				.getContentProvider();
-		addDragAdapters(viewer);
 	}
 
 	protected void configureTreeViewer(TreeViewer viewer) {
@@ -190,7 +174,6 @@ protected void configureTreeViewer(TreeViewer viewer) {
 				innerLabelProvider));
 		fContentProvider = (IFileSearchContentProvider) viewer
 				.getContentProvider();
-		addDragAdapters(viewer);
 	}
 
 	protected void showMatch(Match match, int offset, int length,
@@ -356,9 +339,6 @@ public void saveState(IMemento memento) {
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public Object getAdapter(Class adapter) {
-		if (IShowInTargetList.class.equals(adapter)) {
-			return SHOW_IN_TARGET_LIST;
-		}
 
 		if (adapter == IShowInSource.class) {
 			ISelectionProvider selectionProvider = getSite()

diff --git a/releng/ide/pom.xml b/releng/ide/pom.xml
@@ -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>

diff --git a/releng/target-platforms/2023-06/ide.target b/releng/target-platforms/2023-06/ide.target
@@ -0,0 +1,66 @@
+<?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="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="com.sun.xml.bind" version="0.0.0"/>
+<unit id="javax.activation" version="0.0.0"/>
+<unit id="javax.xml" 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"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.guava" version="0.0.0"/>
+<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+<unit id="org.jsoup" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/2023-06"/>
+</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>
+	<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="org.apache.httpcomponents" missingManifest="generate" type="Maven">
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>4.5.14</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpcore</artifactId>
+				<version>4.4.16</version>
+				<type>jar</type>
+			</dependency>
+		</dependencies>
+	</location>
+</locations>
+</target>
diff --git a/repository/full/org.eclipse.rcptt.product b/repository/full/org.eclipse.rcptt.product
@@ -298,14 +298,12 @@
       <feature id="org.eclipse.emf.databinding"/>
       <feature id="org.eclipse.rcptt.module.nebula"/>
       <feature id="org.eclipse.rcptt.module.testrail"/>
-      <feature id="org.eclipse.rcptt.module.zephyr"/>
       <feature id="org.eclipse.emf.validation"/>
       <feature id="org.eclipse.emf.edit"/>
       <feature id="org.eclipse.emf.transaction"/>
       <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"/>
@@ -320,9 +318,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>

diff --git 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