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..fd96ccc10 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 @@ - + @@ -20,20 +20,20 @@ - + + + + + + + - - - - - - - + @@ -43,8 +43,24 @@ - - + + + + + + + org.apache.httpcomponents + httpclient + 4.5.14 + jar + + + org.apache.httpcomponents + httpcore + 4.4.16 + jar + + \ 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..a5662eeeb 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,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 index 487a59f53..c7767de00 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,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/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java index b6876a900..9a0faa391 100644 --- a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java +++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java @@ -13,6 +13,7 @@ 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; @@ -20,6 +21,7 @@ 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 getAllCycles(final ZephyrRestClient restClient, final JsonObject projObj = new JsonParser().parse(string).getAsJsonObject(); for (int i = 0; i < projObj.size(); i++) { - final Set keys = projObj.keySet(); + final Set> objects = projObj.entrySet(); - for (final String key : keys) { - if (!key.trim().equals("recordsCount")) { - final JsonObject cycleObject = projObj.get(key).getAsJsonObject(); + for (final Entry 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 index 7d6493aa1..8dd078bea 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,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 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/target-platforms/2023-06/ide.target b/releng/target-platforms/2023-06/ide.target new file mode 100644 index 000000000..d3fc888cd --- /dev/null +++ b/releng/target-platforms/2023-06/ide.target @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.httpcomponents + httpclient + 4.5.14 + jar + + + org.apache.httpcomponents + httpcore + 4.4.16 + jar + + + + + \ No newline at end of file diff --git a/repository/full/org.eclipse.rcptt.product b/repository/full/org.eclipse.rcptt.product index 037d6893c..cc7ee68d6 100644 --- a/repository/full/org.eclipse.rcptt.product +++ b/repository/full/org.eclipse.rcptt.product @@ -298,14 +298,12 @@ - - @@ -320,9 +318,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 671a7fb4c..1fb28950e 100644 --- a/runner/product/rcptt.runner.product +++ b/runner/product/rcptt.runner.product @@ -30,6 +30,8 @@ + + @@ -53,13 +55,9 @@ - - - + - - @@ -73,7 +71,7 @@ - + @@ -96,7 +94,7 @@ - + @@ -122,7 +120,7 @@ - + @@ -158,8 +156,6 @@ - - @@ -170,7 +166,6 @@ - @@ -280,7 +275,7 @@ - + @@ -305,6 +300,8 @@ + + diff --git a/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/src/org/eclipse/rcptt/ecl/data/apache/poi/impl/internal/commands/ExcelFileService.java b/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/src/org/eclipse/rcptt/ecl/data/apache/poi/impl/internal/commands/ExcelFileService.java index 315c5d416..d3769f7d0 100644 --- a/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/src/org/eclipse/rcptt/ecl/data/apache/poi/impl/internal/commands/ExcelFileService.java +++ b/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/src/org/eclipse/rcptt/ecl/data/apache/poi/impl/internal/commands/ExcelFileService.java @@ -51,9 +51,6 @@ public static Workbook readBook(EclFile file) throws CoreException { } catch (FileNotFoundException e) { throw new CoreException(EclDataApachePOIImplPlugin.createErr( e, "File not found %s", file.toURI())); - } catch (InvalidFormatException e) { - throw new CoreException(EclDataApachePOIImplPlugin.createErr( - "Invalid format of file %s", file.toURI())); } catch (IOException e) { throw new CoreException(EclDataApachePOIImplPlugin.createErr( e, "Error reading file %s", file.toURI())); @@ -77,15 +74,15 @@ public static String getCellValue(Cell cell) { return ""; } switch (cell.getCellType()) { - case Cell.CELL_TYPE_STRING: + case STRING: return cell.getStringCellValue(); - case Cell.CELL_TYPE_NUMERIC: + case NUMERIC: String number = String.valueOf(cell.getNumericCellValue()); number = number.replaceAll(".0$", ""); return number; - case Cell.CELL_TYPE_BOOLEAN: + case BOOLEAN: return String.valueOf(cell.getBooleanCellValue()); - case Cell.CELL_TYPE_FORMULA: + case FORMULA: return "=" + cell.getCellFormula(); default: return "";