You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2015/04/15 21:50:09 UTC
[35/50] [abbrv] incubator-lens git commit: LENS-398 : Move enunciate
to profile activated by jdk version (Raju Bairishetti via amareshwari)
LENS-398 : Move enunciate to profile activated by jdk version (Raju Bairishetti via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/44f4664c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/44f4664c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/44f4664c
Branch: refs/heads/current-release-line
Commit: 44f4664c73f7ed6d8e2c7953ec59e0089aeb2c74
Parents: e90dc33
Author: Raju Bairishetti <ra...@gmail.com>
Authored: Thu Apr 9 06:44:35 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Apr 9 06:44:35 2015 +0530
----------------------------------------------------------------------
lens-server/pom.xml | 41 +++++++++++++++++++-----------
pom.xml | 15 +++++++++++
tools/scripts/generate-site-public.sh | 4 +--
3 files changed, 42 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44f4664c/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index efac8b5..d7752d7 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -310,22 +310,33 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>docs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <configFile>enunciate.xml</configFile>
- </configuration>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>enunciate</id>
+ <activation>
+ <jdk>[1.6,1.7,1.8)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.enunciate</groupId>
+ <artifactId>maven-enunciate-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>docs</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <configFile>enunciate.xml</configFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44f4664c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f306ee0..00bca47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1239,5 +1239,20 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>enunciate</id>
+ <activation>
+ <jdk>[1.6,1.7,1.8)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.enunciate</groupId>
+ <artifactId>maven-enunciate-plugin</artifactId>
+ <version>${enunciate.plugin.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/44f4664c/tools/scripts/generate-site-public.sh
----------------------------------------------------------------------
diff --git a/tools/scripts/generate-site-public.sh b/tools/scripts/generate-site-public.sh
index 55307ee..8c67952 100755
--- a/tools/scripts/generate-site-public.sh
+++ b/tools/scripts/generate-site-public.sh
@@ -45,9 +45,7 @@ echo "Running site in current lens branch" $CURR_BRANCH
mvn clean test -Dtest=TestGenerateConfigDoc || die "Unable to generate config docs"
mvn install -DskipTests
mvn site site:stage -Ddependency.locations.enabled=false -Ddependency.details.enabled=false || die "unable to generate site"
-cd lens-server
-mvn enunciate:docs
-cd ..
+
echo "Site gen complete"
rm -rf $TMP || die "unable to clear $TMP"