Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-02-18 21:18:46 -0500
committerIgor Fedorenko2011-02-18 22:57:09 -0500
commit2d7018c221b0fdfeb1999284144cff0a144afd82 (patch)
tree9f167c8a92f96c1179f94e2005b32dce510f736a /org.eclipse.m2e.editor.xml
parentf48aaf18ff92cedd9e28fa1ee0c382be1f94e3e6 (diff)
downloadm2e-core-2d7018c221b0fdfeb1999284144cff0a144afd82.tar.gz
m2e-core-2d7018c221b0fdfeb1999284144cff0a144afd82.tar.xz
m2e-core-2d7018c221b0fdfeb1999284144cff0a144afd82.zip
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>
Diffstat (limited to 'org.eclipse.m2e.editor.xml')
-rw-r--r--org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.m2e.editor.xml/build.properties11
-rw-r--r--org.eclipse.m2e.editor.xml/plugin.xml2
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/template/.gitignore0
4 files changed, 10 insertions, 8 deletions
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

Back to the top