You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/10/01 11:14:46 UTC
[1/3] git commit: Use custom distribution name
Updated Branches:
refs/heads/slf4j-log4j2 14df6a6b5 -> 6cf485222
Use custom distribution name
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bce345ea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bce345ea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bce345ea
Branch: refs/heads/slf4j-log4j2
Commit: bce345ea4e087afd254dd47c6081646cbda3d3cd
Parents: 7c95f80
Author: Arnaud Héritier <ah...@apache.org>
Authored: Sat Jun 1 22:35:19 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Fri Jun 14 10:31:21 2013 +0200
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/bce345ea/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6b93808..6ffed22 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@ END SNIPPET: ant-bootstrap -->
<property name="distributionDirectory" value="apache-maven"/>
<property name="distributionId" value="apache-maven"/>
<property name="distributionShortName" value="Maven"/>
- <property name="distributionName" value="Apache Maven"/>
+ <property name="distributionName" value="Apache Maven (Log4J2)"/>
<property name="it.workdir.version" value="3.0.x" />
<property name="maven-compile.jvmargs" value="-Xmx512m -Xms512m"/>
<property name="maven-compile.fork" value="true"/>
[3/3] git commit: fix dependencies declaration
Posted by ol...@apache.org.
fix dependencies declaration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6cf48522
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6cf48522
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6cf48522
Branch: refs/heads/slf4j-log4j2
Commit: 6cf4852220b88a7ed499f03d69df972e172ea5ef
Parents: 14df6a6 bce345e
Author: Olivier Lamy <ol...@apache.org>
Authored: Tue Oct 1 19:14:13 2013 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Tue Oct 1 19:14:13 2013 +1000
----------------------------------------------------------------------
maven-embedder/pom.xml | 12 ++++++++++--
pom.xml | 24 ++++++++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6cf48522/maven-embedder/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6cf48522/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 6f6e8b9,a92ee16..46fa86a
--- a/pom.xml
+++ b/pom.xml
@@@ -234,13 -232,15 +234,34 @@@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
- <optional>true</optional>
+ </dependency>
+ <dependency>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-ext</artifactId>
++ <version>${slf4jVersion}</version>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.0.7</version>
+ <version>${logbackVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
++ <groupId>org.apache.logging.log4j</groupId>
++ <artifactId>log4j-slf4j-impl</artifactId>
++ <version>${log4j2Version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.logging.log4j</groupId>
++ <artifactId>log4j-core</artifactId>
++ <version>${log4j2Version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.fusesource.jansi</groupId>
++ <artifactId>jansi</artifactId>
++ <version>${jansiVersion}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<version>${slf4jVersion}</version>
[2/3] git commit: Ported equivalent changes from logback branch.
Posted by ol...@apache.org.
Ported equivalent changes from logback branch.
- Should be the same as 7f9e280522379fc0f3ac09f4d81e8188cdb54192 only with log4j2 as the backing impl
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7c95f804
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7c95f804
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7c95f804
Branch: refs/heads/slf4j-log4j2
Commit: 7c95f8045e58560c0331c1ccb946540067e895c5
Parents: 21907a7
Author: Stephen Connolly <st...@gmail.com>
Authored: Wed Dec 12 09:31:25 2012 +0000
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Fri Jun 14 10:31:21 2013 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 14 +++++++-
apache-maven/src/conf/logging/log4j2-color.xml | 36 +++++++++++++++++++++
apache-maven/src/conf/logging/log4j2.xml | 36 +++++++++++++++++++++
maven-embedder/pom.xml | 12 +++++--
pom.xml | 27 +++++++++++++++-
5 files changed, 121 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 7e3dea8..1355c88 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -85,7 +85,19 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/apache-maven/src/conf/logging/log4j2-color.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/logging/log4j2-color.xml b/apache-maven/src/conf/logging/log4j2-color.xml
new file mode 100644
index 0000000..bea1e76
--- /dev/null
+++ b/apache-maven/src/conf/logging/log4j2-color.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ 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.
+ -->
+
+
+<configuration>
+ <properties>
+ <property name="maven.logging.root.level">INFO</property>
+ </properties>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%highlight{[%p{WARN=WARNING}]} %msg%n%throwable" />
+ </Console>
+ </appenders>
+ <loggers>
+ <root level="${sys:maven.logging.root.level}">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/apache-maven/src/conf/logging/log4j2.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/logging/log4j2.xml b/apache-maven/src/conf/logging/log4j2.xml
new file mode 100644
index 0000000..6635597
--- /dev/null
+++ b/apache-maven/src/conf/logging/log4j2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ 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.
+ -->
+
+
+<configuration> <!--status="debug"-->
+ <properties>
+ <property name="maven.logging.root.level">INFO</property>
+ </properties>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="[%p{WARN=WARNING}] %msg%n%throwable"/>
+ </Console>
+ </appenders>
+ <loggers>
+ <root level="${sys:maven.logging.root.level}">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 609044c..3e842b5 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -76,14 +76,22 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
<!-- CLI -->
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d3117fc..a92ee16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,9 @@
<modelloVersion>1.7</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<aetherVersion>0.9.0.M2</aetherVersion>
- <slf4jVersion>1.7.4</slf4jVersion>
+ <slf4jVersion>1.7.5</slf4jVersion>
+ <log4j2Version>2.0-beta6</log4j2Version>
+ <jansiVersion>1.11</jansiVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
@@ -238,6 +240,29 @@
<version>1.0.7</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>${slf4jVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2Version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2Version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>${jansiVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>