This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5a6285a AMBARI-23044. Version upgrades of 3rd party dependencies for
Log Sear… (#452)
5a6285a is described below
commit 5a6285ab2707a4173183baf0eb5e99a9c8fc5c1b
Author: Olivér Szabó <[email protected]>
AuthorDate: Fri Feb 23 21:04:29 2018 +0100
AMBARI-23044. Version upgrades of 3rd party dependencies for Log Sear…
(#452)
* AMBARI-23044. Version upgrades of 3rd party dependencies for Log Search
and Infra
* AMBARI-23044. Remove xerces dependency.
---
ambari-infra/ambari-infra-assembly/pom.xml | 15 +++
ambari-infra/ambari-infra-manager/pom.xml | 4 +-
ambari-infra/ambari-infra-solr-client/pom.xml | 1 -
ambari-infra/pom.xml | 15 +++
.../ambari-logsearch-config-zookeeper/pom.xml | 2 +-
.../ambari-logsearch-logfeeder/pom.xml | 17 ++-
ambari-logsearch/ambari-logsearch-server/pom.xml | 104 ++++++---------
.../logsearch/common/ExternalServerClient.java | 2 +-
.../configurer/SolrCollectionConfigurer.java | 4 +-
.../logsearch/handler/UpgradeSchemaHandler.java | 139 ---------------------
.../org/apache/ambari/logsearch/util/JSONUtil.java | 8 +-
.../logsearch/web/filters/LogsearchKrbFilter.java | 4 -
ambari-logsearch/pom.xml | 33 ++++-
13 files changed, 127 insertions(+), 221 deletions(-)
diff --git a/ambari-infra/ambari-infra-assembly/pom.xml
b/ambari-infra/ambari-infra-assembly/pom.xml
index fb91552..fb03994 100644
--- a/ambari-infra/ambari-infra-assembly/pom.xml
+++ b/ambari-infra/ambari-infra-assembly/pom.xml
@@ -42,6 +42,9 @@
<infra-manager.dir>${project.basedir}/../ambari-infra-manager</infra-manager.dir>
<infra-manager.mapping.path>${mapping.base.path}/${infra-manager.package.name}</infra-manager.mapping.path>
<infra-manager.conf.mapping.path>${infra-manager.mapping.path}/conf</infra-manager.conf.mapping.path>
+
<common-fileupload.location.url>http://central.maven.org/maven2/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar</common-fileupload.location.url>
+
<common-fileupload.jar.name>commons-fileupload-1.3.3.jar</common-fileupload.jar.name>
+
<common-fileupload.old.jar.name>commons-fileupload-1.3.2.jar</common-fileupload.old.jar.name>
</properties>
<profiles>
@@ -185,6 +188,12 @@
<move todir="${project.build.directory}/solr">
<fileset
dir="${project.build.directory}/solr-${solr.version}"/>
</move>
+
+ <delete
file="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/${common-fileupload.old.jar.name}"/>
+ <get src="${common-fileupload.location.url}"
dest="target/${common-fileupload.jar.name}" usetimestamp="true"/>
+ <move file="target/${common-fileupload.jar.name}"
+
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+
<copy
file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar"
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
<chmod file="${project.build.directory}/solr/bin/**"
perm="755"/>
@@ -370,6 +379,12 @@
<move todir="${project.build.directory}/solr">
<fileset
dir="${project.build.directory}/solr-${solr.version}"/>
</move>
+
+ <delete
file="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/${common-fileupload.old.jar.name}"/>
+ <get src="${common-fileupload.location.url}"
dest="target/${common-fileupload.jar.name}" usetimestamp="true"/>
+ <move file="target/${common-fileupload.jar.name}"
+
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+
<copy
file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar"
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
<chmod file="${project.build.directory}/solr/bin/**"
perm="755"/>
diff --git a/ambari-infra/ambari-infra-manager/pom.xml
b/ambari-infra/ambari-infra-manager/pom.xml
index 5af84e6..fa7de96 100644
--- a/ambari-infra/ambari-infra-manager/pom.xml
+++ b/ambari-infra/ambari-infra-manager/pom.xml
@@ -34,11 +34,11 @@
<spring.security.version>4.2.3.RELEASE</spring.security.version>
<spring.ldap.version>2.0.4.RELEASE</spring.ldap.version>
<jersey.version>2.25.1</jersey.version>
- <jetty.version>9.4.6.v20170531</jetty.version>
+ <jetty.version>9.4.8.v20171121</jetty.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
<sqlite.version>3.8.11.2</sqlite.version>
<spring-data-solr.version>2.0.2.RELEASE</spring-data-solr.version>
- <spring-boot.version>1.5.6.RELEASE</spring-boot.version>
+ <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
<swagger.version>1.5.16</swagger.version>
<jjwt.version>0.6.0</jjwt.version>
</properties>
diff --git a/ambari-infra/ambari-infra-solr-client/pom.xml
b/ambari-infra/ambari-infra-solr-client/pom.xml
index cd77d77..a4abc9a 100644
--- a/ambari-infra/ambari-infra-solr-client/pom.xml
+++ b/ambari-infra/ambari-infra-solr-client/pom.xml
@@ -56,7 +56,6 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.9</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/ambari-infra/pom.xml b/ambari-infra/pom.xml
index 83a5dcc..e18fe2f 100644
--- a/ambari-infra/pom.xml
+++ b/ambari-infra/pom.xml
@@ -254,6 +254,21 @@
<artifactId>commons-lang</artifactId>
<version>2.5</version>
</dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.10</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/ambari-logsearch/ambari-logsearch-config-zookeeper/pom.xml
b/ambari-logsearch/ambari-logsearch-config-zookeeper/pom.xml
index 4e9964c..c6eb415 100644
--- a/ambari-logsearch/ambari-logsearch-config-zookeeper/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-config-zookeeper/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
index 72b5185..884f49f 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>4.3.10.RELEASE</spring.version>
- <spring-boot.version>1.5.6.RELEASE</spring-boot.version>
+ <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
</properties>
<dependencies>
@@ -140,6 +140,14 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
@@ -163,7 +171,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-hdfs-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
@@ -202,6 +210,11 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring-boot.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.0.37.Final</version>
+ </dependency>
<!-- Exclude jars globally-->
<dependency>
<groupId>commons-beanutils</groupId>
diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml
b/ambari-logsearch/ambari-logsearch-server/pom.xml
index 92a2863..5730f80 100755
--- a/ambari-logsearch/ambari-logsearch-server/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-server/pom.xml
@@ -31,11 +31,11 @@
<spring.security.version>4.2.3.RELEASE</spring.security.version>
<spring.ldap.version>2.0.4.RELEASE</spring.ldap.version>
<jersey.version>2.25.1</jersey.version>
- <jetty.version>9.4.6.v20170531</jetty.version>
+ <jetty.version>9.4.8.v20171121</jetty.version>
<swagger.version>1.5.16</swagger.version>
<spring-data-solr.version>2.0.2.RELEASE</spring-data-solr.version>
<jjwt.version>0.6.0</jjwt.version>
- <spring-boot.version>1.5.6.RELEASE</spring-boot.version>
+ <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
</properties>
<profiles>
<profile>
@@ -328,62 +328,8 @@
<!-- Hadoop -->
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>2.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>guava</artifactId>
- <groupId>com.google.guava</groupId>
- </exclusion>
- <exclusion>
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>hadoop-auth</artifactId>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -406,6 +352,26 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ambari</groupId>
+ <artifactId>ambari-metrics-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
@@ -422,6 +388,10 @@
<artifactId>jersey-server</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
@@ -436,11 +406,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-metrics-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.3.1</version>
@@ -521,6 +486,19 @@
<artifactId>ambari-logsearch-web</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
<!-- Exclude jars globally-->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index c6a1379..76d43e5 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
@@ -26,7 +26,7 @@ import javax.ws.rs.core.Response;
import org.apache.ambari.logsearch.conf.AuthPropsConfig;
import org.apache.ambari.logsearch.configurer.SslConfigurer;
-import org.apache.commons.httpclient.auth.InvalidCredentialsException;
+import org.apache.http.auth.InvalidCredentialsException;
import org.apache.log4j.Logger;
import org.glassfish.jersey.client.JerseyClient;
import org.glassfish.jersey.client.JerseyClientBuilder;
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index 4dc3dc5..1621284 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -25,7 +25,6 @@ import org.apache.ambari.logsearch.handler.ACLHandler;
import org.apache.ambari.logsearch.handler.CreateCollectionHandler;
import org.apache.ambari.logsearch.handler.ListCollectionHandler;
import org.apache.ambari.logsearch.handler.ReloadCollectionHandler;
-import org.apache.ambari.logsearch.handler.UpgradeSchemaHandler;
import org.apache.ambari.logsearch.handler.UploadConfigurationHandler;
import org.apache.commons.lang.StringUtils;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -107,8 +106,7 @@ public class SolrCollectionConfigurer implements Configurer
{
if (!state.isConfigurationUploaded()) {
state.setConfigurationUploaded(true);
}
- boolean upgradeSchema = new UpgradeSchemaHandler(cloudSolrClient,
configSetFolder).handle(cloudSolrClient, solrPropsConfig);
- return reloadCollectionNeeded || upgradeSchema;
+ return reloadCollectionNeeded;
}
public boolean stopSetupCondition(SolrCollectionState state) {
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/handler/UpgradeSchemaHandler.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/handler/UpgradeSchemaHandler.java
deleted file mode 100644
index 0da2125..0000000
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/handler/UpgradeSchemaHandler.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.
- */
-package org.apache.ambari.logsearch.handler;
-
-import org.apache.ambari.logsearch.conf.SolrPropsConfig;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.configuration.HierarchicalConfiguration.Node;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.request.schema.SchemaRequest;
-import org.apache.solr.common.cloud.SolrZkClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class UpgradeSchemaHandler extends AbstractSolrConfigHandler {
-
- private static final Logger LOG =
LoggerFactory.getLogger(UpgradeSchemaHandler.class);
-
- private static final String SCHEMA_FILE = "managed-schema";
- private static final String FIELD_NAME_PATH = "field[@name]";
- private static final String FIELD_TYPE_NAME_PATH = "fieldType[@name]";
- private static final String DYNAMIC_FIELD = "dynamicField";
- private static final String DYNAMIC_FIELD_NAME_PATH = DYNAMIC_FIELD +
"[@name]";
-
- private CloudSolrClient cloudSolrClient;
-
- private XMLConfiguration localFileXml;
- private List<String> localDynamicFields;
-
- public UpgradeSchemaHandler(CloudSolrClient cloudSolrClient, File
configSetFolder) {
- super(configSetFolder);
- this.cloudSolrClient = cloudSolrClient;
- }
-
- @Override
- public boolean updateConfigIfNeeded(SolrPropsConfig solrPropsConfig,
SolrZkClient zkClient, File file, String separator, String
downloadFolderLocation) throws IOException {
- boolean result = false;
- if (localSchemaFileHasMoreFields(file, new File(String.format("%s%s%s",
downloadFolderLocation, separator, file.getName())))) {
- LOG.info("Solr schema file differs ('{}'), update config schema...",
file.getName());
- try {
- upgradeDynamicFields();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- result = true;
- }
- return result;
- }
-
- // for now we only upgrades dynamic fields, later we can extend this feature
if needed
- private void upgradeDynamicFields() throws IOException, SolrServerException {
- if (localFileXml.getRoot() != null &&
CollectionUtils.isNotEmpty(localDynamicFields)) {
- List<Node> children = localFileXml.getRoot().getChildren(DYNAMIC_FIELD);
- for (Node dynamicFieldNode : children) {
- List<Node> attributes = dynamicFieldNode.getAttributes();
- Map<String, Object> attributesMap = new HashMap<>();
- for (Node attribute : attributes) {
- attributesMap.put(attribute.getName(), attribute.getValue());
- }
- if (attributesMap.get("name") != null &&
localDynamicFields.contains(attributesMap.get("name").toString())) {
- SchemaRequest.AddDynamicField addDynamicFieldRequest = new
SchemaRequest.AddDynamicField(attributesMap);
- addDynamicFieldRequest.process(cloudSolrClient);
- LOG.info("Added dynamic field request sent. (field name: {})",
attributesMap.get("name"));
- }
- }
- }
- }
-
- @Override
- public String getConfigFileName() {
- return SCHEMA_FILE;
- }
-
- private boolean localSchemaFileHasMoreFields(File localFile, File
downloadedFile) {
- try {
- localFileXml = new XMLConfiguration(localFile);
- XMLConfiguration downloadedFileXml = new
XMLConfiguration(downloadedFile);
-
- List<String> localFieldNames = (ArrayList<String>)
localFileXml.getProperty(FIELD_NAME_PATH);
- List<String> localFieldTypes = (ArrayList<String>)
localFileXml.getProperty(FIELD_TYPE_NAME_PATH);
- localDynamicFields = (ArrayList<String>)
localFileXml.getProperty(DYNAMIC_FIELD_NAME_PATH);
-
- List<String> fieldNames = (ArrayList<String>)
downloadedFileXml.getProperty(FIELD_NAME_PATH);
- List<String> fieldTypes = (ArrayList<String>)
downloadedFileXml.getProperty(FIELD_TYPE_NAME_PATH);
- List<String> dynamicFields = (ArrayList<String>)
downloadedFileXml.getProperty(DYNAMIC_FIELD_NAME_PATH);
-
- boolean fieldNameHasDiff = hasMoreFields(localFieldNames, fieldNames,
FIELD_NAME_PATH);
- boolean fieldTypeHasDiff = hasMoreFields(localFieldTypes, fieldTypes,
FIELD_TYPE_NAME_PATH);
- boolean dynamicFieldNameHasDiff = hasMoreFields(localDynamicFields,
dynamicFields, DYNAMIC_FIELD_NAME_PATH);
-
- return fieldNameHasDiff || fieldTypeHasDiff || dynamicFieldNameHasDiff;
- } catch (Exception e) {
- throw new RuntimeException("Exception during schema xml parsing.", e);
- }
- }
-
- private boolean hasMoreFields(List<String> localFields, List<String> fields,
String tag) {
- boolean result = false;
- if (localFields != null) {
- if (fields == null) {
- result = true;
- } else {
- localFields.removeAll(fields);
- if (!localFields.isEmpty()) {
- result = true;
- }
- }
- }
- if (result) {
- LOG.info("Found new fields or field types in local schema file.: {}
({})", localFields.toString(), tag);
- }
- return result;
- }
-
-}
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/util/JSONUtil.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/util/JSONUtil.java
index d08c0f4..a8d5a57 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/util/JSONUtil.java
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/util/JSONUtil.java
@@ -27,13 +27,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.ambari.logsearch.common.MessageEnums;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKrbFilter.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKrbFilter.java
index b4c68fb..3677d11 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKrbFilter.java
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKrbFilter.java
@@ -27,8 +27,6 @@ import
org.apache.hadoop.security.authentication.server.AuthenticationToken;
import
org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
import
org.apache.hadoop.security.authentication.server.PseudoAuthenticationHandler;
import org.apache.hadoop.security.authentication.util.*;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,8 +49,6 @@ import java.util.*;
import static
org.apache.ambari.logsearch.common.LogSearchConstants.LOGSEARCH_SESSION_ID;
[email protected]
[email protected]
public class LogsearchKrbFilter implements Filter {
private static Logger logger =
LoggerFactory.getLogger(LogsearchKrbFilter.class);
diff --git a/ambari-logsearch/pom.xml b/ambari-logsearch/pom.xml
index 5b19a11..27eeff9 100644
--- a/ambari-logsearch/pom.xml
+++ b/ambari-logsearch/pom.xml
@@ -42,7 +42,7 @@
<deb.architecture>amd64</deb.architecture>
<deb.dependency.list>${deb.python.ver}</deb.dependency.list>
<solr.version>7.2.1</solr.version>
- <hadoop.version>2.7.2</hadoop.version>
+ <hadoop.version>3.0.0</hadoop.version>
<common.io.version>2.5</common.io.version>
<forkCount>4</forkCount>
<reuseForks>false</reuseForks>
@@ -248,6 +248,37 @@
<artifactId>junit</artifactId>
<version>4.10</version>
</dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>2.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.10.5.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
--
To stop receiving notification emails like this one, please contact
[email protected].
