Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade SLF4J to 1.7.25 #118

Closed
wants to merge 3 commits into from
Closed

Upgrade SLF4J to 1.7.25 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0de5b5
Upgraded SLF4J to 1.7.25 and expelled the groovy monkey
ebourg May 16, 2017
c1f21b7
Added the required custom StaticLoggerBinder implementation
ebourg May 17, 2017
420e546
Fixed the NPE in MavenSimpleLogger.writeThrowable() caused by a null …
ebourg May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 26 additions & 54 deletions maven-slf4j-provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,19 @@ under the License.

<name>Maven SLF4J Simple Provider</name>
<description>
Maven SLF4J provider based on SLF4J's simple provider, monkey-patched to support Maven styled colors
for levels and stacktraces rendering.
Maven SLF4J provider based on SLF4J's simple provider.
</description>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
Expand All @@ -49,68 +53,36 @@ under the License.

<build>
<plugins>
<!-- Shade slf4j-simple without StaticLoggerBinder to ensure SLF4J picks our implementation -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
<type>jar</type>
<classifier>sources</classifier>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/generated-sources/slf4j-simple</outputDirectory>
<includes>org/slf4j/impl/*.java</includes>
</artifactItem>
</artifactItems>
</configuration>
<executions>
<execution>
<id>unzip-slf4j-simple</id>
<goals>
<goal>unpack</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.12</version>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-slf4j-simple</id>
<phase>generate-sources</phase>
<phase>package</phase>
<goals>
<goal>add-source</goal>
<goal>shade</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/slf4j-simple</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>patch-slf4j-simple</id>
<phase>process-sources</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<source>${project.basedir}/src/main/script/patch-slf4j-simple.groovy</source>
<artifactSet>
<includes>
<include>org.slf4j:slf4j-simple</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>org.slf4j:slf4j-simple</artifact>
<excludes>
<exclude>org/slf4j/impl/StaticLoggerBinder*</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

</project>
7 changes: 6 additions & 1 deletion maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,13 @@ protected String renderLevel( int level )
}

@Override
protected void renderThrowable( Throwable t, PrintStream stream )
protected void writeThrowable( Throwable t, PrintStream stream )
{
if ( t == null )
{
return;
}

stream.print( buffer().failure( t.getClass().getName() ) );
if ( t.getMessage() != null )
{
Expand Down
87 changes: 87 additions & 0 deletions maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
package org.slf4j.impl;

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import org.slf4j.ILoggerFactory;
import org.slf4j.spi.LoggerFactoryBinder;

/**
* SLF4J LoggerFactoryBinder implementation using MavenSimpleLogger.
* This class is part of the required classes used to specify an
* SLF4J logger provider implementation.
*
* @since 3.5.0
*/
public final class StaticLoggerBinder implements LoggerFactoryBinder
{
/**
* Declare the version of the SLF4J API this implementation is compiled
* against. The value of this field is usually modified with each release.
*/
// to avoid constant folding by the compiler, this field must *not* be final
public static String REQUESTED_API_VERSION = "1.7.25"; // !final

private static final String LOGGER_FACTORY_CLASS_STR = MavenSimpleLoggerFactory.class.getName();

/**
* The unique instance of this class.
*/
private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();

/**
* The ILoggerFactory instance returned by the {@link #getLoggerFactory}
* method should always be the same object
*/
private final ILoggerFactory loggerFactory;

/**
* Private constructor to prevent instantiation
*/
private StaticLoggerBinder()
{
loggerFactory = new MavenSimpleLoggerFactory();
}

/**
* Returns the singleton of this class.
*/
public static StaticLoggerBinder getSingleton()
{
return SINGLETON;
}

/**
* Returns the factory.
*/
@Override
public ILoggerFactory getLoggerFactory()
{
return loggerFactory;
}

/**
* Returns the class name.
*/
@Override
public String getLoggerFactoryClassStr()
{
return LOGGER_FACTORY_CLASS_STR;
}
}
53 changes: 0 additions & 53 deletions maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ under the License.
<modelloVersion>1.9.1</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.0.3</resolverVersion>
<slf4jVersion>1.7.22</slf4jVersion>
<slf4jVersion>1.7.25</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
Expand Down Expand Up @@ -590,6 +590,7 @@ under the License.
<exclude>.maven/spy.log</exclude> <!-- hudson maven3 integration log -->
<exclude>.java-version</exclude>
<exclude>README.md</exclude>
<exclude>dependency-reduced-pom.xml</exclude>
</excludes>
</configuration>
</plugin>
Expand Down