Skip to content

Commit 398f4bd

Browse files
committed
Move from org.apache.slider to io.hops.slider
1 parent 504a1ed commit 398f4bd

File tree

3 files changed

+7
-35
lines changed

3 files changed

+7
-35
lines changed

common/src/java/org/apache/hive/http/HttpServer.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
import org.apache.hadoop.fs.CommonConfigurationKeys;
3939
import org.apache.hadoop.hive.conf.HiveConf;
4040
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
41-
import org.apache.hadoop.security.SecurityUtil;
4241
import org.apache.hadoop.security.UserGroupInformation;
43-
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
4442
import org.apache.hadoop.security.authorize.AccessControlList;
4543
import org.apache.hadoop.hive.common.classification.InterfaceAudience;
4644
import org.apache.logging.log4j.LogManager;
@@ -61,10 +59,7 @@
6159
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
6260
import org.eclipse.jetty.server.ServerConnector;
6361
import org.eclipse.jetty.servlet.DefaultServlet;
64-
import org.eclipse.jetty.servlet.FilterHolder;
65-
import org.eclipse.jetty.servlet.FilterMapping;
6662
import org.eclipse.jetty.servlet.ServletContextHandler;
67-
import org.eclipse.jetty.servlet.ServletHandler;
6863
import org.eclipse.jetty.servlet.ServletHolder;
6964
import org.eclipse.jetty.util.ssl.SslContextFactory;
7065
import org.eclipse.jetty.util.thread.QueuedThreadPool;
@@ -315,24 +310,6 @@ WebAppContext createWebAppContext(Builder b) {
315310
return ctx;
316311
}
317312

318-
/**
319-
* Secure the web server with kerberos (AuthenticationFilter).
320-
*/
321-
void setupSpnegoFilter(Builder b) throws IOException {
322-
Map<String, String> params = new HashMap<String, String>();
323-
params.put("kerberos.principal",
324-
SecurityUtil.getServerPrincipal(b.spnegoPrincipal, b.host));
325-
params.put("kerberos.keytab", b.spnegoKeytab);
326-
params.put(AuthenticationFilter.AUTH_TYPE, "kerberos");
327-
FilterHolder holder = new FilterHolder();
328-
holder.setClassName(AuthenticationFilter.class.getName());
329-
holder.setInitParameters(params);
330-
331-
ServletHandler handler = webAppContext.getServletHandler();
332-
handler.addFilterWithMapping(
333-
holder, "/*", FilterMapping.ALL);
334-
}
335-
336313
/**
337314
* Create a channel connector for "http/https" requests
338315
*/
@@ -386,11 +363,6 @@ private void createWebServer(final Builder b) throws IOException {
386363
this.appDir = getWebAppsPath(b.name);
387364
this.webAppContext = createWebAppContext(b);
388365

389-
if (b.useSPNEGO) {
390-
// Secure the web server with kerberos
391-
setupSpnegoFilter(b);
392-
}
393-
394366
initializeWebServer(b, threadPool.getMaxThreads());
395367
}
396368

llap-server/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,28 +319,28 @@
319319
</exclusions>
320320
</dependency>
321321
<dependency>
322-
<groupId>org.apache.slider</groupId>
322+
<groupId>io.hops.slider</groupId>
323323
<artifactId>slider-core</artifactId>
324324
<version>${slider.version}</version>
325325
<exclusions>
326326
<exclusion>
327-
<groupId>org.apache.hadoop</groupId>
327+
<groupId>io.hops</groupId>
328328
<artifactId>hadoop-client</artifactId>
329329
</exclusion>
330330
<exclusion>
331-
<groupId>org.apache.hadoop</groupId>
331+
<groupId>io.hops</groupId>
332332
<artifactId>hadoop-hdfs</artifactId>
333333
</exclusion>
334334
<exclusion>
335-
<groupId>org.apache.hadoop</groupId>
335+
<groupId>io.hops</groupId>
336336
<artifactId>hadoop-yarn-client</artifactId>
337337
</exclusion>
338338
<exclusion>
339-
<groupId>org.apache.hadoop</groupId>
339+
<groupId>io.hops</groupId>
340340
<artifactId>hadoop-yarn-server-web-proxy</artifactId>
341341
</exclusion>
342342
<exclusion>
343-
<groupId>org.apache.hadoop</groupId>
343+
<groupId>io.hops</groupId>
344344
<artifactId>hadoop-yarn-registry</artifactId>
345345
</exclusion>
346346
<exclusion>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<ST4.version>4.0.4</ST4.version>
185185
<storage-api.version>2.4.0</storage-api.version>
186186
<tez.version>0.8.5</tez.version>
187-
<slider.version>0.90.2-incubating</slider.version>
187+
<slider.version>0.93.0-incubating-SNAPSHOT</slider.version>
188188
<super-csv.version>2.2.0</super-csv.version>
189189
<spark.version>2.0.0</spark.version>
190190
<scala.binary.version>2.11</scala.binary.version>

0 commit comments

Comments
 (0)