You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/02/23 14:46:39 UTC
[ambari] branch branch-2.6 updated: [AMBARI-23044]. Version
upgrades of 3rd party dependencies for Log Search and Infra (#432)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 5913546 [AMBARI-23044]. Version upgrades of 3rd party dependencies for Log Search and Infra (#432)
5913546 is described below
commit 591354683ed247a5dfafaba4d9fc685ca268664d
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Fri Feb 23 15:46:36 2018 +0100
[AMBARI-23044]. Version upgrades of 3rd party dependencies for Log Search and Infra (#432)
* AMBARI-23044. Version upgrades of 3rd party dependencies for Log Search and Infra.
* AMBARI-23044. Remove xerces
---
ambari-logsearch/ambari-logsearch-assembly/pom.xml | 27 ++++++++
.../ambari-logsearch-logfeeder/pom.xml | 18 +++++-
ambari-logsearch/ambari-logsearch-portal/pom.xml | 20 ++++--
.../logsearch/common/ExternalServerClient.java | 2 +-
.../logsearch/solr/metrics/SolrAmsClient.java | 74 ----------------------
.../org/apache/ambari/logsearch/util/JSONUtil.java | 8 +--
ambari-logsearch/pom.xml | 32 +++++++++-
7 files changed, 94 insertions(+), 87 deletions(-)
diff --git a/ambari-logsearch/ambari-logsearch-assembly/pom.xml b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
index 8045845..2bb74e4 100644
--- a/ambari-logsearch/ambari-logsearch-assembly/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
@@ -45,6 +45,11 @@
<logsearch.logfeeder.conf.mapping.path>/etc/${logsearch.logfeeder.package.name}/conf
</logsearch.logfeeder.conf.mapping.path>
<infra.solr.plugin.dir>${project.basedir}/../ambari-infra-solr-plugin</infra.solr.plugin.dir>
+ <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>
+ <zookeeper.jar.name>zookeeper-3.4.7.jar</zookeeper.jar.name>
+ <zookeeper.jar.location>http://central.maven.org/maven2/org/apache/zookeeper/zookeeper/3.4.7/${zookeeper.jar.name}</zookeeper.jar.location>
</properties>
<artifactId>ambari-logsearch-assembly</artifactId>
<profiles>
@@ -249,6 +254,17 @@
<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/"/>
+
+ <delete file="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3.4.6.jar"/>
+ <get src="${zookeeper.jar.location}" dest="target/${zookeeper.jar.name}" usetimestamp="true"/>
+ <move file="target/${zookeeper.jar.name}"
+ toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+
<copy file="${project.basedir}/src/main/resources/solr" toDir="${project.build.directory}/solr/bin/" />
<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/"/>
@@ -511,6 +527,17 @@
<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/"/>
+
+ <delete file="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3.4.6.jar"/>
+ <get src="${zookeeper.jar.location}" dest="target/${zookeeper.jar.name}" usetimestamp="true"/>
+ <move file="target/${zookeeper.jar.name}"
+ toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+
<copy file="${project.basedir}/src/main/resources/solr" toDir="${project.build.directory}/solr/bin/" />
<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/"/>
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
index db2923e..47ade72 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
@@ -150,6 +150,22 @@
<version>${hadoop.version}</version>
<exclusions>
<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>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
@@ -157,7 +173,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-hdfs-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
diff --git a/ambari-logsearch/ambari-logsearch-portal/pom.xml b/ambari-logsearch/ambari-logsearch-portal/pom.xml
index f82ffea..fe134ad 100755
--- a/ambari-logsearch/ambari-logsearch-portal/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-portal/pom.xml
@@ -598,9 +598,17 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>2.7.0</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
@@ -645,11 +653,6 @@
<version>${project.version}</version>
</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>
@@ -799,5 +802,10 @@
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.55</version>
</dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ </dependency>
</dependencies>
</project>
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index df00c15..26e16fc 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++ b/ambari-logsearch/ambari-logsearch-portal/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.util.SSLUtil;
-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-portal/src/main/java/org/apache/ambari/logsearch/solr/metrics/SolrAmsClient.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/metrics/SolrAmsClient.java
deleted file mode 100644
index 0d4deab..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/metrics/SolrAmsClient.java
+++ /dev/null
@@ -1,74 +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.solr.metrics;
-
-import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;
-import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
-
-import java.util.Collection;
-
-// TODO: Refactor for failover
-public class SolrAmsClient extends AbstractTimelineMetricsSink {
- private final String collectorHost;
-
- public SolrAmsClient(String collectorHost) {
- this.collectorHost = collectorHost;
- }
-
- @Override
- public String getCollectorUri(String host) {
- return collectorHost;
- }
-
- @Override
- protected int getTimeoutSeconds() {
- return 10;
- }
-
- @Override
- protected String getZookeeperQuorum() {
- return null;
- }
-
- @Override
- protected Collection<String> getConfiguredCollectorHosts() {
- return null;
- }
-
- @Override
- protected String getHostname() {
- return null;
- }
-
- @Override
- protected boolean emitMetrics(TimelineMetrics metrics) {
- return super.emitMetrics(metrics);
- }
-
- @Override
- protected String getCollectorProtocol() {
- return null;
- }
-
- @Override
- protected String getCollectorPort() {
- return null;
- }
-}
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/JSONUtil.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/JSONUtil.java
index d08c0f4..a8d5a57 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/JSONUtil.java
+++ b/ambari-logsearch/ambari-logsearch-portal/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/pom.xml b/ambari-logsearch/pom.xml
index c74f61f..607a17c 100644
--- a/ambari-logsearch/pom.xml
+++ b/ambari-logsearch/pom.xml
@@ -44,7 +44,7 @@
<deb.architecture>amd64</deb.architecture>
<deb.dependency.list>${deb.python.ver}</deb.dependency.list>
<solr.version>5.5.5</solr.version>
- <hadoop.version>2.7.2</hadoop.version>
+ <hadoop.version>3.0.0</hadoop.version>
<common.io.version>2.5</common.io.version>
</properties>
<build>
@@ -188,6 +188,36 @@
<version>1.0.0.0-SNAPSHOT</version>
<scope>test</scope>
</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.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>2.9.4</version>
+ </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.