From b25e01799b26228757a6bc1c321c59fed688281a Mon Sep 17 00:00:00 2001 From: Simeon Andreev Date: Wed, 27 Nov 2024 09:01:42 +0100 Subject: [PATCH] Updated bundles with comparator errors Changes to ecj are for handling of switch on String. See: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595 --- bundles/org.eclipse.osgi/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.osgi/forceQualifierUpdate.txt | 1 + bundles/org.eclipse.osgi/pom.xml | 2 +- features/org.eclipse.equinox.core.feature/feature.xml | 2 +- features/org.eclipse.equinox.core.sdk/feature.xml | 2 +- features/org.eclipse.equinox.server.core/feature.xml | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF index f3db2ee0277..61296720925 100644 --- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF @@ -107,7 +107,7 @@ Bundle-Activator: org.eclipse.osgi.internal.framework.SystemBundleActivator Bundle-Description: %systemBundle Bundle-Copyright: %copyright Bundle-Vendor: %eclipse.org -Bundle-Version: 3.22.0.qualifier +Bundle-Version: 3.22.100.qualifier Bundle-Localization: systembundle Bundle-DocUrl: http://www.eclipse.org Eclipse-ExtensibleAPI: true diff --git a/bundles/org.eclipse.osgi/forceQualifierUpdate.txt b/bundles/org.eclipse.osgi/forceQualifierUpdate.txt index a533b820e4b..139ec040f0f 100644 --- a/bundles/org.eclipse.osgi/forceQualifierUpdate.txt +++ b/bundles/org.eclipse.osgi/forceQualifierUpdate.txt @@ -9,3 +9,4 @@ https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/20 Touch for module-info updates Bug 527899 [9] Implement JEP 280: Indify String Concatenation #1139 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659 +https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595 \ No newline at end of file diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml index b48bb633d34..dd39fc80514 100644 --- a/bundles/org.eclipse.osgi/pom.xml +++ b/bundles/org.eclipse.osgi/pom.xml @@ -19,7 +19,7 @@ org.eclipse.osgi org.eclipse.osgi - 3.22.0-SNAPSHOT + 3.22.100-SNAPSHOT eclipse-plugin diff --git a/features/org.eclipse.equinox.core.feature/feature.xml b/features/org.eclipse.equinox.core.feature/feature.xml index c79a9fa006b..a689b62fae7 100644 --- a/features/org.eclipse.equinox.core.feature/feature.xml +++ b/features/org.eclipse.equinox.core.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.equinox.core.sdk/feature.xml b/features/org.eclipse.equinox.core.sdk/feature.xml index ea7111dc955..8cfde225a65 100644 --- a/features/org.eclipse.equinox.core.sdk/feature.xml +++ b/features/org.eclipse.equinox.core.sdk/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.equinox.server.core/feature.xml b/features/org.eclipse.equinox.server.core/feature.xml index 9ee3851b51d..f4757b29353 100644 --- a/features/org.eclipse.equinox.server.core/feature.xml +++ b/features/org.eclipse.equinox.server.core/feature.xml @@ -2,7 +2,7 @@