rpms/accumulo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
This repository has been archived on 2026-01-16. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.
accumulo/jetty9.patch
Christopher Tubbs a7319744d6 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
2016-10-20 00:24:55 -04:00

194 lines
7.4 KiB
Diff
Raw Blame History

diff --git a/assemble/pom.xml b/assemble/pom.xml
index db26388..49d127f 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 96e1fbe..a0fd410 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 bd206e3..3d0d903 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
<hadoop.version>2.2.0</hadoop.version>
<httpclient.version>3.1</httpclient.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
- <jetty.version>8.1.15.v20140411</jetty.version>
+ <jetty.version>9.1.5.v20140505</jetty.version>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.min-version>3.0.5</maven.min-version>
@@ -204,7 +204,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>
@@ -421,11 +421,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>
@@ -454,12 +449,6 @@
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
- <!-- Necessary for Hadoop-1 minidfs -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
- </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index f3dcd4a..e8146be 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 41890e8..dea263a 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
@@ -23,10 +23,10 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
+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.security.Constraint;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -35,7 +35,7 @@ public class EmbeddedWebServer {
private static String EMPTY = "";
Server server = null;
- SelectChannelConnector connector = null;
+ ServerConnector connector = null;
ServletContextHandler handler;
boolean usingSsl;
@@ -48,13 +48,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);
@@ -72,7 +72,7 @@ public class EmbeddedWebServer {
sslContextFactory.setIncludeProtocols(StringUtils.split(includeProtocols, ','));
}
- connector = new SslSelectChannelConnector(sslContextFactory);
+ connector = new ServerConnector(server, sslContextFactory);
usingSsl = true;
}
diff --git a/start/pom.xml b/start/pom.xml
index 9f74aff..bd36449 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -109,24 +109,4 @@
</plugins>
</pluginManagement>
</build>
- <profiles>
- <!-- profile for building against Hadoop 1.x
- Activate using: mvn -Dhadoop.profile=1 -->
- <profile>
- <id>hadoop-1</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/test/pom.xml b/test/pom.xml
index 8d8b838..13998c3 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -307,11 +307,6 @@
<artifactId>hadoop-tools</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</profile>
<!-- profile for building against Hadoop 2.x
Reference in a new issue View git blame Copy permalink