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
The following commit(s) were added to refs/heads/s3-poc by this push: new fadf364 Use more hadoop jars to avoid class not found exceptions fadf364 is described below commit fadf36414a10952a7eb3d4f806b9f3a1f14ea659 Author: Oliver Szabo <oleew...@gmail.com> AuthorDate: Sun Dec 23 19:28:47 2018 +0100 Use more hadoop jars to avoid class not found exceptions --- ambari-infra-assembly/pom.xml | 41 +++++++++++++++++++++++++++++----------- ambari-infra-solr-plugin/pom.xml | 20 ++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/ambari-infra-assembly/pom.xml b/ambari-infra-assembly/pom.xml index 51bd1ab..f460f88 100644 --- a/ambari-infra-assembly/pom.xml +++ b/ambari-infra-assembly/pom.xml @@ -48,7 +48,6 @@ <aws-java-sdk-core.jar.name>aws-java-sdk-core-${aws-sdk.version}.jar</aws-java-sdk-core.jar.name> <aws-java-sdk-s3.jar.name>aws-java-sdk-s3-${aws-sdk.version}.jar</aws-java-sdk-s3.jar.name> <aws-java-sdk-dynamodb.jar.name>aws-java-sdk-dynamodb-${aws-sdk.version}.jar</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> @@ -198,15 +197,25 @@ <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="${infra.solr.plugin.dir}/target/libs/${aws-java-sdk-core.jar.name}" + <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/"/> - <move file="${infra.solr.plugin.dir}/target/libs/${aws-java-sdk-s3.jar.name}" + <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/"/> - <move 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/"/> - <move file="${infra.solr.plugin.dir}/target/libs/${hadoop-aws.jar.name}" + <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"/> + </fileset> + </copy> + <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" @@ -401,15 +410,25 @@ <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="${infra.solr.plugin.dir}/target/libs/${aws-java-sdk-core.jar.name}" + <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/"/> - <move file="${infra.solr.plugin.dir}/target/libs/${aws-java-sdk-s3.jar.name}" + <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/"/> - <move 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/"/> - <move file="${infra.solr.plugin.dir}/target/libs/${hadoop-aws.jar.name}" + <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"/> + </fileset> + </copy> + <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" diff --git a/ambari-infra-solr-plugin/pom.xml b/ambari-infra-solr-plugin/pom.xml index e11bec2..ada3feb 100644 --- a/ambari-infra-solr-plugin/pom.xml +++ b/ambari-infra-solr-plugin/pom.xml @@ -65,6 +65,26 @@ <version>${aws-sdk.version}</version> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-test-framework</artifactId> <version>${solr.version}</version>