Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Merge branch 'master' into eclipse-aether 

Conflicts:
	maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java
	pom.xml
This commit is contained in:
Jason van Zyl 2013-03-18 13:27:43 -07:00
parent 33abdd2ccf 8b97b0a2da
commit f50ae7b059
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java
View File

@ -19,6 +19,9 @@ package org.slf4j.impl;
* under the License. * under the License.
*/ */
import org.slf4j.ILoggerFactory;
import org.slf4j.LoggerFactory;
/** /**
* Utility for Maven to access Slf4j-Simple internals through package access. * Utility for Maven to access Slf4j-Simple internals through package access.
* Use with precaution, since this is not normally intended for production use. * Use with precaution, since this is not normally intended for production use.
@ -28,6 +31,10 @@ public class MavenSlf4jSimpleFriend
public static void init() public static void init()
{ {
SimpleLogger.init(); SimpleLogger.init();
SimpleLoggerFactory.INSTANCE.reset(); ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
if ( loggerFactory instanceof SimpleLoggerFactory )
{
( (SimpleLoggerFactory) loggerFactory ).reset();
}
} }
} }

2
pom.xml
View File

@ -58,8 +58,8 @@
<cipherVersion>1.7</cipherVersion> <cipherVersion>1.7</cipherVersion>
<modelloVersion>1.7</modelloVersion> <modelloVersion>1.7</modelloVersion>
<jxpathVersion>1.3</jxpathVersion> <jxpathVersion>1.3</jxpathVersion>
<slf4jVersion>1.7.3</slf4jVersion>
<aetherVersion>0.9.0.M2</aetherVersion> <aetherVersion>0.9.0.M2</aetherVersion>
<slf4jVersion>1.7.4</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn --> <!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId> <distributionId>apache-maven</distributionId>