From 5289b5f9dec4ae1f1333abae194cd2b6aa27667b Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Thu, 12 Apr 2018 21:55:27 -0500 Subject: [PATCH] HBASE-20389 Move website building flags into a profile. --- .../jenkins-scripts/generate-hbase-website.sh | 12 +- hbase-spark/pom.xml | 125 ++++++++++++--------- pom.xml | 38 +++++++ 3 files changed, 113 insertions(+), 62 deletions(-) diff --git a/dev-support/jenkins-scripts/generate-hbase-website.sh b/dev-support/jenkins-scripts/generate-hbase-website.sh index b6277d0b2c..24b708bacd 100644 --- a/dev-support/jenkins-scripts/generate-hbase-website.sh +++ b/dev-support/jenkins-scripts/generate-hbase-website.sh @@ -173,20 +173,14 @@ 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 \ + -Dscala.skip=true \ + -Psite-build-step \ --log-file="${working_dir}/hbase-site-log-${CURRENT_HBASE_COMMIT}.txt"; then echo "Successfully built site." else diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index 05fd779415..7654be49bd 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -430,59 +430,6 @@ org.apache.maven.plugins maven-compiler-plugin - - net.alchim31.maven - scala-maven-plugin - 3.2.0 - - ${project.build.sourceEncoding} - ${scala.version} - - -feature - - - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - org.scalatest - scalatest-maven-plugin - 1.0 - - ${project.build.directory}/surefire-reports - . - WDF TestSuite.txt - false - - - - test - test - - test - - - -Xmx1536m -XX:ReservedCodeCacheSize=512m - false - - - - + + + build-scala-sources + + + scala.skip + !true + + + + + + net.alchim31.maven + scala-maven-plugin + 3.2.0 + + ${project.build.sourceEncoding} + ${scala.version} + + -feature + + + + + scala-compile-first + process-resources + + add-source + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + + org.scalatest + scalatest-maven-plugin + 1.0 + + ${project.build.directory}/surefire-reports + . + WDF TestSuite.txt + false + + + + test + test + + test + + + -Xmx1536m -XX:ReservedCodeCacheSize=512m + false + + + + + + + diff --git a/pom.xml b/pom.xml index e3a4ec85ce..f8f1150f29 100755 --- a/pom.xml +++ b/pom.xml @@ -3478,6 +3478,44 @@ + + + site-install-step + + true + true + true + true + true + true + + + + + site-build-step + + true + true + true + true + true + true + true + + true + + -- 2.16.1