You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/10/15 08:17:24 UTC
[1/3] maven git commit: [MNG-6196] removed remaining Monkey patching,
not really necessary
Repository: maven
Updated Branches:
refs/heads/master 542a7a891 -> c19e9dcac
[MNG-6196] removed remaining Monkey patching, not really necessary
done after Emmanuel Bourg #118 PR idea
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4f530c4f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4f530c4f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4f530c4f
Branch: refs/heads/master
Commit: 4f530c4f006b8d22da90d968a1d32797280804b9
Parents: eb2db7b
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun May 21 19:02:46 2017 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Tue Sep 26 00:19:57 2017 +0200
----------------------------------------------------------------------
maven-slf4j-provider/pom.xml | 20 +----
.../java/org/slf4j/impl/StaticLoggerBinder.java | 89 ++++++++++++++++++++
.../src/main/script/patch-slf4j-simple.groovy | 36 --------
3 files changed, 91 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4f530c4f/maven-slf4j-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 68912f5..4bb0b2a 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -32,7 +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
+ Maven SLF4J provider based on SLF4J's simple provider, extended to support Maven styled colors
for levels and stacktraces rendering.
</description>
@@ -63,6 +63,7 @@ under the License.
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/generated-sources/slf4j-simple</outputDirectory>
<includes>org/slf4j/impl/*.java</includes>
+ <excludes>org/slf4j/impl/StaticLoggerBinder*</excludes>
</artifactItem>
</artifactItems>
</configuration>
@@ -94,23 +95,6 @@ under the License.
</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>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/4f530c4f/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
----------------------------------------------------------------------
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 0000000..ba01d83
--- /dev/null
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -0,0 +1,89 @@
+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.1
+ */
+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
+ @SuppressWarnings( { "checkstyle:staticvariablename", "checkstyle:visibilitymodifier" } )
+ 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;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/4f530c4f/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
----------------------------------------------------------------------
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 9865625..0000000
--- a/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
+++ /dev/null
@@ -1,36 +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 );
[2/3] maven git commit: [MNG-6196] updated slf4j to 1.7.25
Posted by hb...@apache.org.
[MNG-6196] updated slf4j to 1.7.25
[SLF4J-394] use new slf4j methods done for us
[SLF4J-395] use slf4j-simple System.out cache
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/eb2db7b2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/eb2db7b2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/eb2db7b2
Branch: refs/heads/master
Commit: eb2db7b28664dbaac6a59a2189c70d92e455dcea
Parents: 542a7a8
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat Mar 4 02:59:42 2017 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Tue Sep 26 00:19:57 2017 +0200
----------------------------------------------------------------------
.../src/conf/logging/simplelogger.properties | 1 +
.../java/org/slf4j/impl/MavenSimpleLogger.java | 6 +++++-
.../src/main/script/patch-slf4j-simple.groovy | 17 -----------------
pom.xml | 2 +-
4 files changed, 7 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/eb2db7b2/apache-maven/src/conf/logging/simplelogger.properties
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/logging/simplelogger.properties b/apache-maven/src/conf/logging/simplelogger.properties
index 8dea717..64b331b 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/conf/logging/simplelogger.properties
@@ -20,6 +20,7 @@ org.slf4j.simpleLogger.showDateTime=false
org.slf4j.simpleLogger.showThreadName=false
org.slf4j.simpleLogger.showLogName=false
org.slf4j.simpleLogger.logFile=System.out
+org.slf4j.simpleLogger.cacheOutputStream=true
org.slf4j.simpleLogger.levelInBrackets=true
org.slf4j.simpleLogger.log.Sisu=info
org.slf4j.simpleLogger.warnLevelString=WARNING
http://git-wip-us.apache.org/repos/asf/maven/blob/eb2db7b2/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
----------------------------------------------------------------------
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 17f1f48..3c1ca4f 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,12 @@ public class MavenSimpleLogger
}
@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 )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/eb2db7b2/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy b/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
index bba8646..9865625 100644
--- a/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
+++ b/maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy
@@ -34,20 +34,3 @@ if ( content.contains( 'MavenSimpleLoggerFactory' ) )
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 );
http://git-wip-us.apache.org/repos/asf/maven/blob/eb2db7b2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a79956..ea119e1 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.1.0</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>
[3/3] maven git commit: [MNG-6242] detect Cygwin/Mingw pseudo
terminal for Jansi
Posted by hb...@apache.org.
[MNG-6242] detect Cygwin/Mingw pseudo terminal for Jansi
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c19e9dca
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c19e9dca
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c19e9dca
Branch: refs/heads/master
Commit: c19e9dcac3d200094c770521b9b1b10df76f26c4
Parents: 4f530c4
Author: Hervé Boutemy <hb...@apache.org>
Authored: Mon Sep 25 22:52:48 2017 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Oct 15 10:16:00 2017 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c19e9dca/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index fa6164b..e3a5848 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -188,6 +188,14 @@ export MAVEN_PROJECTBASEDIR
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
export MAVEN_CMD_LINE_ARGS
+# detect cygwin or mingw pseudo-terminal for Jansi
+# workaround for https://github.com/fusesource/jansi-native/issues/11
+if $cygwin || $mingw; then
+ if [ -t 1 ]; then
+ MAVEN_OPTS="-Djansi.passthrough=true $MAVEN_OPTS"
+ fi
+fi
+
exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \