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/04/25 16:15:04 UTC
[1/2] git commit: log4j2 beta5 and slf4j 1.7.5
Updated Branches:
refs/heads/slf4j-log4j2 9350d1a6d -> 9ddcb08a7
log4j2 beta5 and slf4j 1.7.5
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/375dbd36
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/375dbd36
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/375dbd36
Branch: refs/heads/slf4j-log4j2
Commit: 375dbd36881fbcf71cf0a3e66701078a63d00160
Parents: 9350d1a
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Apr 26 00:14:27 2013 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Apr 26 00:14:27 2013 +1000
----------------------------------------------------------------------
apache-maven/pom.xml | 9 +++++++--
maven-embedder/pom.xml | 2 +-
pom.xml | 6 +++---
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/375dbd36/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 8c3b9ac..cd34972 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -89,9 +89,14 @@
<version>1.7.2</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.0-beta3</version>
+ <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>
http://git-wip-us.apache.org/repos/asf/maven/blob/375dbd36/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 2aa799b..7af6d22 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -80,7 +80,7 @@
<artifactId>slf4j-ext</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<!-- CLI -->
http://git-wip-us.apache.org/repos/asf/maven/blob/375dbd36/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 69e1707..48f59b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,8 @@
<modelloVersion>1.6</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<aetherVersion>1.13.1</aetherVersion>
- <slf4jVersion>1.7.2</slf4jVersion>
- <log4j2Version>2.0-beta3</log4j2Version>
+ <slf4jVersion>1.7.5</slf4jVersion>
+ <log4j2Version>2.0-beta5</log4j2Version>
<jansiVersion>1.8</jansiVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
@@ -219,7 +219,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2Version}</version>
<scope>compile</scope>
[2/2] git commit: ignore out directory
Posted by ol...@apache.org.
ignore out directory
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9ddcb08a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9ddcb08a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9ddcb08a
Branch: refs/heads/slf4j-log4j2
Commit: 9ddcb08a79315beba15b88a1496396d181ebaefa
Parents: 375dbd3
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Apr 26 00:14:50 2013 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Apr 26 00:14:50 2013 +1000
----------------------------------------------------------------------
.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9ddcb08a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index adc6c00..4b53e92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@ bin/
*.ipr
*.iml
.idea
+out/
.DS_Store