Merge branch 'master' into invalid_header_QuickFix

nburnwal09 · web-flow · commit f024c73daf02 · 2025-06-05T14:06:53.000+05:30
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -4,6 +4,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.8</version>
+		<version>4.0.13</version>
 	</extension>
 </extensions>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/pom.xml b/apitools/org.eclipse.pde.api.tools.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.pde</groupId>
 		<artifactId>eclipse.pde</artifactId>
-		<version>4.36.0-SNAPSHOT</version>
+		<version>4.37.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.pde.api.tools.tests</artifactId>
diff --git a/apitools/pom.xml b/apitools/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
   <artifactId>eclipse.pde.apitools</artifactId>
   <packaging>pom</packaging>
diff --git a/build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF b/build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests Plug-in
 Bundle-SymbolicName: org.eclipse.pde.build.tests;singleton:=true
-Bundle-Version: 1.4.800.qualifier
+Bundle-Version: 1.4.900.qualifier
 Bundle-Activator: org.eclipse.pde.build.tests.Activator
 Export-Package: org.eclipse.pde.build.internal.tests;x-internal:=true,
  org.eclipse.pde.build.internal.tests.ant;x-internal:=true,
diff --git a/build/org.eclipse.pde.build.tests/pom.xml b/build/org.eclipse.pde.build.tests/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>org.eclipse.pde</groupId>
 		<artifactId>eclipse.pde.build</artifactId>
-		<version>4.36.0-SNAPSHOT</version>
+		<version>4.37.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.pde.build.tests</artifactId>
-	<version>1.4.800-SNAPSHOT</version>
+	<version>1.4.900-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
diff --git a/build/org.eclipse.pde.build.tests/test-sdk.product b/build/org.eclipse.pde.build.tests/test-sdk.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse SDK" uid="org.eclipse.sdk.test.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.36.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse SDK" uid="org.eclipse.sdk.test.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.37.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
diff --git a/build/pom.xml b/build/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
   <artifactId>eclipse.pde.build</artifactId>
   <packaging>pom</packaging>
diff --git a/ds/org.eclipse.pde.ds.tck/pom.xml b/ds/org.eclipse.pde.ds.tck/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.pde</groupId>
 		<artifactId>eclipse.pde</artifactId>
-		<version>4.36.0-SNAPSHOT</version>
+		<version>4.37.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.pde.ds.tck</artifactId>
diff --git a/ds/pom.xml b/ds/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
   <artifactId>eclipse.pde.ds</artifactId>
   <packaging>pom</packaging>
diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde.e4tools</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/e4tools/pom.xml b/e4tools/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
   <artifactId>eclipse.pde.e4tools</artifactId>
   <packaging>pom</packaging>
diff --git a/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.pde</groupId>
 		<artifactId>eclipse.pde.e4tools</artifactId>
-		<version>4.36.0-SNAPSHOT</version>
+		<version>4.37.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.compatibility.migration.tests</artifactId>
diff --git a/e4tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.pde</groupId>
 		<artifactId>eclipse.pde.e4tools</artifactId>
-		<version>4.36.0-SNAPSHOT</version>
+		<version>4.37.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.persistence.tests</artifactId>
diff --git a/features/org.eclipse.pde-feature/feature.xml b/features/org.eclipse.pde-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.pde"
       label="%featureName"
-      version="3.16.300.qualifier"
+      version="3.16.400.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF b/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.pde.doc.user; singleton:=true
-Bundle-Version: 3.17.100.qualifier
+Bundle-Version: 3.17.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/org.eclipse.pde.doc.user/forceQualifierUpdate.txt b/org.eclipse.pde.doc.user/forceQualifierUpdate.txt
@@ -1,3 +0,0 @@
-https://github.com/eclipse-pde/eclipse.pde/pull/1665
-https://github.com/eclipse-pde/eclipse.pde/pull/1724
-https://github.com/eclipse-pde/eclipse.pde/pull/1788
diff --git a/org.eclipse.pde.doc.user/pom.xml b/org.eclipse.pde.doc.user/pom.xml
@@ -14,10 +14,10 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.pde.doc.user</artifactId>
-  <version>3.17.100-SNAPSHOT</version>
+  <version>3.17.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
diff --git a/ua/org.eclipse.pde.ua.tests/pom.xml b/ua/org.eclipse.pde.ua.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.ua.tests</artifactId>
diff --git a/ua/pom.xml b/ua/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
   <artifactId>eclipse.pde.ua</artifactId>
   <packaging>pom</packaging>
diff --git a/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml b/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.genericeditor.extension.tests</artifactId>
diff --git a/ui/org.eclipse.pde.junit.runtime.tests/pom.xml b/ui/org.eclipse.pde.junit.runtime.tests/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.eclipse.pde</groupId>
 		<artifactId>eclipse.pde</artifactId>
-		<version>4.36.0-SNAPSHOT</version>
+		<version>4.37.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.pde.junit.runtime.tests</artifactId>
diff --git a/ui/org.eclipse.pde.launching/.settings/.api_filters b/ui/org.eclipse.pde.launching/.settings/.api_filters
diff --git a/ui/org.eclipse.pde.launching/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.pde.launching;singleton:=true
-Bundle-Version: 3.13.400.qualifier
+Bundle-Version: 3.13.500.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: %provider-name
 Require-Bundle: org.eclipse.jdt.junit.core;bundle-version="[3.6.0,4.0.0)",
diff --git a/ui/org.eclipse.pde.ui.templates.tests/pom.xml b/ui/org.eclipse.pde.ui.templates.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.ui.templates.tests</artifactId>
diff --git a/ui/org.eclipse.pde.ui.tests/pom.xml b/ui/org.eclipse.pde.ui.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.ui.tests</artifactId>
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java
@@ -162,7 +162,7 @@ public IMarkerResolution[] getNonConfigSevResolutions(IMarker marker) {
 	 */
 	int getProblemId(IMarker marker) {
 		int problemID = marker.getAttribute(PDEMarkerFactory.PROBLEM_ID, PDEMarkerFactory.NO_RESOLUTION);
-		if (problemID != PDEMarkerFactory.NO_RESOLUTION) {
+		if (problemID != PDEMarkerFactory.NO_RESOLUTION && problemID != PDEMarkerFactory.M_ONLY_CONFIG_SEV) {
 			return problemID;
 		}
 		return marker.getAttribute("id", PDEMarkerFactory.NO_RESOLUTION); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde/META-INF/MANIFEST.MF b/ui/org.eclipse.pde/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.pde;singleton:=true
-Bundle-Version: 3.13.3100.qualifier
+Bundle-Version: 3.13.3200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/ui/org.eclipse.pde/pom.xml b/ui/org.eclipse.pde/pom.xml
@@ -14,11 +14,11 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde</artifactId>
-  <version>3.13.3100-SNAPSHOT</version>
+  <version>3.13.3200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/ui/pom.xml b/ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.pde</groupId>
     <artifactId>eclipse.pde</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
   <artifactId>eclipse.pde.ui</artifactId>
   <packaging>pom</packaging>
