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 2070dda Fix jar locations
2070dda is described below
commit 2070dda6a850cd7aec96b153321bab572e302d88
Author: Oliver Szabo <[email protected]>
AuthorDate: Sun Dec 23 18:46:11 2018 +0100
Fix jar locations
---
ambari-infra-assembly/pom.xml | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/ambari-infra-assembly/pom.xml b/ambari-infra-assembly/pom.xml
index 8a4a6f8..51bd1ab 100644
--- a/ambari-infra-assembly/pom.xml
+++ b/ambari-infra-assembly/pom.xml
@@ -45,9 +45,9 @@
<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>
+
<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,13 +198,13 @@
<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}"
+ <move
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="target/${aws-java-sdk-s3.jar.name}"
+ <move
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="target/${aws-java-sdk-dynamodb.jar.name}"
+ <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="target/${hadoop-aws.jar.name}"
+ <move
file="${infra.solr.plugin.dir}/target/libs/${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"
@@ -401,13 +401,13 @@
<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}"
+ <move
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="target/${aws-java-sdk-s3.jar.name}"
+ <move
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="target/${aws-java-sdk-dynamodb.jar.name}"
+ <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="target/${hadoop-aws.jar.name}"
+ <move
file="${infra.solr.plugin.dir}/target/libs/${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"
