Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-01-14 10:03:50 -0500
committerIgor Fedorenko2011-01-14 16:48:55 -0500
commit8fc8a24085b64a5de82c4c9389f9c2b0258aa4b2 (patch)
treebfc7f54dfcf2df64b256cea9a3a6dcdb2a10384e /org.eclipse.m2e.discovery-directory
parentb33904d43e33c617a558ded9b4b1e3b4b4cc6683 (diff)
downloadm2e-core-8fc8a24085b64a5de82c4c9389f9c2b0258aa4b2.tar.gz
m2e-core-8fc8a24085b64a5de82c4c9389f9c2b0258aa4b2.tar.xz
m2e-core-8fc8a24085b64a5de82c4c9389f9c2b0258aa4b2.zip
Fixed metadata lookup priorities
Reworked the code to explicitly traverse parent pom hierarchy instead of relying on standard maven logic to do that. Added logic to detect and report conflicting mapping metadata. Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.discovery-directory')
-rw-r--r--org.eclipse.m2e.discovery-directory/.settings/org.maven.ide.eclipse.prefs16
-rw-r--r--org.eclipse.m2e.discovery-directory/directory.xml4
2 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.m2e.discovery-directory/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.m2e.discovery-directory/.settings/org.maven.ide.eclipse.prefs
index cff648b8..3275b477 100644
--- a/org.eclipse.m2e.discovery-directory/.settings/org.maven.ide.eclipse.prefs
+++ b/org.eclipse.m2e.discovery-directory/.settings/org.maven.ide.eclipse.prefs
@@ -1,8 +1,8 @@
-#Thu Jan 06 13:50:06 EST 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
+#Thu Jan 06 13:50:06 EST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.m2e.discovery-directory/directory.xml b/org.eclipse.m2e.discovery-directory/directory.xml
index 0ee96a64..f766cc7d 100644
--- a/org.eclipse.m2e.discovery-directory/directory.xml
+++ b/org.eclipse.m2e.discovery-directory/directory.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
+<?xml version="1.0" encoding="UTF-8"?>
+<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
</directory> \ No newline at end of file

Back to the top