[accumulo] Update to 1.6.1
Christopher Tubbs
ctubbsii at fedoraproject.org
Tue Dec 16 22:10:59 UTC 2014
commit e4de6e9809d9704900f678d20c351ed7b325d006
Author: Christopher Tubbs <ctubbsii at apache.org>
Date: Tue Dec 16 17:10:08 2014 -0500
Update to 1.6.1
.gitignore | 1 +
ACCUMULO-1691.patch | 445 -
ACCUMULO-2762.patch | 25 -
ACCUMULO-2773.patch |42423 ---------------------------------------------------
ACCUMULO-2808.patch | 406 -
ACCUMULO-2812.patch | 60 -
ACCUMULO-2950.patch | 456 -
accumulo.spec | 41 +-
default-conf.patch | 12 +-
jetty9.patch | 139 +
sources | 2 +-
11 files changed, 164 insertions(+), 43846 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db1097f..a20d9a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/accumulo-1.6.0-0616258.tar.gz
+/accumulo-1.6.1-src.tar.gz
diff --git a/accumulo.spec b/accumulo.spec
index 8da0904..9f5b41d 100644
--- a/accumulo.spec
+++ b/accumulo.spec
@@ -10,17 +10,14 @@
# jpackage main class
%global main_class org.apache.%{name}.start.Main
-%global commit 06162580e885f11863d1a6d22f952bce35b78b68
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
Name: %{proj}
-Version: 1.6.0
-Release: 7%{?dist}
+Version: 1.6.1
+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: https://github.com/apache/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0: http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}-src.tar.gz
# systemd service files
Source1: %{name}-master.service
@@ -35,24 +32,20 @@ Source5: %{name}-monitor.service
Source6: %{name}.conf
# Upstream patches needed for Fedora
-Patch0: ACCUMULO-1691.patch
-Patch1: ACCUMULO-2950.patch
-Patch2: ACCUMULO-2773.patch
-Patch3: ACCUMULO-2762.patch
-Patch4: ACCUMULO-2812.patch
-Patch5: ACCUMULO-2808.patch
# Should be applied after upstream patches
+# Use Jetty version 9 instead of 8
+Patch0: jetty9.patch
# Use current version of commons-configuration
-Patch6: commons-configuration.patch
+Patch1: commons-configuration.patch
# Use current version of commons-math
-Patch7: commons-math.patch
+Patch2: commons-math.patch
# Apply Fedora JNI conventions
-Patch8: native-code.patch
+Patch3: native-code.patch
# Disable broken tests
-Patch9: disabled-tests.patch
+Patch4: disabled-tests.patch
# Patch upstream-provided example configuration for Fedora
-Patch10: default-conf.patch
+Patch5: default-conf.patch
# This depends on Hadoop, and Hadoop is not built for ARM
ExcludeArch: %{arm}
@@ -304,18 +297,13 @@ This package contains the API documentation for %{longproj}.
%endif
%prep
-%setup -qn %{name}-%{commit}
+%setup -qn %{name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
# Update dependency versions
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='jline']/pom:version" "2.10"
@@ -395,7 +383,7 @@ install -p -m 755 server/native/target/%{name}-native-%{version}/%{name}-native-
install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/lib
install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/lib/ext
-bin/bootstrap_config.sh -o -d %{buildroot}%{_sysconfdir}/%{name} -s 3GB -n -v 2
+assemble/bin/bootstrap_config.sh -o -d %{buildroot}%{_sysconfdir}/%{name} -s 3GB -n -v 2
for x in gc masters monitor slaves tracers %{name}-env.sh; do rm -f %{buildroot}%{_sysconfdir}/%{name}/$x; done
# main launcher
@@ -484,8 +472,10 @@ install -p -m 755 %{SOURCE6} %{buildroot}%{_javaconfdir}/%{name}.conf
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/%{name}-site.xml
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/auditLog.xml
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/generic_logger.xml
+%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/generic_logger.properties
%attr(0644, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/log4j.properties
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/monitor_logger.xml
+%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/monitor_logger.properties
%files server-base -f .mfiles-server-base
%{_bindir}/%{name}-init
@@ -582,6 +572,9 @@ getent passwd %{name} >/dev/null || /usr/sbin/useradd --comment "%{longproj}" --
%endif
%changelog
+* Tue Dec 16 2014 Christopher Tubbs <ctubbsii at apache> - 1.6.1-1
+- Update to 1.6.1
+
* Sun Sep 7 2014 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-7
- Fix -debuginfo
diff --git a/default-conf.patch b/default-conf.patch
index 042b679..1a8c172 100644
--- a/default-conf.patch
+++ b/default-conf.patch
@@ -1,7 +1,7 @@
-diff --git a/conf/templates/accumulo-metrics.xml b/conf/templates/accumulo-metrics.xml
+diff --git a/assemble/conf/templates/accumulo-metrics.xml b/assemble/conf/templates/accumulo-metrics.xml
index 60f9f8d..f30b098 100644
---- a/conf/templates/accumulo-metrics.xml
-+++ b/conf/templates/accumulo-metrics.xml
+--- a/assemble/conf/templates/accumulo-metrics.xml
++++ b/assemble/conf/templates/accumulo-metrics.xml
@@ -23,7 +23,8 @@
Metrics log directory
-->
@@ -12,10 +12,10 @@ index 60f9f8d..f30b098 100644
</logging>
<!--
Enable/Disable metrics accumulation on the different servers and their components
-diff --git a/conf/templates/accumulo-site.xml b/conf/templates/accumulo-site.xml
+diff --git a/assemble/conf/templates/accumulo-site.xml b/assemble/conf/templates/accumulo-site.xml
index 052ed7e..7d90774 100644
---- a/conf/templates/accumulo-site.xml
-+++ b/conf/templates/accumulo-site.xml
+--- a/assemble/conf/templates/accumulo-site.xml
++++ b/assemble/conf/templates/accumulo-site.xml
@@ -22,6 +22,12 @@
you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
diff --git a/jetty9.patch b/jetty9.patch
new file mode 100644
index 0000000..88cadbb
--- /dev/null
+++ b/jetty9.patch
@@ -0,0 +1,139 @@
+diff --git a/assemble/pom.xml b/assemble/pom.xml
+index 6c88765..c0cbe22 100644
+--- a/assemble/pom.xml
++++ b/assemble/pom.xml
+@@ -126,10 +126,6 @@
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+- <artifactId>jetty-continuation</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </dependency>
+ <dependency>
+diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
+index a8f7716..a52980b 100644
+--- a/assemble/src/main/assemblies/component.xml
++++ b/assemble/src/main/assemblies/component.xml
+@@ -35,7 +35,6 @@
+ <include>org.apache.commons:commons-math</include>
+ <include>org.apache.commons:commons-vfs2</include>
+ <include>org.apache.thrift:libthrift</include>
+- <include>org.eclipse.jetty:jetty-continuation</include>
+ <include>org.eclipse.jetty:jetty-http</include>
+ <include>org.eclipse.jetty:jetty-io</include>
+ <include>org.eclipse.jetty:jetty-security</include>
+diff --git a/pom.xml b/pom.xml
+index b0f9298..a6e0e16 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -123,7 +123,7 @@
+ <!-- overwritten in profiles hadoop-1 or hadoop-2 -->
+ <hadoop.version>2.2.0</hadoop.version>
+ <httpclient.version>3.1</httpclient.version>
+- <jetty.version>8.1.15.v20140411</jetty.version>
++ <jetty.version>9.1.5.v20140505</jetty.version>
+ <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
+ <maven.min-version>3.0.4</maven.min-version>
+ <!-- surefire/failsafe plugin option -->
+@@ -199,7 +199,7 @@
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+- <version>3.0.1</version>
++ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+@@ -416,11 +416,6 @@
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+- <artifactId>jetty-continuation</artifactId>
+- <version>${jetty.version}</version>
+- </dependency>
+- <dependency>
+- <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
+index fcccc89..23b6d03 100644
+--- a/server/monitor/pom.xml
++++ b/server/monitor/pom.xml
+@@ -81,10 +81,6 @@
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+- <artifactId>jetty-http</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
+ <dependency>
+@@ -101,7 +97,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+- <artifactId>jetty-continuation</artifactId>
++ <artifactId>jetty-http</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+index 82cd436..08cd9df 100644
+--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
++++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+@@ -20,11 +20,11 @@ import javax.servlet.http.HttpServlet;
+
+ import org.apache.accumulo.core.conf.AccumuloConfiguration;
+ import org.apache.accumulo.core.conf.Property;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.hadoop.util.StringUtils;
++import org.eclipse.jetty.server.HttpConnectionFactory;
+ import org.eclipse.jetty.server.Server;
+-import org.eclipse.jetty.server.nio.SelectChannelConnector;
++import org.eclipse.jetty.server.ServerConnector;
+ import org.eclipse.jetty.server.session.SessionHandler;
+-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
+ import org.eclipse.jetty.servlet.ServletContextHandler;
+ import org.eclipse.jetty.util.ssl.SslContextFactory;
+
+@@ -32,7 +32,7 @@ public class EmbeddedWebServer {
+ private static String EMPTY = "";
+
+ Server server = null;
+- SelectChannelConnector connector = null;
++ ServerConnector connector = null;
+ ServletContextHandler handler;
+ boolean usingSsl;
+
+@@ -45,13 +45,13 @@ public class EmbeddedWebServer {
+ final AccumuloConfiguration conf = Monitor.getSystemConfiguration();
+ if (EMPTY.equals(conf.get(Property.MONITOR_SSL_KEYSTORE)) || EMPTY.equals(conf.get(Property.MONITOR_SSL_KEYSTOREPASS))
+ || EMPTY.equals(conf.get(Property.MONITOR_SSL_TRUSTSTORE)) || EMPTY.equals(conf.get(Property.MONITOR_SSL_TRUSTSTOREPASS))) {
+- connector = new SelectChannelConnector();
++ connector = new ServerConnector(server, new HttpConnectionFactory());
+ usingSsl = false;
+ } else {
+ SslContextFactory sslContextFactory = new SslContextFactory();
+ sslContextFactory.setKeyStorePath(conf.get(Property.MONITOR_SSL_KEYSTORE));
+ sslContextFactory.setKeyStorePassword(conf.get(Property.MONITOR_SSL_KEYSTOREPASS));
+- sslContextFactory.setTrustStore(conf.get(Property.MONITOR_SSL_TRUSTSTORE));
++ sslContextFactory.setTrustStorePath(conf.get(Property.MONITOR_SSL_TRUSTSTORE));
+ sslContextFactory.setTrustStorePassword(conf.get(Property.MONITOR_SSL_TRUSTSTOREPASS));
+
+ final String includedCiphers = conf.get(Property.MONITOR_SSL_INCLUDE_CIPHERS);
+@@ -63,8 +63,7 @@ public class EmbeddedWebServer {
+ if (!Property.MONITOR_SSL_EXCLUDE_CIPHERS.getDefaultValue().equals(excludedCiphers)) {
+ sslContextFactory.setExcludeCipherSuites(StringUtils.split(excludedCiphers, ','));
+ }
+-
+- connector = new SslSelectChannelConnector(sslContextFactory);
++ connector = new ServerConnector(server, sslContextFactory);
+ usingSsl = true;
+ }
+
diff --git a/sources b/sources
index 8c46096..677da49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57840d08a4204f7dd323fca1d68a666d accumulo-1.6.0-0616258.tar.gz
+c9f0c51e97cb6ec6cb55190abfbd9aff accumulo-1.6.1-src.tar.gz
More information about the scm-commits
mailing list