From a7319744d686bfa637079508b0dd8fa7b09d89af Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Thu, 20 Oct 2016 00:24:55 -0400 Subject: [PATCH] Update to 1.6.6 * Build using Apache Accumulo 1.6.6 * Update patches and pom modification macros for 1.6.6 * Drop conditionals for EOL Fedora releases * Drop javadoc conditionals entirely * Use https for upstream URLs --- .gitignore | 1 + accumulo.spec | 64 +++++++--------------------------------------- commons-math.patch | 13 ++++++++++ jetty9.patch | 10 ++++---- native-code.patch | 6 ++--- sources | 2 +- 6 files changed, 32 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index c314bf8..87ee19c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /accumulo-1.6.1-src.tar.gz /accumulo-1.6.2-src.tar.gz /accumulo-1.6.4-src.tar.gz +/accumulo-1.6.6-src.tar.gz diff --git a/accumulo.spec b/accumulo.spec index 04a45c2..eb0f0b4 100644 --- a/accumulo.spec +++ b/accumulo.spec @@ -4,20 +4,17 @@ # TODO monitor not included until dependent javascript libs are packaged %global include_monitor 0 -# control javadocs (javadocs are optional; see FESCo #1263) -%global include_javadocs 0 - # jpackage main class %global main_class org.apache.%{name}.start.Main Name: %{proj} -Version: 1.6.4 -Release: 5%{?dist} +Version: 1.6.6 +Release: 1%{?dist} Summary: A software platform for processing vast amounts of data License: ASL 2.0 Group: Development/Libraries -URL: http://%{name}.apache.org -Source0: http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}-src.tar.gz +URL: https://%{name}.apache.org +Source0: https://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}-src.tar.gz # systemd service files Source1: %{name}-master.service @@ -71,11 +68,7 @@ BuildRequires: jetty-util BuildRequires: jline2 BuildRequires: jpackage-utils BuildRequires: libthrift-java -%if 0%{?fedora} < 21 -BuildRequires: log4j -%else BuildRequires: log4j12 -%endif BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: native-maven-plugin @@ -111,11 +104,7 @@ License: ASL 2.0 and BSD Group: Applications/System BuildArch: noarch Requires(pre): /usr/sbin/useradd -%if !%{include_javadocs} -%if 0%{?fedora} > 20 Obsoletes: %{name}-javadoc < 1.6.0-5%{?dist} -%endif -%endif %description core %{longproj} is a sorted, distributed key/value store based on Google's @@ -276,23 +265,6 @@ modify key/value pairs at various points in the data management process. This package provides native code for %{longproj}'s TServer. -%if %{include_javadocs} -%package javadoc -Summary: Javadoc for %{longproj} -License: ASL 2.0 -Group: Documentation -BuildArch: noarch - -%description javadoc - %{longproj} is a sorted, distributed key/value store based on Google's -BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It -features a few novel improvements on the BigTable design in the form of -cell-level access labels and a server-side programming mechanism that can -modify key/value pairs at various points in the data management process. - -This package contains the API documentation for %{longproj}. -%endif - %prep %autosetup -p1 @@ -306,14 +278,6 @@ This package contains the API documentation for %{longproj}. %pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='commons-math']/pom:artifactId" "commons-math3" core %pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='bcprov-jdk15on']/pom:artifactId" "bcprov-jdk16" -%if %{include_javadocs} -# Remove custom javadoc directory so xmvn javadoc magic works -%pom_xpath_remove "pom:project/pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:reportOutputDirectory" -%endif - -# Remove unused extension; no need to deploy site with ssh -%pom_xpath_remove "pom:project/pom:build/pom:extensions/pom:extension[pom:artifactId='wagon-ssh']" - # Disable unneeded/unused modules %pom_disable_module test %pom_disable_module proxy @@ -331,11 +295,10 @@ This package contains the API documentation for %{longproj}. %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-failsafe-plugin %pom_remove_plugin :apache-rat-plugin -%pom_remove_plugin :maven-sortpom-plugin +%pom_remove_plugin :sortpom-maven-plugin %pom_remove_plugin :mavanagaiata -%pom_remove_plugin :maven-scm-publish-plugin %pom_remove_plugin :findbugs-maven-plugin -%pom_remove_plugin :maven-project-info-reports-plugin +%pom_remove_plugin :maven-java-formatter-plugin %if %{include_monitor} %mvn_package ":%{name}-minicluster" __noinstall @@ -361,11 +324,7 @@ This package contains the API documentation for %{longproj}. # especially in the start jar. These should be enabled when possible. # ITs are skipped, because they time out frequently and take too many resources # to run reliably. Failures do not reliably indicate meaningful issues. -%if %{include_javadocs} -%mvn_build -- -DforkCount=1C -DskipTests -DskipITs -%else %mvn_build -j -- -DforkCount=1C -DskipTests -DskipITs -%endif %install %mvn_install @@ -444,9 +403,7 @@ install -p -m 755 %{SOURCE6} %{buildroot}%{_javaconfdir}/%{name}.conf %doc README %doc NOTICE %dir %{_javadir}/%{name} -%if 0%{?fedora} > 20 %dir %{_mavenpomdir}/%{name} -%endif %{_bindir}/%{name} %{_bindir}/%{name}-shell %{_bindir}/%{name}-classpath @@ -481,9 +438,7 @@ install -p -m 755 %{SOURCE6} %{buildroot}%{_javaconfdir}/%{name}.conf %{_unitdir}/%{name}-master.service %files tserver -f .mfiles-tserver -%if 0%{?fedora} > 20 %dir %{_jnidir}/%{name} -%endif %{_bindir}/%{name}-tserver %{_unitdir}/%{name}-tserver.service @@ -503,10 +458,6 @@ install -p -m 755 %{SOURCE6} %{buildroot}%{_javaconfdir}/%{name}.conf %files examples -f .mfiles-examples -%if %{include_javadocs} -%files javadoc -f .mfiles-javadoc -%endif - %files native %dir %{_libdir}/%{name} %{_libdir}/%{name}/lib%{name}.so @@ -567,6 +518,9 @@ getent passwd %{name} >/dev/null || /usr/sbin/useradd --comment "%{longproj}" -- %endif %changelog +* Wed Oct 19 2016 Christopher Tubbs - 1.6.6-1 +- Update to 1.6.6 + * Wed Feb 03 2016 Fedora Release Engineering - 1.6.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/commons-math.patch b/commons-math.patch index 59baacd..a743931 100644 --- a/commons-math.patch +++ b/commons-math.patch @@ -21,3 +21,16 @@ index d2d560e..2fdfd62 100644 public class Stat { Min min; +diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java +index d2d560e..2fdfd62 100644 +--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java ++++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java +@@ -64,7 +64,7 @@ + import org.apache.accumulo.core.iterators.system.LocalityGroupIterator.LocalityGroup; + import org.apache.accumulo.core.util.MutableByteSequence; + import org.apache.commons.lang.mutable.MutableLong; +-import org.apache.commons.math.stat.descriptive.SummaryStatistics; ++import org.apache.commons.math3.stat.descriptive.SummaryStatistics; + import org.apache.hadoop.io.Writable; + import org.apache.log4j.Logger; + diff --git a/jetty9.patch b/jetty9.patch index e053a73..1ecb1c7 100644 --- a/jetty9.patch +++ b/jetty9.patch @@ -29,15 +29,15 @@ diff --git a/pom.xml b/pom.xml index bd206e3..3d0d903 100644 --- a/pom.xml +++ b/pom.xml -@@ -128,7 +128,7 @@ +@@ -131,7 +131,7 @@ 2.2.0 3.1 - 1.6 + false - 8.1.15.v20140411 + 9.1.5.v20140505 - - 3.0.4 - + 1.6 + 1.6 + 3.0.5 @@ -204,7 +204,7 @@ javax.servlet diff --git a/native-code.patch b/native-code.patch index 40cdb58..607487e 100644 --- a/native-code.patch +++ b/native-code.patch @@ -3,11 +3,11 @@ index 9ffeefe..102c253 100644 --- a/server/native/src/main/resources/Makefile +++ b/server/native/src/main/resources/Makefile @@ -26,7 +26,7 @@ ifeq ($(shell uname),Linux) - JAVA_HOME=$(shell dirname $$(dirname $$(readlink -ef $$(which javah)))) + JAVA_HOME=$(shell dirname "$$(dirname "$$(readlink -ef "$$(which javah)")")") endif NATIVE_LIB := libaccumulo.so -- CXXFLAGS=-g -fPIC -shared -O3 -Wall -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Ijavah $(USERFLAGS) -+ CXXFLAGS=$(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -fPIC -shared -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Ijavah $(USERFLAGS) +- CXXFLAGS=-g -fPIC -shared -O3 -Wall -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS) ++ CXXFLAGS=$(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -fPIC -shared -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS) endif ifeq ($(shell uname),Darwin) diff --git a/sources b/sources index a31ed49..3f8d6f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d83f76ce5a61fa7844e0d1df200628df accumulo-1.6.4-src.tar.gz +657005739bdcc4bed717fd4398e9f5df accumulo-1.6.6-src.tar.gz