AMBARI-20468. Ubuntu: When Disable Security Infra Solr Instance and RM start are failed.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ddeb17a1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ddeb17a1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ddeb17a1 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: ddeb17a12bd5f3edd394ef05e483b888d16d4972 Parents: 22cef4f Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Thu Mar 16 14:37:56 2017 +0200 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Thu Mar 16 14:37:56 2017 +0200 ---------------------------------------------------------------------- ambari-agent/pom.xml | 75 +++++++++++++------------- ambari-agent/src/packages/tarball/all.xml | 10 ++++ 2 files changed, 47 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ddeb17a1/ambari-agent/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index 79545d6..292fd07 100644 --- a/ambari-agent/pom.xml +++ b/ambari-agent/pom.xml @@ -153,43 +153,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> - <executions> - <execution> - <id>shade-zkmigrator</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.apache.ambari.tools.zk.ZkMigrator</mainClass> - </transformer> - </transformers> - <outputFile>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var/lib/ambari-agent/tools/zkmigrator.jar</outputFile> - </configuration> - </execution> - <execution> - <id>shade-jce</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.apache.ambari.tools.jce.JcePolicyInfo</mainClass> - </transformer> - </transformers> - <outputFile>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var/lib/ambari-agent/tools/jcepolicyinfo.jar</outputFile> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>${skipSurefireTests}</skip> @@ -351,7 +314,6 @@ <sources> <source> <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var/lib/ambari-agent</location> - </source> </sources> </mapping> @@ -427,6 +389,43 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.3</version> + <executions> + <execution> + <id>shade-zkmigrator</id> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>org.apache.ambari.tools.zk.ZkMigrator</mainClass> + </transformer> + </transformers> + <outputFile>${project.build.directory}${dirsep}zkmigrator.jar</outputFile> + </configuration> + </execution> + <execution> + <id>shade-jce</id> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>org.apache.ambari.tools.jce.JcePolicyInfo</mainClass> + </transformer> + </transformers> + <outputFile>${project.build.directory}${dirsep}jcepolicyinfo.jar</outputFile> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <tarLongFileMode>gnu</tarLongFileMode> http://git-wip-us.apache.org/repos/asf/ambari/blob/ddeb17a1/ambari-agent/src/packages/tarball/all.xml ---------------------------------------------------------------------- diff --git a/ambari-agent/src/packages/tarball/all.xml b/ambari-agent/src/packages/tarball/all.xml index 88a42a1..363941a 100644 --- a/ambari-agent/src/packages/tarball/all.xml +++ b/ambari-agent/src/packages/tarball/all.xml @@ -140,6 +140,16 @@ --> <files> <file> + <fileMode>644</fileMode> + <source>${basedir}/target/zkmigrator.jar</source> + <outputDirectory>/var/lib/ambari-agent/tools</outputDirectory> + </file> + <file> + <fileMode>644</fileMode> + <source>${basedir}/target/jcepolicyinfo.jar</source> + <outputDirectory>/var/lib/ambari-agent/tools</outputDirectory> + </file> + <file> <fileMode>755</fileMode> <source>conf/unix/ambari-sudo.sh</source> <outputDirectory>/var/lib/ambari-agent/</outputDirectory>
