You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/19 20:16:34 UTC
[12/25] ambari git commit: AMBARI-21273. Swagger resources generation
for doc purpose should not be part of default maven profile. (jaimin)
AMBARI-21273. Swagger resources generation for doc purpose should not be part of default maven profile. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8908501
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8908501
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8908501
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: e8908501b27c650f39cbe1386427581a65f8c6e1
Parents: 8f2663b
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Jun 16 14:02:51 2017 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Jun 16 14:03:17 2017 -0700
----------------------------------------------------------------------
ambari-server/pom.xml | 61 +++++++++++++++++++++++++++++-----------------
1 file changed, 39 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8908501/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 91c35e5..d4416a3 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -35,8 +35,8 @@
<resource_management.install.dir>/usr/lib/ambari-server/lib/resource_management</resource_management.install.dir>
<jinja.install.dir>/usr/lib/ambari-server/lib/ambari_jinja2</jinja.install.dir>
<simplejson.install.dir>/usr/lib/ambari-server/lib/ambari_simplejson</simplejson.install.dir>
- <swagger.spec.dir>docs/api/generated/</swagger.spec.dir>
- <swagger.generated.resources.dir>${project.build.directory}/generated-sources/swagger</swagger.generated.resources.dir>
+ <swagger.spec.dir>${basedir}/docs/api/generated/</swagger.spec.dir>
+ <swagger.generated.resources.dir>${project.build.directory}/generated-sources/swagger/</swagger.generated.resources.dir>
<ambari-web-dir>${basedir}/../ambari-web/public</ambari-web-dir>
<ambari-admin-dir>${basedir}/../ambari-admin</ambari-admin-dir>
<contrib-views-dir>${basedir}/../contrib/views</contrib-views-dir>
@@ -267,7 +267,7 @@
<outputDirectory>${ambari-web-dir}/api-docs</outputDirectory>
<resources>
<resource>
- <directory>${swagger.spec.dir}/</directory>
+ <directory>${swagger.generated.resources.dir}</directory>
<includes>
<include>swagger.json</include>
</includes>
@@ -275,24 +275,6 @@
</resources>
</configuration>
</execution>
- <execution>
- <id>copy-swagger-generated-html</id>
- <phase>process-classes</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${swagger.spec.dir}</outputDirectory>
- <resources>
- <resource>
- <directory>${swagger.generated.resources.dir}/</directory>
- <includes>
- <include>index.html</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -429,7 +411,7 @@
<name>Apache License, Version 2.0</name>
</license>
</info>
- <swaggerDirectory>${swagger.spec.dir}</swaggerDirectory>
+ <swaggerDirectory>${swagger.generated.resources.dir}</swaggerDirectory>
</apiSource>
</apiSources>
</configuration>
@@ -922,6 +904,41 @@
</properties>
</profile>
<profile>
+ <id>copy-swagger-generated-resources</id>
+ <activation>
+ <property><name>generate.swagger.resources</name></property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-swagger-generated-html</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${swagger.spec.dir}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${swagger.generated.resources.dir}/</directory>
+ <includes>
+ <include>index.html</include>
+ <include>swagger.json</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>windows</id>
<activation>
<os>