337510,336473 wrong marker configuration

This is a regression introduced by 335719. Some of plugin.xml entries
were not properly updated when project configuration update detection
was introduced in the code. Thanks Milos for pointing at the problem.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

8 files changed, 18 insertions, 13 deletions

diff --git a/org.eclipse.m2e.core/plugin.xml b/org.eclipse.m2e.core/plugin.xml
index f82fdd74..e7ad015d 100644
--- a/org.eclipse.m2e.core/plugin.xml
+++ b/org.eclipse.m2e.core/plugin.xml
@@ -89,6 +89,7 @@
    <extension point="org.eclipse.core.resources.markers"
          id="maven2Problem.lifecycleMapping"
          name="%m2.marker.problem.lifecycleMapping.name">
+      <super type="org.eclipse.m2e.core.maven2Problem"/>
       <persistent value="true"/>
    </extension>
 
diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
index 9055f57a..b83bd429 100644
--- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
@@ -21,10 +21,12 @@ Require-Bundle: org.eclipse.equinox.p2.ui.discovery,
  org.eclipse.equinox.p2.metadata,
  org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)",
  org.slf4j.api;bundle-version="1.5.11"
-Export-Package: org.eclipse.m2e.internal.discovery,
- org.eclipse.m2e.internal.discovery.markers,
+Export-Package: org.eclipse.m2e.internal.discovery;x-internal:=true,
+ org.eclipse.m2e.internal.discovery.handlers;x-internal:=true,
+ org.eclipse.m2e.internal.discovery.markers;x-internal:=true,
+ org.eclipse.m2e.internal.discovery.operation;x-internal:=true,
  org.eclipse.m2e.internal.discovery.startup;x-internal:=true,
- org.eclipse.m2e.internal.discovery.wizards
+ org.eclipse.m2e.internal.discovery.wizards;x-internal:=true
 Import-Package: org.apache.maven.model,
  org.apache.maven.plugin,
  org.eclipse.equinox.internal.p2.ui,
diff --git a/org.eclipse.m2e.discovery/plugin.xml b/org.eclipse.m2e.discovery/plugin.xml
index b0097fce..8c0c6aea 100644
--- a/org.eclipse.m2e.discovery/plugin.xml
+++ b/org.eclipse.m2e.discovery/plugin.xml
@@ -36,7 +36,7 @@
 		point="org.eclipse.ui.ide.markerResolution">
 		<markerResolutionGenerator
 			class="org.eclipse.m2e.internal.discovery.markers.MavenDiscoveryMarkerResolutionGenerator"
-			markerType="org.eclipse.m2e.core.maven2Problem.configuration">
+			markerType="org.eclipse.m2e.core.maven2Problem.lifecycleMapping">
 		</markerResolutionGenerator>
 	</extension>
 </plugin>
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/markers/DiscoveryWizardProposal.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/markers/DiscoveryWizardProposal.java
index 3980961c..e04bf4a7 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/markers/DiscoveryWizardProposal.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/markers/DiscoveryWizardProposal.java
@@ -32,7 +32,7 @@ import org.eclipse.ui.views.markers.WorkbenchMarkerResolution;
 
 //IMPORANT: if you decide to rename the class please correct code in PomQuickAssistProcessor as well..
 
-class DiscoveryWizardProposal extends WorkbenchMarkerResolution {
+public class DiscoveryWizardProposal extends WorkbenchMarkerResolution {
   
   public DiscoveryWizardProposal() {
   }
diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
index b5e6fb48..3bd5a2ab 100644
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
@@ -22,7 +22,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.forms,
  org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)",
  org.slf4j.api;bundle-version="1.5.11"
-Export-Package: org.eclipse.m2e.editor.xml, org.eclipse.m2e.editor.xml.internal
+Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true,
+ org.eclipse.m2e.editor.xml.internal;x-internal:=true,
+ org.eclipse.m2e.editor.xml.internal.lifecycle;x-internal:=true,
+ org.eclipse.m2e.editor.xml.preferences;x-internal:=true
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
diff --git a/org.eclipse.m2e.editor.xml/build.properties b/org.eclipse.m2e.editor.xml/build.properties
index 01257cb6..6e27c840 100644
--- a/org.eclipse.m2e.editor.xml/build.properties
+++ b/org.eclipse.m2e.editor.xml/build.properties
@@ -1,10 +1,9 @@
 output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
+bin.includes = .,\
+               META-INF/,\
+               OSGI-INF/,\
+               about.html,\
                plugin.xml,\
                icons/,\
-               schema/,\
-               OSGI-INF/l10n/bundle.properties,\
-               about.html,\
-               OSGI-INF/component.xml
+               schema/
 source.. = src/main/java/
diff --git a/org.eclipse.m2e.editor.xml/plugin.xml b/org.eclipse.m2e.editor.xml/plugin.xml
index 3106ed93..3c4fb0cf 100644
--- a/org.eclipse.m2e.editor.xml/plugin.xml
+++ b/org.eclipse.m2e.editor.xml/plugin.xml
@@ -29,7 +29,7 @@
 		</markerResolutionGenerator>
 		<markerResolutionGenerator
 			class="org.eclipse.m2e.editor.xml.MavenMarkerResolutionGenerator"
-			markerType="org.eclipse.m2e.core.maven2Problem.configuration">
+			markerType="org.eclipse.m2e.core.maven2Problem.lifecycleMapping">
 		</markerResolutionGenerator>
 	</extension>
 	<extension
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/template/.gitignore b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/template/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/template/.gitignore
+++ /dev/null