HBASE-20389 Move website building flags into a profile.
Signed-off-by: Mike Drob <md...@apache.org>
Conflicts:
hbase-spark/pom.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4de3d7de
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4de3d7de
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4de3d7de
Branch: refs/heads/branch-2.0
Commit: 4de3d7deefd536025abf2ee81517e8035082274c
Parents: 4176237
Author: Sean Busbey <bus...@apache.org>
Authored: Thu Apr 12 21:55:27 2018 -0500
Committer: Sean Busbey <bus...@apache.org>
Committed: Fri Apr 13 23:16:37 2018 -0500
----------------------------------------------------------------------
.../jenkins-scripts/generate-hbase-website.sh | 11 ++-----
pom.xml | 31 ++++++++++++++++++++
2 files changed, 33 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4de3d7de/dev-support/jenkins-scripts/generate-hbase-website.sh
----------------------------------------------------------------------
diff --git a/dev-support/jenkins-scripts/generate-hbase-website.sh
b/dev-support/jenkins-scripts/generate-hbase-website.sh
index b6277d0..0ef9b2d 100644
--- a/dev-support/jenkins-scripts/generate-hbase-website.sh
+++ b/dev-support/jenkins-scripts/generate-hbase-website.sh
@@ -173,20 +173,13 @@ echo "Building HBase"
# But! some sunshine: because we're doing a full install before running site,
we can skip all the
# compiling in the forked executions. We have to do it awkwardly because
MJAVADOC-444.
if mvn \
- -DskipTests \
- -Dmaven.javadoc.skip=true \
--batch-mode \
- -Denforcer.skip=true \
- -Dcheckstyle.skip=true \
- -Dfindbugs.skip=true \
+ -Psite-install-step \
--log-file="${working_dir}/hbase-install-log-${CURRENT_HBASE_COMMIT}.txt" \
clean install \
&& mvn site \
--batch-mode \
- -Denforcer.skip=true \
- -Dmaven.main.skip=true \
- -Dmaven.test.skip=true \
- -DskipTests \
+ -Psite-build-step \
--log-file="${working_dir}/hbase-site-log-${CURRENT_HBASE_COMMIT}.txt";
then
echo "Successfully built site."
else
http://git-wip-us.apache.org/repos/asf/hbase/blob/4de3d7de/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3fe436b..8224f64 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3375,6 +3375,37 @@
</plugins>
</build>
</profile>
+ <profile>
+ <!-- Used by the website generation script on jenkins to
+ do a local install of the jars we need to run a normal
+ site build w/o forking.
+ -->
+ <id>site-install-step</id>
+ <properties>
+ <skipTests>true</skipTests>
+ <maven.javadoc.skip>true</maven.javadoc.skip>
+ <enforcer.skip>true</enforcer.skip>
+ <checkstyle.skip>true</checkstyle.skip>
+ <findbugs.skip>true</findbugs.skip>
+ <warbucks.skip>true</warbucks.skip>
+ </properties>
+ </profile>
+ <profile>
+ <!-- Used by the website generation script on jenkins to
+ mitigate the impact of unneeded build forks while building
+ our javadocs.
+ -->
+ <id>site-build-step</id>
+ <properties>
+ <skipTests>true</skipTests>
+ <enforcer.skip>true</enforcer.skip>
+ <maven.main.skip>true</maven.main.skip>
+ <maven.test.skip>true</maven.test.skip>
+ <warbucks.skip>true</warbucks.skip>
+ <protoc.skip>true</protoc.skip>
+ <remoteresources.skip>true</remoteresources.skip>
+ </properties>
+ </profile>
</profiles>
<!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to
be here and not in pluginManagement. -->
<reporting>
