Author: mattf
Date: Mon Nov 19 07:30:03 2012
New Revision: 1411089
URL: http://svn.apache.org/viewvc?rev=1411089&view=rev
Log:
merged r1382134 from branch-1: HADOOP-8745. Incorrect version numbers in
hadoop-core POM. Contributed by Matthias Friedrich.
Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml
Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411089&r1=1411088&r2=1411089&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 07:30:03 2012
@@ -63,6 +63,9 @@ Release 1.1.1 - 2012.11.18
HDFS-3846. Namenode deadlock in branch-1. (Brandon Li via jitendra)
+ HADOOP-8745. Incorrect version numbers in hadoop-core POM.
+ (Matthias Friedrich via eli)
+
Release 1.1.0 - 2012.09.28
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml?rev=1411089&r1=1411088&r2=1411089&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml
(original)
+++ hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml Mon Nov
19 07:30:03 2012
@@ -101,17 +101,7 @@
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
- <version>0.7.1</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>net.sf.kosmosfs</groupId>
- <artifactId>kfs</artifactId>
- <version>0.3</version>
+ <version>0.6.1</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -131,7 +121,7 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.0.1</version>
+ <version>1.8.8</version>
</dependency>
</dependencies>
</project>
