You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2018/05/05 22:15:32 UTC
[GitHub] clambertus closed pull request #118: Upgrade SLF4J to 1.7.25
clambertus closed pull request #118: Upgrade SLF4J to 1.7.25
URL: https://github.com/apache/maven/pull/118
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 315b9a7386..5aa5592008 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -32,8 +32,7 @@ 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>
@@ -41,6 +40,11 @@ under the License.
<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>
@@ -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>
\ No newline at end of file
+
+</project>
diff --git a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
index 17f1f484c3..af05ba9077 100644
--- a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
@@ -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 )
{
diff --git a/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
new file mode 100644
index 0000000000..e613a470ff
--- /dev/null
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -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;
+ }
+}
diff --git a/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy b/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
deleted file mode 100644
index bba864662f..0000000000
--- a/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
+++ /dev/null
@@ -1,53 +0,0 @@
-
-/*
- * 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.
- */
-
-dir = new File( basedir, 'target/generated-sources/slf4j-simple/org/slf4j/impl' );
-
-file = new File( dir, 'StaticLoggerBinder.java' );
-content = file.text;
-
-// check if already patched
-if ( content.contains( 'MavenSimpleLoggerFactory' ) )
-{
- println ' slf4j-simple already patched';
- return;
-}
-
-
-println ' patching StaticLoggerBinder.java';
-content = content.replaceAll( 'SimpleLoggerFactory', 'MavenSimpleLoggerFactory' );
-file.write( content );
-
-
-println ' patching SimpleLogger.java';
-file = new File( dir, 'SimpleLogger.java' );
-content = file.text;
-content = content.replaceAll( 'private static final int LOG_LEVEL_', 'protected static final int LOG_LEVEL_' );
-content = content.replaceAll( 't.printStackTrace(TARGET_STREAM)', 'renderThrowable(t, TARGET_STREAM);' );
-
-index = content.indexOf( 'switch (level) {' );
-end = content.indexOf( '}', index ) + 1;
-content = content.substring( 0, index ) + 'buf.append(renderLevel(level));' + content.substring( end );
-
-content = content.substring( 0, content.lastIndexOf( '}' ) );
-content += ' protected void renderThrowable(Throwable t, PrintStream stream) {}\n';
-content += ' protected String renderLevel(int level) { return ""; }\n}\n';
-
-file.write( content );
diff --git a/pom.xml b/pom.xml
index e16d93bad5..02a773409d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services