Build 2.2.0-5
This commit is contained in:
Robert Rati
parent
c77eaffc72
commit
2a117888dc
|
|
@ -1840,6 +1840,24 @@ index f8f2918..b62015e 100644
|
|||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
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 2bcb5a0..1aacc20 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">
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
- <!-- This is a really old version of netty, that gets privatized
|
||||
- via shading and hence it is not managed via a parent pom -->
|
||||
<dependency>
|
||||
<groupId>org.jboss.netty</groupId>
|
||||
<artifactId>netty</artifactId>
|
||||
- <version>3.2.4.Final</version>
|
||||
+ <version>3.6.6.Final</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/BKJMUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/BKJMUtil.java
|
||||
index 32b0583..4930816 100644
|
||||
--- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/BKJMUtil.java
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
contributor license agreements. See the NOTICE file distributed with
|
||||
this work for additional information regarding copyright ownership.
|
||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
(the "License"); you may not use this file except in compliance with
|
||||
the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<tomcat-users>
|
||||
<!--
|
||||
NOTE: By default, no user is included in the "manager-gui" role required
|
||||
to operate the "/manager/html" web application. If you wish to use this app,
|
||||
you must define such a user - the username and password are arbitrary.
|
||||
-->
|
||||
<!--
|
||||
NOTE: The sample user and role entries below are wrapped in a comment
|
||||
and thus are ignored when reading this file. Do not forget to remove
|
||||
<!.. ..> that surrounds them.
|
||||
-->
|
||||
<!--
|
||||
<role rolename="tomcat"/>
|
||||
<role rolename="role1"/>
|
||||
<user username="tomcat" password="tomcat" roles="tomcat"/>
|
||||
<user username="both" password="tomcat" roles="tomcat,role1"/>
|
||||
<user username="role1" password="tomcat" roles="role1"/>
|
||||
-->
|
||||
|
||||
<!-- <role rolename="admin"/> -->
|
||||
<!-- <role rolename="admin-gui"/> -->
|
||||
<!-- <role rolename="admin-script"/> -->
|
||||
<!-- <role rolename="manager"/> -->
|
||||
<!-- <role rolename="manager-gui"/> -->
|
||||
<!-- <role rolename="manager-script"/> -->
|
||||
<!-- <role rolename="manager-jmx"/> -->
|
||||
<!-- <role rolename="manager-status"/> -->
|
||||
<!-- <user name="admin" password="adminadmin" roles="admin,manager,admin-gui,admin-script,manager-gui,manager-script,manager-jmx,manager-status" /> -->
|
||||
</tomcat-users>
|
||||
30
hadoop.spec
30
hadoop.spec
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
Name: hadoop
|
||||
Version: 2.2.0
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?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
|
||||
|
|
@ -40,6 +40,7 @@ Source10: hadoop-mapred-site.xml
|
|||
Source11: hadoop-yarn-site.xml
|
||||
Source12: hadoop-httpfs.sysconfig
|
||||
Source13: hdfs-create-dirs
|
||||
Source14: hadoop-tomcat-users.xml
|
||||
# This patch includes the following upstream tickets:
|
||||
# https://issues.apache.org/jira/browse/HADOOP-9594
|
||||
# https://issues.apache.org/jira/browse/MAPREDUCE-5431
|
||||
|
|
@ -161,7 +162,7 @@ BuildRequires: maven-surefire-plugin
|
|||
BuildRequires: maven-war-plugin
|
||||
BuildRequires: mockito
|
||||
BuildRequires: native-maven-plugin
|
||||
%if %{fedora} < 21
|
||||
%if 0%{fedora} < 21
|
||||
BuildRequires: netty
|
||||
%else
|
||||
BuildRequires: netty3
|
||||
|
|
@ -185,7 +186,11 @@ BuildRequires: txw2
|
|||
BuildRequires: which
|
||||
BuildRequires: xmlenc
|
||||
BuildRequires: znerd-oss-parent
|
||||
%if 0%{fedora} < 21
|
||||
BuildRequires: zookeeper-java
|
||||
%else
|
||||
BuildRequires: zookeeper-java > 3.4.5-15
|
||||
%endif
|
||||
|
||||
# For tests
|
||||
BuildRequires: jersey-test-framework
|
||||
|
|
@ -333,6 +338,7 @@ Group: Applications/System
|
|||
BuildArch: noarch
|
||||
Requires: apache-commons-dbcp
|
||||
Requires: ecj >= 1:4.2.1-6
|
||||
Requires: json_simple
|
||||
Requires: tomcat
|
||||
Requires: tomcat-lib
|
||||
Requires: tomcat-native
|
||||
|
|
@ -471,11 +477,12 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
|
|||
%if %{package_libhdfs}
|
||||
%patch5 -p1
|
||||
%endif
|
||||
%if %{fedora} >= 21
|
||||
%if 0%{fedora} >= 21
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%endif
|
||||
|
||||
%if 0%{fedora} < 21
|
||||
# The hadoop test suite needs classes from the zookeeper test suite.
|
||||
# We need to modify the deps to use the pom for the zookeeper-test jar
|
||||
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='zookeeper' and pom:scope='test']/pom:artifactId" zookeeper-test hadoop-common-project/hadoop-common
|
||||
|
|
@ -510,6 +517,7 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
|
|||
</exclusion>
|
||||
</exclusions>
|
||||
" hadoop-hdfs-project/hadoop-hdfs-nfs
|
||||
%endif
|
||||
|
||||
# Remove the maven-site-plugin. It's not needed
|
||||
%pom_remove_plugin :maven-site-plugin
|
||||
|
|
@ -570,7 +578,7 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
|
|||
%mvn_package :%{name}-yarn*::{}: %{name}-yarn
|
||||
|
||||
# Jar files that need to be overridden due to installation location
|
||||
%if %{fedora} < 21
|
||||
%if 0%{fedora} < 21
|
||||
# Workaround for bz1023116
|
||||
#%%mvn_file :%{name}-common::{}: %{_jnidir}/%{name}-common %{_datadir}/%{name}/common/%{name}-common
|
||||
%mvn_file :%{name}-common::{}: %{_jnidir}/%{name}/%{name}-common
|
||||
|
|
@ -749,10 +757,11 @@ popd
|
|||
for f in catalina.policy catalina.properties context.xml log4j.properties \
|
||||
tomcat.conf web.xml;
|
||||
do
|
||||
cp %{_sysconfdir}/tomcat/$f %{buildroot}/%{_sysconfdir}/%{name}/tomcat
|
||||
cp -a %{_sysconfdir}/tomcat/$f %{buildroot}/%{_sysconfdir}/%{name}/tomcat
|
||||
done
|
||||
|
||||
install -m 644 %{name}-hdfs-project/%{name}-hdfs-httpfs/src/main/tomcat/*.* %{buildroot}/%{_sysconfdir}/%{name}/tomcat
|
||||
install -m 660 %{SOURCE14} %{buildroot}/%{_sysconfdir}/%{name}/tomcat/tomcat-users.xml
|
||||
install -m 664 %{name}-hdfs-project/%{name}-hdfs-httpfs/src/main/tomcat/*.* %{buildroot}/%{_sysconfdir}/%{name}/tomcat
|
||||
|
||||
# Copy the httpfs webapp
|
||||
cp -arf %{name}-hdfs-project/%{name}-hdfs-httpfs/target/webhdfs %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps
|
||||
|
|
@ -1007,7 +1016,7 @@ getent passwd yarn >/dev/null || /usr/sbin/useradd --comment "Apache Hadoop Yarn
|
|||
%config(noreplace) %{_sysconfdir}/%{name}/httpfs-log4j.properties
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/httpfs-signature.secret
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/httpfs-site.xml
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/tomcat/*.*
|
||||
%attr(-,tomcat,tomcat) %config(noreplace) %{_sysconfdir}/%{name}/tomcat/*.*
|
||||
%attr(0775,root,tomcat) %dir %{_sysconfdir}/%{name}/tomcat
|
||||
%attr(0775,root,tomcat) %dir %{_sysconfdir}/%{name}/tomcat/Catalina
|
||||
%attr(0775,root,tomcat) %dir %{_sysconfdir}/%{name}/tomcat/Catalina/localhost
|
||||
|
|
@ -1081,6 +1090,13 @@ getent passwd yarn >/dev/null || /usr/sbin/useradd --comment "Apache Hadoop Yarn
|
|||
%attr(6050,root,yarn) %{_bindir}/container-executor
|
||||
|
||||
%changelog
|
||||
* Mon Feb 3 2014 Robert Rati <rrati@redhat> - 2.2.0-5
|
||||
- Added json_simple dependency to httpfs package
|
||||
- Added default tomcat-users file
|
||||
- Fixed up file permissions and ownership for tomcat configuration
|
||||
- Conditionalize the zookeeper-test modes to < F21
|
||||
- Additional fix for netty3 compat package for >F20
|
||||
|
||||
* Fri Jan 24 2014 Robert Rati <rrati@redhat> - 2.2.0-4
|
||||
- Fixed 2 packages providing hadoop-yarn-server-tests (BZ1056521)
|
||||
- Package httpfs bits using tomcat@ service
|
||||
|
|
|
|||
Loading…
Reference in New Issue