From 526f50f642cb1ba1ce0b254bd25d1724248732fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:02:22 +0000 Subject: [PATCH 1/4] Bump org.eclipse.jdt:ecj from 3.36.0 to 3.37.0 Bumps [org.eclipse.jdt:ecj](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.36.0 to 3.37.0. - [Commits](https://github.com/eclipse-jdt/eclipse.jdt.core/commits) --- updated-dependencies: - dependency-name: org.eclipse.jdt:ecj dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b4d18d0f0..3dbbb797ee 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 3.2.5 3.19.0 - 3.36.0 + 3.37.0 7.0.0 3.3.1 From 261777d5a08d6894475556e3cd987cb61aa1a318 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:53:08 +0000 Subject: [PATCH 2/4] Bump org.eclipse.jdt:org.eclipse.jdt.core from 3.36.0 to 3.37.0 Bumps [org.eclipse.jdt:org.eclipse.jdt.core](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.36.0 to 3.37.0. - [Commits](https://github.com/eclipse-jdt/eclipse.jdt.core/commits) --- updated-dependencies: - dependency-name: org.eclipse.jdt:org.eclipse.jdt.core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- tycho-apitools-plugin/pom.xml | 2 +- tycho-core/pom.xml | 2 +- tycho-its/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml index fa292de1b0..97751c4ac8 100644 --- a/tycho-apitools-plugin/pom.xml +++ b/tycho-apitools-plugin/pom.xml @@ -67,7 +67,7 @@ org.eclipse.jdt org.eclipse.jdt.core - 3.36.0 + 3.37.0 org.eclipse.jdt diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml index d62c839a59..d6fbfaa0e8 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -314,7 +314,7 @@ org.eclipse.jdt org.eclipse.jdt.core - 3.36.0 + 3.37.0 org.eclipse.pde diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml index b9a759d0f0..cf21a34d33 100644 --- a/tycho-its/pom.xml +++ b/tycho-its/pom.xml @@ -194,7 +194,7 @@ org.eclipse.jdt org.eclipse.jdt.core - 3.36.0 + 3.37.0 test From c4da3d917dee4b12f69de541ce2039158b2d09c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:21:35 +0000 Subject: [PATCH 3/4] Bump org.eclipse.pde:org.eclipse.pde.core from 3.17.200 to 3.18.0 Bumps [org.eclipse.pde:org.eclipse.pde.core](https://github.com/eclipse-pde/eclipse.pde) from 3.17.200 to 3.18.0. - [Changelog](https://github.com/eclipse-pde/eclipse.pde/blob/master/org.eclipse.pde.doc.user/topics_WhatsNew.xml) - [Commits](https://github.com/eclipse-pde/eclipse.pde/commits) --- updated-dependencies: - dependency-name: org.eclipse.pde:org.eclipse.pde.core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- tycho-apitools-plugin/pom.xml | 2 +- tycho-core/pom.xml | 2 +- tycho-eclipse-plugin/pom.xml | 2 +- tycho-extras/tycho-document-bundle-plugin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml index 97751c4ac8..10d45914a3 100644 --- a/tycho-apitools-plugin/pom.xml +++ b/tycho-apitools-plugin/pom.xml @@ -50,7 +50,7 @@ org.eclipse.pde org.eclipse.pde.core - 3.17.200 + 3.18.0 jar diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml index d6fbfaa0e8..8d9cd17aea 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -319,7 +319,7 @@ org.eclipse.pde org.eclipse.pde.core - 3.17.200 + 3.18.0 test diff --git a/tycho-eclipse-plugin/pom.xml b/tycho-eclipse-plugin/pom.xml index 0d955d8f17..e9f2051c73 100644 --- a/tycho-eclipse-plugin/pom.xml +++ b/tycho-eclipse-plugin/pom.xml @@ -39,7 +39,7 @@ org.eclipse.pde org.eclipse.pde.core - 3.17.200 + 3.18.0 jar diff --git a/tycho-extras/tycho-document-bundle-plugin/pom.xml b/tycho-extras/tycho-document-bundle-plugin/pom.xml index 5f7bdea1f4..f6d4a8dce2 100644 --- a/tycho-extras/tycho-document-bundle-plugin/pom.xml +++ b/tycho-extras/tycho-document-bundle-plugin/pom.xml @@ -64,7 +64,7 @@ org.eclipse.pde org.eclipse.pde.core - 3.17.200 + 3.18.0 From 041da63d81a4b268b14aa9c32891fff4f3f17229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 15 Mar 2024 13:48:40 +0200 Subject: [PATCH 4/4] Fix compilation --- .../extras/docbundle/runner/ConvertSchemaToHtmlRunner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java b/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java index f4d058d69d..bb94a85fc9 100644 --- a/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java +++ b/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java @@ -25,6 +25,7 @@ import java.io.Serializable; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -50,7 +51,6 @@ import org.eclipse.pde.internal.core.schema.Schema; import org.eclipse.pde.internal.core.schema.SchemaDescriptor; import org.eclipse.pde.internal.core.schema.SchemaProvider; -import org.eclipse.pde.internal.core.util.HeaderMap; import org.osgi.framework.Constants; /** @@ -164,7 +164,7 @@ private String getPluginID(File manifest) { if (OSGiFile.exists()) { try (FileInputStream manifestStream = new FileInputStream(OSGiFile)) { - Map headers = ManifestElement.parseBundleManifest(manifestStream, new HeaderMap<>()); + Map headers = ManifestElement.parseBundleManifest(manifestStream, new HashMap<>()); String value = headers.get(Constants.BUNDLE_SYMBOLICNAME); if (value == null) { return null;