This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch cloud-storage-poc
in repository https://gitbox.apache.org/repos/asf/ambari-infra.git
The following commit(s) were added to refs/heads/cloud-storage-poc by this push:
new 92eb8b8 Add GCS support
92eb8b8 is described below
commit 92eb8b84d7fdcbb7383f68381ef8aa445d72f442
Author: Oliver Szabo <[email protected]>
AuthorDate: Tue Dec 25 13:13:12 2018 +0100
Add GCS support
---
ambari-infra-assembly/build.xml | 80 ++++++++++++++++++++++++++
ambari-infra-assembly/pom.xml | 120 +++------------------------------------
ambari-infra-solr-plugin/pom.xml | 5 ++
3 files changed, 93 insertions(+), 112 deletions(-)
diff --git a/ambari-infra-assembly/build.xml b/ambari-infra-assembly/build.xml
new file mode 100644
index 0000000..d1c52d7
--- /dev/null
+++ b/ambari-infra-assembly/build.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
+<project basedir="." default="package" name="infra-assembly">
+ <target name="package">
+ <get
+ src="${solr.tar}"
+ dest="${project.build.directory}/solr.tgz"
+ usetimestamp="true"
+ />
+ <untar
+ src="${project.build.directory}/solr.tgz"
+ dest="${project.build.directory}/"
+ compression="gzip"
+ />
+ <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>
+ <fileset
dir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/">
+ <include name="hadoop-*.jar"/>
+ </fileset>
+ </delete>
+
+ <copy
todir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/">
+ <fileset dir="${infra.solr.plugin.dir}/target/libs">
+ <include name="hadoop-*.jar"/>
+ <include name="aws-java*.jar"/>
+ <include name="azure-*.jar"/>
+ <include name="wildfly*.jar"/>
+ <include name="jetty-uti*.jar"/>
+ <include name="gcs*.jar"/>
+ <include name="google*.jar"/>
+ <include name="util-*.jar"/>
+ </fileset>
+ </copy>
+ <copy file="${infra.solr.plugin.dir}/target/libs/${jets3t.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/"/>
+ <copy
file="${infra.solr.plugin.dir}/target/libs/ambari-metrics-common-${ambari-metrics.version}.jar"
+
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+ <copy file="${infra.solr.plugin.dir}/target/libs/commons-logging-1.1.1.jar"
+
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+ <chmod file="${project.build.directory}/solr/bin/**" perm="755"/>
+ <chmod file="${project.build.directory}/solr/server/scripts/**"
perm="755"/>
+
+ <copy todir="${project.build.directory}">
+ <fileset dir="${jenkins.docker.folder}" includes="**"/>
+ </copy>
+ <copy todir="${project.build.directory}/docker-infra-solr/solr">
+ <fileset dir="${project.build.directory}/solr" includes="**"/>
+ </copy>
+ <copy todir="${project.build.directory}/docker-infra-solr/solr-client">
+ <fileset dir="${solr.client.dir}/target/package" includes="**"/>
+ </copy>
+ </target>
+</project>
\ No newline at end of file
diff --git a/ambari-infra-assembly/pom.xml b/ambari-infra-assembly/pom.xml
index 8986984..4a03316 100644
--- a/ambari-infra-assembly/pom.xml
+++ b/ambari-infra-assembly/pom.xml
@@ -179,57 +179,10 @@
<goal>run</goal>
</goals>
<configuration>
- <target name="Download Solr">
- <get
- src="${solr.tar}"
- dest="${project.build.directory}/solr.tgz"
- usetimestamp="true"
- />
- <untar
- src="${project.build.directory}/solr.tgz"
- dest="${project.build.directory}/"
- compression="gzip"
- />
- <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/libs/${aws-java-sdk-core.jar.name}"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
- <copy
file="${infra.solr.plugin.dir}/target/libs/${aws-java-sdk-s3.jar.name}"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
- <copy
file="${infra.solr.plugin.dir}/target/libs/${aws-java-sdk-dynamodb.jar.name}"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
-
- <delete>
- <fileset
dir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/">
- <include name="hadoop-*.jar"/>
- </fileset>
- </delete>
-
- <copy
todir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/">
- <fileset dir="${infra.solr.plugin.dir}/target/libs">
- <include name="hadoop-*.jar"/>
- <include name="azure-*.jar"/>
- <include name="wildfly*.jar"/>
- <include name="jetty-uti*.jar" />
- </fileset>
- </copy>
- <copy
file="${infra.solr.plugin.dir}/target/libs/${jets3t.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/"/>
- <copy
file="${infra.solr.plugin.dir}/target/libs/ambari-metrics-common-${ambari-metrics.version}.jar"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
- <copy
file="${infra.solr.plugin.dir}/target/libs/commons-logging-1.1.1.jar"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
- <chmod file="${project.build.directory}/solr/bin/**"
perm="755"/>
- <chmod
file="${project.build.directory}/solr/server/scripts/**" perm="755"/>
+ <target>
+ <ant antfile="build.xml">
+ <target name="package"/>
+ </ant>
</target>
</configuration>
</execution>
@@ -397,67 +350,10 @@
<goal>run</goal>
</goals>
<configuration>
- <target name="Download Solr">
- <get
- src="${solr.tar}"
- dest="${project.build.directory}/solr.tgz"
- usetimestamp="true"
- />
- <untar
- src="${project.build.directory}/solr.tgz"
- dest="${project.build.directory}/"
- compression="gzip"
- />
- <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/libs/${aws-java-sdk-core.jar.name}"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
- <copy
file="${infra.solr.plugin.dir}/target/libs/${aws-java-sdk-s3.jar.name}"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
- <copy
file="${infra.solr.plugin.dir}/target/libs/${aws-java-sdk-dynamodb.jar.name}"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
-
- <delete>
- <fileset
dir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/">
- <include name="hadoop-*.jar"/>
- </fileset>
- </delete>
-
- <copy
todir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/">
- <fileset dir="${infra.solr.plugin.dir}/target/libs">
- <include name="hadoop-*.jar"/>
- <include name="azure-*.jar"/>
- <include name="wildfly*.jar"/>
- <include name="jetty-uti*.jar" />
- </fileset>
- </copy>
- <copy
file="${infra.solr.plugin.dir}/target/libs/${jets3t.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/"/>
- <copy
file="${infra.solr.plugin.dir}/target/libs/ambari-metrics-common-${ambari-metrics.version}.jar"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
- <copy
file="${infra.solr.plugin.dir}/target/libs/commons-logging-1.1.1.jar"
-
toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
- <chmod file="${project.build.directory}/solr/bin/**"
perm="755"/>
- <chmod
file="${project.build.directory}/solr/server/scripts/**" perm="755"/>
-
- <copy todir="${project.build.directory}" >
- <fileset dir="${jenkins.docker.folder}" includes="**"/>
- </copy>
- <copy
todir="${project.build.directory}/docker-infra-solr/solr" >
- <fileset dir="${project.build.directory}/solr"
includes="**"/>
- </copy>
- <copy
todir="${project.build.directory}/docker-infra-solr/solr-client" >
- <fileset dir="${solr.client.dir}/target/package"
includes="**"/>
- </copy>
+ <target>
+ <ant antfile="build.xml">
+ <target name="package"/>
+ </ant>
</target>
</configuration>
</execution>
diff --git a/ambari-infra-solr-plugin/pom.xml b/ambari-infra-solr-plugin/pom.xml
index 78b2848..0880808 100644
--- a/ambari-infra-solr-plugin/pom.xml
+++ b/ambari-infra-solr-plugin/pom.xml
@@ -105,6 +105,11 @@
<version>6.1.26</version>
</dependency>
<dependency>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>gcs-connector</artifactId>
+ <version>hadoop2-1.9.11</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
<version>${solr.version}</version>
