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/12/23 16:06:15 UTC
[ambari-infra] 01/01: support s3 for infra-solr
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch s3-poc
in repository https://gitbox.apache.org/repos/asf/ambari-infra.git
commit b79b7c5c3ed241fb0d3627312e41b91e2b9ae991
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Sun Dec 23 17:05:08 2018 +0100
support s3 for infra-solr
---
ambari-infra-assembly/pom.xml | 12 ++++++++++++
ambari-infra-manager-it/pom.xml | 4 ++--
ambari-infra-manager/pom.xml | 6 +++---
ambari-infra-solr-plugin/pom.xml | 26 ++++++++++++++++++++++++++
pom.xml | 4 +++-
5 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/ambari-infra-assembly/pom.xml b/ambari-infra-assembly/pom.xml
index fe9d72e..5ca4b84 100644
--- a/ambari-infra-assembly/pom.xml
+++ b/ambari-infra-assembly/pom.xml
@@ -45,6 +45,10 @@
<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>
+ <aws-java-sdk-core.jar.name>aws-java-sdk-core-${aws-sdk.version}</aws-java-sdk-core.jar.name>
+ <aws-java-sdk-s3.jar.name>aws-java-sdk-s3-${aws-sdk.version}</aws-java-sdk-s3.jar.name>
+ <aws-java-sdk-dynamodb.jar.name>aws-java-sdk-dynamodb-${aws-sdk.version}</aws-java-sdk-dynamodb.jar.name>
+ <hadoop-aws.jar.name>hadoop-aws-${hadoop.version}.jar</hadoop-aws.jar.name>
<jenkins.docker.folder>../jenkins/containers</jenkins.docker.folder>
</properties>
@@ -194,6 +198,14 @@
<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/"/>
+ <move file="target/${aws-java-sdk-core.jar.name}"
+ toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+ <move file="target/${aws-java-sdk-s3.jar.name}"
+ toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+ <move file="target/${aws-java-sdk-dynamodb.jar.name}"
+ toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+ <move file="target/${hadoop-aws.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/"/>
diff --git a/ambari-infra-manager-it/pom.xml b/ambari-infra-manager-it/pom.xml
index db4ca9c..30d3359 100644
--- a/ambari-infra-manager-it/pom.xml
+++ b/ambari-infra-manager-it/pom.xml
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop3.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/ambari-infra-manager/pom.xml b/ambari-infra-manager/pom.xml
index 80dddb1..1f617df 100644
--- a/ambari-infra-manager/pom.xml
+++ b/ambari-infra-manager/pom.xml
@@ -329,7 +329,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop3.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
@@ -402,7 +402,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop3.version}</version>
<exclusions>
<exclusion>
<groupId>com.amazonaws</groupId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoop3.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/ambari-infra-solr-plugin/pom.xml b/ambari-infra-solr-plugin/pom.xml
index e9bec08..e11bec2 100644
--- a/ambari-infra-solr-plugin/pom.xml
+++ b/ambari-infra-solr-plugin/pom.xml
@@ -39,6 +39,32 @@
<version>${ambari-metrics.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-aws</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-bundle</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-core</artifactId>
+ <version>${aws-sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
+ <version>${aws-sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-dynamodb</artifactId>
+ <version>${aws-sdk.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
<version>${solr.version}</version>
diff --git a/pom.xml b/pom.xml
index 80c4877..51acc02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,12 +31,14 @@
<deb.python.ver>python (>= 2.6)</deb.python.ver>
<deb.architecture>amd64</deb.architecture>
<deb.dependency.list>${deb.python.ver}</deb.dependency.list>
- <hadoop.version>3.1.1</hadoop.version>
<surefire.argLine>-Xmx1024m -Xms512m</surefire.argLine>
<zookeeper.version>3.4.6.2.3.0.0-2557</zookeeper.version>
<ambari-metrics.version>2.7.0.0.0</ambari-metrics.version>
<skipSurefireTests>false</skipSurefireTests>
<log4j2.version>2.10.0</log4j2.version>
+ <aws-sdk.version>1.11.445</aws-sdk.version>
+ <hadoop.version>2.7.3.2.6.5.3004-13</hadoop.version>
+ <hadoop3.version>3.1.1</hadoop3.version>
</properties>
<licenses>