[hadoop/f21] Build 2.4.1-1
rrati
rrati at fedoraproject.org
Tue Jul 15 14:14:11 UTC 2014
commit 456c3550f18ce3b41bc1123844f9bd29be42e3af
Author: Robert Rati <rrati at redhat.com>
Date: Tue Jul 15 10:14:23 2014 -0400
Build 2.4.1-1
.gitignore | 1 +
hadoop-build.patch | 2 +-
hadoop-fedora-integration.patch | 86 ++++++++++++++++++++------------------
hadoop-guava.patch | 4 +-
hadoop-maven.patch | 4 +-
hadoop-netty-3.6.6-Final.patch | 4 +-
hadoop-no-download-tomcat.patch | 2 +-
hadoop-tools.jar.patch | 2 +-
hadoop.spec | 60 +++++----------------------
sources | 2 +-
10 files changed, 67 insertions(+), 100 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35646fd..cafd850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/hadoop-2.0.5-b92d9bc.tar.gz
/hadoop-2.2.0-2e01e27.tar.gz
/hadoop-2.4.0-9d04888.tar.gz
+/hadoop-2.4.1-9e2ef43.tar.gz
diff --git a/hadoop-build.patch b/hadoop-build.patch
index 472e973..cde6942 100644
--- a/hadoop-build.patch
+++ b/hadoop-build.patch
@@ -1,5 +1,5 @@
diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml
-index 3482f96..cbc8d39 100644
+index bd3c555..c89a237 100644
--- a/hadoop-project-dist/pom.xml
+++ b/hadoop-project-dist/pom.xml
@@ -58,13 +58,6 @@
diff --git a/hadoop-fedora-integration.patch b/hadoop-fedora-integration.patch
index 1e7fe81..9d1a0f2 100644
--- a/hadoop-fedora-integration.patch
+++ b/hadoop-fedora-integration.patch
@@ -1,5 +1,5 @@
diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
-index 585bbb6..974213e 100644
+index c6f6c1b..7a3e0d4 100644
--- a/hadoop-client/pom.xml
+++ b/hadoop-client/pom.xml
@@ -40,12 +40,8 @@
@@ -61,7 +61,7 @@ index 585bbb6..974213e 100644
<exclusion>
<groupId>com.sun.jersey</groupId>
diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
-index f692ca3..8bb2429 100644
+index b9d6c60..9330a1a 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -53,18 +53,9 @@
@@ -137,7 +137,7 @@ index 4e4ecc4..3429931 100644
host = "localhost";
ServerSocket ss = new ServerSocket(0);
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
-index 7eae610..479fed0 100644
+index 7cf67a3..ef2733f 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -87,18 +87,25 @@
@@ -846,7 +846,7 @@ index 1c22ee6..90846d9 100644
\ No newline at end of file
+}
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
-index 0df0fe7..332af99 100644
+index e862db4..7f73534 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
@@ -32,7 +32,7 @@
@@ -1120,7 +1120,7 @@ index fe1284f..91c13a8 100644
}
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
-index 4134f82..59cb118 100644
+index d01a32f..d85405b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -34,7 +34,7 @@
@@ -1527,7 +1527,7 @@ index b0f14f4..fb81ab2 100644
public class TestJettyHelper implements MethodRule {
private boolean ssl;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
-index 3a2d8a3..02e8227 100644
+index 5ee5841..8b56730 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
@@ -85,12 +85,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -1570,7 +1570,7 @@ index 3a2d8a3..02e8227 100644
<artifactId>xmlenc</artifactId>
<scope>compile</scope>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
-index 55b8c6f..a2dc6de 100644
+index 420e5d2..c134d71 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -71,12 +71,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -1625,20 +1625,21 @@ index 55b8c6f..a2dc6de 100644
<groupId>xmlenc</groupId>
<artifactId>xmlenc</artifactId>
<scope>compile</scope>
-@@ -280,18 +265,38 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+@@ -278,20 +263,40 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ </execution>
+ </executions>
<dependencies>
- <dependency>
- <groupId>org.codehaus.mojo.jspc</groupId>
-- <artifactId>jspc-compiler-tomcat5</artifactId>
-+ <artifactId>jspc-compiler-tomcat6</artifactId>
- <version>2.0-alpha-3</version>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>org.apache.tomcat</groupId>
-+ <artifactId>*</artifactId>
-+ </exclusion>
-+ </exclusions>
-+ </dependency>
++ <dependency>
++ <groupId>org.codehaus.mojo.jspc</groupId>
++ <artifactId>jspc-compiler-tomcat6</artifactId>
++ <version>2.0-alpha-3</version>
++ <exclusions>
++ <exclusion>
++ <groupId>org.apache.tomcat</groupId>
++ <artifactId>*</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
+ <!-- mix of glassfish 2.2 jspc impl & Tomcat's servlet 3.0 api
+ note order of these
+ -->
@@ -1647,7 +1648,10 @@ index 55b8c6f..a2dc6de 100644
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>7.0.37</version>
+ </dependency>
-+ <dependency>
+ <dependency>
+- <groupId>org.codehaus.mojo.jspc</groupId>
+- <artifactId>jspc-compiler-tomcat5</artifactId>
+- <version>2.0-alpha-3</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ <version>7.0.37</version>
@@ -1703,7 +1707,7 @@ index 50b44f8..d5a91d3 100644
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
-index 2bfedb9..f23f1f1 100644
+index fc85a5e..1610c8c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -88,7 +88,7 @@
@@ -1733,7 +1737,7 @@ index 477b7f6..8a22654 100644
* Utility class to start a datanode in a secure cluster, first obtaining
* privileged resources before main startup and handing them to the datanode.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
-index a5b40a0..8a425ef 100644
+index 4232e00..3386dff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -264,7 +264,7 @@
@@ -1759,7 +1763,7 @@ index aa4ba5d..5b945ba 100644
@InterfaceAudience.Private
public class StreamFile extends DfsServlet {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
-index afae1a3..78c9122 100644
+index 50a7f21..1d96e15 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
@@ -32,7 +32,7 @@
@@ -1772,7 +1776,7 @@ index afae1a3..78c9122 100644
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
-index 855545d..2a1b808 100644
+index 6aa935c..dfc1e39 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
@@ -98,7 +98,7 @@
@@ -1782,8 +1786,8 @@ index 855545d..2a1b808 100644
-import org.mortbay.util.ajax.JSON;
+import org.eclipse.jetty.util.ajax.JSON;
+ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Charsets;
- import com.google.common.collect.Lists;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java
index 3471848..b4e0202 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java
@@ -2003,7 +2007,7 @@ index 420c428..3a3257e 100644
public class TestShuffleHandler {
static final long MiB = 1024 * 1024;
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
-index ebf5014..e2fab7e 100644
+index 8ae5809..b7da2bc 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
@@ -43,8 +43,8 @@
@@ -2037,7 +2041,7 @@ index ebf5014..e2fab7e 100644
</exclusions>
</dependency>
diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
-index c41aac5..90a741f 100644
+index 8f1d2b0..b0f511b 100644
--- a/hadoop-mapreduce-project/pom.xml
+++ b/hadoop-mapreduce-project/pom.xml
@@ -52,8 +52,8 @@
@@ -2071,7 +2075,7 @@ index c41aac5..90a741f 100644
</exclusions>
</dependency>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index 272dadc..48e17a9 100644
+index b315e2b..e282926 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -59,7 +59,7 @@
@@ -2188,7 +2192,7 @@ index 272dadc..48e17a9 100644
</dependency>
<dependency>
diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml
-index b6d5dbe..7729ec3 100644
+index 6166725..e0d3ee7 100644
--- a/hadoop-tools/hadoop-sls/pom.xml
+++ b/hadoop-tools/hadoop-sls/pom.xml
@@ -55,18 +55,12 @@
@@ -2263,7 +2267,7 @@ index 123ccea..e961e58 100644
// json request
if (target.equals("/simulateMetrics")) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
-index 9e8bf05..a5a280a 100644
+index fe2955a..0179f7b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
@@ -64,10 +64,6 @@
@@ -2278,7 +2282,7 @@ index 9e8bf05..a5a280a 100644
</dependency>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
-index 2942e71..7b9bb5d 100644
+index c639de8..37c0908 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
@@ -51,10 +51,6 @@
@@ -2293,7 +2297,7 @@ index 2942e71..7b9bb5d 100644
</dependency>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml
-index 7179262..1fffa89 100644
+index 35d1a42..48c0d50 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml
@@ -63,10 +63,6 @@
@@ -2308,7 +2312,7 @@ index 7179262..1fffa89 100644
</dependency>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
-index ac7d470..c60a9d1 100644
+index 82d66cb..cc7606f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
@@ -48,10 +48,6 @@
@@ -2358,7 +2362,7 @@ index 1efb54c..1b3463b 100644
import org.apache.commons.cli.Options;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
-index ece280f..0407643 100644
+index a19a78c..1cb621d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -51,10 +51,6 @@
@@ -2387,7 +2391,7 @@ index f8c6f55..71df06b 100644
webapp.setConf(conf);
webapp.setHttpServer(server);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
-index a933f41..c240daa 100644
+index 8a4e6f5..c785145 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
@@ -58,10 +58,6 @@
@@ -2402,7 +2406,7 @@ index a933f41..c240daa 100644
</dependency>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
-index 93495d4..d88077b 100644
+index 294f969..24d7706 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
@@ -51,10 +51,6 @@
@@ -2417,7 +2421,7 @@ index 93495d4..d88077b 100644
</dependency>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
-index 6d87785..17bce8e 100644
+index 0fbafd2..5fe4206 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -53,10 +53,6 @@
@@ -2510,7 +2514,7 @@ index 29c9253..56ca16e 100644
private HashMap<String, String> addAppContainers(Application app)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
-index 1ff750b..c628621 100644
+index 3e78e02..358a534 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
@@ -55,10 +55,6 @@
@@ -2613,7 +2617,7 @@ index da2e2b1..77cdfa9 100644
public void testNodesHelper(String path, String media) throws JSONException,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
-index 3e86381..37f376d 100644
+index 44076eb..065bf72 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
@@ -50,10 +50,6 @@
@@ -2628,7 +2632,7 @@ index 3e86381..37f376d 100644
</dependency>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
-index b7c6fd3..8e557ff 100644
+index 10f243c..af23544 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
@@ -56,10 +56,6 @@
diff --git a/hadoop-guava.patch b/hadoop-guava.patch
index d5784ca..3e39932 100644
--- a/hadoop-guava.patch
+++ b/hadoop-guava.patch
@@ -397,7 +397,7 @@ index 5f32f11..a4f293c 100644
return splits;
}
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index 272dadc..dc5ae3a 100644
+index b315e2b..9ad8bcd 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -310,7 +310,7 @@
@@ -405,7 +405,7 @@ index 272dadc..dc5ae3a 100644
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>11.0.2</version>
-+ <version>15.0</version>
++ <version>17.0</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/hadoop-maven.patch b/hadoop-maven.patch
index 076a918..0026ae3 100644
--- a/hadoop-maven.patch
+++ b/hadoop-maven.patch
@@ -1,5 +1,5 @@
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
-index 7eae610..c05a202 100644
+index 7cf67a3..c090916 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -364,16 +364,6 @@
@@ -31,7 +31,7 @@ index 7eae610..c05a202 100644
<property>
<name>listener</name>
diff --git a/pom.xml b/pom.xml
-index 9c824ff..d354566 100644
+index 13dbf49..ad84034 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,6 +387,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
diff --git a/hadoop-netty-3.6.6-Final.patch b/hadoop-netty-3.6.6-Final.patch
index 4a093b0..b5e9bfa 100644
--- a/hadoop-netty-3.6.6-Final.patch
+++ b/hadoop-netty-3.6.6-Final.patch
@@ -1,5 +1,5 @@
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
-index 2a532e4..9e0849b 100644
+index 9b267fe..0ce916d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
@@ -38,12 +38,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -17,7 +17,7 @@ index 2a532e4..9e0849b 100644
</dependencies>
</dependencyManagement>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index 272dadc..41a5a9b 100644
+index b315e2b..a9da3aa 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -462,7 +462,7 @@
diff --git a/hadoop-no-download-tomcat.patch b/hadoop-no-download-tomcat.patch
index c04a90b..6ea06d7 100644
--- a/hadoop-no-download-tomcat.patch
+++ b/hadoop-no-download-tomcat.patch
@@ -1,5 +1,5 @@
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
-index 4134f82..cdac7e6 100644
+index d01a32f..9ebc494 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -523,53 +523,6 @@
diff --git a/hadoop-tools.jar.patch b/hadoop-tools.jar.patch
index e5db1fb..b160ed7 100644
--- a/hadoop-tools.jar.patch
+++ b/hadoop-tools.jar.patch
@@ -1,5 +1,5 @@
diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
-index 1e109af..c53229a 100644
+index c3e1aa1..9042f73 100644
--- a/hadoop-common-project/hadoop-annotations/pom.xml
+++ b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -48,11 +48,8 @@
diff --git a/hadoop.spec b/hadoop.spec
index e445f29..4c61faa 100644
--- a/hadoop.spec
+++ b/hadoop.spec
@@ -7,7 +7,7 @@
%global package_libhdfs 0
%endif
-%global commit 9d04888c2ca6ffc0d11e5fd894e3fa567398214a
+%global commit 9e2ef43a240fb0f603d8c384e501daec11524510
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global hadoop_version %{version}
@@ -22,8 +22,8 @@
%bcond_with javadoc
Name: hadoop
-Version: 2.4.0
-Release: 3%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
Summary: A software platform for processing vast amounts of data
# The BSD license file is missing
# https://issues.apache.org/jira/browse/HADOOP-9849
@@ -171,11 +171,7 @@ BuildRequires: netty
%else
BuildRequires: netty3
%endif
-%if 0%{?fedora} > 20
-BuildRequires: objectweb-asm3
-%else
BuildRequires: objectweb-asm
-%endif
BuildRequires: objenesis >= 1.2-16
BuildRequires: openssl-devel
BuildRequires: paranamer
@@ -259,11 +255,7 @@ Requires: jetty8
Requires: jsr-311
Requires: mockito
Requires: nc6
-%if 0%{?fedora} > 20
-Requires: objectweb-asm3
-%else
Requires: objectweb-asm
-%endif
Requires: objenesis
Requires: paranamer
Requires: relaxngDatatype
@@ -561,8 +553,11 @@ rm -f hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-test
# Fix scope on hadoop-common:test-jar
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hadoop-common' and pom:type='test-jar']/pom:scope" test hadoop-tools/hadoop-openstack
-# Modify asm version to version 5.0.2
+%if 0%{?fedora} > 20
+# Modify asm version to version 5.0.2 and groupId to org.ow2.asm
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='asm']/pom:version" 5.0.2 hadoop-project
+%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='asm']/pom:groupId" org.ow2.asm hadoop-project
+%endif
# War files we don't want
%mvn_package :%{name}-auth-examples __noinstall
@@ -623,31 +618,6 @@ copy_dep_jars()
rm -f $2/tools-*.jar
}
-# Create a pom file for a test jar
-# $1 what the test jar is associated with
-create_test_pom()
-{
- dep=`echo $1 | sed "s/-tests//g"`
- pom="JPP.%{name}-$1.pom"
- cat > %{buildroot}%{_mavenpomdir}/$pom << EOL
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>$1</artifactId>
- <version>%{hadoop_version}</version>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>$dep</artifactId>
- <version>%{hadoop_version}</version>
- </dependency>
- </dependencies>
-</project>
-EOL
- %add_maven_depmap -f %{name}-tests $pom %{name}/$1.jar
-}
-
# Create symlinks for jars from the build
# $1 the location to create the symlink
link_hadoop_jars()
@@ -745,11 +715,8 @@ echo "export YARN_OPTS=\"\$YARN_OPTS -Djavax.xml.parsers.DocumentBuilderFactory=
# Workaround for bz1012059
install -pm 644 hadoop-project-dist/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}-%{name}-project-dist.pom
%{__ln_s} %{_jnidir}/%{name}/hadoop-common.jar %{buildroot}/%{_datadir}/%{name}/common
-#echo %{_datadir}/%{name}/common/hadoop-common.jar >> .mfiles
%{__ln_s} %{_javadir}/%{name}/hadoop-hdfs.jar %{buildroot}/%{_datadir}/%{name}/hdfs
-echo %{_datadir}/%{name}/hdfs/hadoop-hdfs.jar >> .mfiles-%{name}-hdfs
%{__ln_s} %{_javadir}/%{name}/hadoop-client.jar %{buildroot}/%{_datadir}/%{name}/client
-echo %{_datadir}/%{name}/client/hadoop-client.jar >> .mfiles-%{name}-client
# client jar depenencies
copy_dep_jars %{name}-client/target/%{name}-client-%{hadoop_version}/share/%{name}/client/lib %{buildroot}/%{_datadir}/%{name}/client/lib
@@ -909,15 +876,6 @@ sed -i "s|{|%{_var}/log/hadoop-hdfs/*.audit\n{|" %{buildroot}/%{_sysconfdir}/log
# hdfs init script
install -m 755 %{SOURCE13} %{buildroot}/%{_sbindir}
-# pom files for test jars
-for f in `ls %{buildroot}/%{_javadir}/%{name}/%{name}-*-tests.jar %{buildroot}/%{_jnidir}/%{name}-*-tests.jar | grep -v yarn-server-tests`
-do
- create_test_pom $(basename $f | sed "s/.jar//g")
-done
-
-install -m 0644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}-%{name}-yarn-server-tests-tests.pom
-%add_maven_depmap -f %{name}-tests JPP.%{name}-%{name}-yarn-server-tests-tests.pom %{name}/%{name}-yarn-server-tests-tests.jar
-
%pretrans -p <lua> hdfs
path = "%{_datadir}/%{name}/hdfs/webapps"
st = posix.stat(path)
@@ -1159,6 +1117,10 @@ fi
%attr(6050,root,yarn) %{_bindir}/container-executor
%changelog
+* Tue Jul 15 2014 Robert Rati <rrati at redhat> - 2.4.1-1
+- Update to upstream release 2.4.1
+- Fixed resolution of test jars
+
* Thu Jun 26 2014 Robert Rati <rrati at redhat> - 2.4.0-3
- Fixed FTBFS (#1106748)
- Update to build with guava 17.0
diff --git a/sources b/sources
index 0b1ccb1..a7a3c02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e06bb4592cb0da3d8b7af17c2d8537e hadoop-2.4.0-9d04888.tar.gz
+52fb8f4c28bc35067f54a4f28bb7596c hadoop-2.4.1-9e2ef43.tar.gz
More information about the scm-commits
mailing list