You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2013/08/08 23:32:01 UTC
svn commit: r1512048 -
/hadoop/common/branches/branch-2/hadoop-project/pom.xml
Author: stevel
Date: Thu Aug 8 21:32:01 2013
New Revision: 1512048
URL: http://svn.apache.org/r1512048
Log:
merge r1512026: HADOOP-9833 move slf4j to version 1.7.5
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml (contents, props changed)
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1512048&r1=1512047&r2=1512048&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Thu Aug 8 21:32:01 2013
@@ -547,12 +547,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
Propchange: hadoop/common/branches/branch-2/hadoop-project/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 8 21:32:01 2013
@@ -0,0 +1,2 @@
+/hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml:1227776-1294021
+/hadoop/common/trunk/hadoop-project/pom.xml:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239386,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1
301308,1301312,1301820,1301871,1302624,1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1333557,1334216,1342112,1348207,1349616,1351445,1351818,1361813,1373683,1374696,1375829,1430682,1430688,1440245,1476395,1477849,1480838,1480840,1487093,1512026