separate SLF4J export from JSR-330 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413416 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/46d04486 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/46d04486 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/46d04486 Branch: refs/heads/feature/colorized-console/log4j2 Commit: 46d04486c28e5389d0f1d29f74838cbda8a36da6 Parents: 1ab19a3 Author: Herve Boutemy <hbout...@apache.org> Authored: Sun Nov 25 21:02:47 2012 +0000 Committer: Arnaud HeÌritier <aherit...@exoplatform.com> Committed: Sat Dec 1 13:51:04 2012 +0100 ---------------------------------------------------------------------- .../maven/classrealm/DefaultClassRealmManager.java | 16 ++++++++------ 1 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/46d04486/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index b1c6d9e..0db5b4b 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -183,6 +183,12 @@ public class DefaultClassRealmManager // classworlds (for legacy code) imports.put( "org.codehaus.classworlds", coreRealm ); + // plexus-utils (for DOM-type fields in maven-model) + imports.put( "org.codehaus.plexus.util.xml.Xpp3Dom", coreRealm ); + imports.put( "org.codehaus.plexus.util.xml.pull.XmlPullParser", coreRealm ); + imports.put( "org.codehaus.plexus.util.xml.pull.XmlPullParserException", coreRealm ); + imports.put( "org.codehaus.plexus.util.xml.pull.XmlSerializer", coreRealm ); + // plexus-container, plexus-component-annotations imports.put( "org.codehaus.plexus.*", coreRealm ); imports.put( "org.codehaus.plexus.component", coreRealm ); @@ -193,17 +199,10 @@ public class DefaultClassRealmManager imports.put( "org.codehaus.plexus.logging", coreRealm ); imports.put( "org.codehaus.plexus.personality", coreRealm ); - // plexus-utils (for maven-model) - imports.put( "org.codehaus.plexus.util.xml.Xpp3Dom", coreRealm ); - imports.put( "org.codehaus.plexus.util.xml.pull.XmlPullParser", coreRealm ); - imports.put( "org.codehaus.plexus.util.xml.pull.XmlPullParserException", coreRealm ); - imports.put( "org.codehaus.plexus.util.xml.pull.XmlSerializer", coreRealm ); - // javax.inject, sisu-inject (JSR-330) imports.put( "javax.inject.*", coreRealm ); imports.put( "javax.enterprise.inject.*", coreRealm ); imports.put( "org.sonatype.inject.*", coreRealm ); - imports.put( "org.slf4j.*", coreRealm ); // com.google // @@ -218,6 +217,9 @@ public class DefaultClassRealmManager // imports.put( "com.google.inject.name.*", coreRealm ); // imports.put( "com.google.inject.spi.*", coreRealm ); // imports.put( "com.google.inject.util.*", coreRealm ); + + // SLF4J + imports.put( "org.slf4j.*", coreRealm ); } /**
