maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject [7/7] git commit: o Merge branch 'master' into eclipse-aether
Date Mon, 18 Mar 2013 20:27:51 GMT
Updated Branches:
  refs/heads/eclipse-aether 33abdd2cc -> f50ae7b05


o Merge branch 'master' into eclipse-aether

Conflicts:
	maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f50ae7b0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f50ae7b0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f50ae7b0

Branch: refs/heads/eclipse-aether
Commit: f50ae7b059fd52f1f5a79a79d9eb9ea803918638
Parents: 33abdd2 8b97b0a
Author: Jason van Zyl <jason@tesla.io>
Authored: Mon Mar 18 13:27:43 2013 -0700
Committer: Jason van Zyl <jason@tesla.io>
Committed: Mon Mar 18 13:27:43 2013 -0700

----------------------------------------------------------------------
 .../org/slf4j/impl/MavenSlf4jSimpleFriend.java     |    9 ++++++++-
 pom.xml                                            |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/f50ae7b0/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index e558d2a,f61bfcb..b0ca441
--- a/pom.xml
+++ b/pom.xml
@@@ -58,8 -58,8 +58,8 @@@
      <cipherVersion>1.7</cipherVersion>
      <modelloVersion>1.7</modelloVersion>
      <jxpathVersion>1.3</jxpathVersion>
-     <slf4jVersion>1.7.3</slf4jVersion>
 -    <aetherVersion>1.13.1</aetherVersion>
 +    <aetherVersion>0.9.0.M2</aetherVersion>
+     <slf4jVersion>1.7.4</slf4jVersion>
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
      <!-- Control the name of the distribution and information output by mvn -->
      <distributionId>apache-maven</distributionId>


Mime
View raw message