Skip to content

Fix spelling#1770

Merged
akurtakov merged 3 commits intoeclipse-platform:masterfrom
jbampton:fix-spelling
Mar 13, 2025
Merged

Fix spelling#1770
akurtakov merged 3 commits intoeclipse-platform:masterfrom
jbampton:fix-spelling

Conversation

@jbampton
Copy link
Contributor

No description provided.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 11, 2025

Test Results

1 214 files  ±0  1 214 suites  ±0   1h 3m 36s ⏱️ + 5m 29s
4 173 tests ±0  4 127 ✅ ±0   46 💤 ±0  0 ❌ ±0 
9 541 runs  ±0  9 420 ✅ ±0  121 💤 ±0  0 ❌ ±0 

Results for commit a5198e8. ± Comparison against base commit 57dfd00.

♻️ This comment has been updated with latest results.

@eclipse-platform-bot
Copy link
Contributor

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
resources/tests/org.eclipse.core.tests.resources/pom.xml
runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
team/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF
team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
team/examples/org.eclipse.team.examples.filesystem/pom.xml
team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
ua/org.eclipse.ui.cheatsheets/pom.xml

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From 90a8e63ee7a31c823e8d0ed292aa311d53a05a58 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Tue, 11 Mar 2025 20:29:42 +0000
Subject: [PATCH] Version bump(s) for 4.36 stream


diff --git a/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF b/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
index 9f542ab492..f968edebda 100644
--- a/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
+++ b/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Core Tests Resources
 Bundle-SymbolicName: org.eclipse.core.tests.resources; singleton:=true
-Bundle-Version: 3.11.800.qualifier
+Bundle-Version: 3.11.900.qualifier
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.core.tests.filesystem,
  org.eclipse.core.tests.internal.alias,
diff --git a/resources/tests/org.eclipse.core.tests.resources/pom.xml b/resources/tests/org.eclipse.core.tests.resources/pom.xml
index 75811dd624..aad20413b7 100644
--- a/resources/tests/org.eclipse.core.tests.resources/pom.xml
+++ b/resources/tests/org.eclipse.core.tests.resources/pom.xml
@@ -18,7 +18,7 @@
     <version>4.36.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.core.tests.resources</artifactId>
-  <version>3.11.800-SNAPSHOT</version>
+  <version>3.11.900-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF b/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
index 9344f2e991..cdd8fdb843 100644
--- a/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
+++ b/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.core.services;singleton:=true
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-Version: 2.5.100.qualifier
+Bundle-Version: 2.5.200.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: jakarta.annotation;version="[2.0.0,3.0.0)",
diff --git a/runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
index 7ff486b784..da68ce8187 100644
--- a/runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
+++ b/runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Core Tests Runtime
 Bundle-SymbolicName: org.eclipse.core.tests.runtime; singleton:=true
-Bundle-Version: 3.21.600.qualifier
+Bundle-Version: 3.21.700.qualifier
 Bundle-Activator: org.eclipse.core.tests.runtime.RuntimeTestsPlugin
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.core.tests.internal.preferences,
diff --git a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
index deda14554b..091ddff385 100644
--- a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare; singleton:=true
-Bundle-Version: 3.11.300.qualifier
+Bundle-Version: 3.11.400.qualifier
 Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/team/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF
index 36e91b0d86..a54acdf05e 100644
--- a/team/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.core.net;singleton:=true
-Bundle-Version: 1.5.600.qualifier
+Bundle-Version: 1.5.700.qualifier
 Bundle-Activator: org.eclipse.core.internal.net.Activator
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
diff --git a/team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
index 764976ee94..72a47b0615 100644
--- a/team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.core; singleton:=true
-Bundle-Version: 3.10.600.qualifier
+Bundle-Version: 3.10.700.qualifier
 Bundle-Activator: org.eclipse.team.internal.core.TeamPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
index 6f5b1094e8..6150136e39 100644
--- a/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
+++ b/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true
-Bundle-Version: 3.7.600.qualifier
+Bundle-Version: 3.7.700.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.team.examples.filesystem,
diff --git a/team/examples/org.eclipse.team.examples.filesystem/pom.xml b/team/examples/org.eclipse.team.examples.filesystem/pom.xml
index 51b448475e..0ee32359c1 100644
--- a/team/examples/org.eclipse.team.examples.filesystem/pom.xml
+++ b/team/examples/org.eclipse.team.examples.filesystem/pom.xml
@@ -18,7 +18,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.team.examples.filesystem</artifactId>
-  <version>3.7.600-SNAPSHOT</version>
+  <version>3.7.700-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
   	<plugins>
diff --git a/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF b/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
index d32ea6c0ed..51c9b69c06 100644
--- a/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
+++ b/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.tests;singleton:=true
-Bundle-Version: 3.8.600.qualifier
+Bundle-Version: 3.8.700.qualifier
 Require-Bundle: org.eclipse.compare,
  org.eclipse.jface.text,
  org.eclipse.jface,
diff --git a/ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF b/ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
index f2282802f9..15832e3d60 100644
--- a/ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.ui.cheatsheets; singleton:=true
-Bundle-Version: 3.8.500.qualifier
+Bundle-Version: 3.8.600.qualifier
 Bundle-Activator: org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin
 Bundle-Vendor: %PROVIDER_NAME
 Bundle-Localization: plugin
diff --git a/ua/org.eclipse.ui.cheatsheets/pom.xml b/ua/org.eclipse.ui.cheatsheets/pom.xml
index b42064469a..eafa610277 100644
--- a/ua/org.eclipse.ui.cheatsheets/pom.xml
+++ b/ua/org.eclipse.ui.cheatsheets/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.ui.cheatsheets</artifactId>
-  <version>3.8.500-SNAPSHOT</version>
+  <version>3.8.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
-- 
2.48.1

Further information are available in Common Build Issues - Missing version increments.

@akurtakov
Copy link
Member

This PR uncovered 2 comments left wrong after previous changes. Once removed, this PR is good to go in.

@jbampton jbampton requested a review from akurtakov March 12, 2025 22:44
@akurtakov
Copy link
Member

Windows GHA build OOMs. Ignoring as all others complete fine.

@akurtakov akurtakov merged commit 90faa8e into eclipse-platform:master Mar 13, 2025
16 of 17 checks passed
@jbampton jbampton deleted the fix-spelling branch March 13, 2025 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants