HBASE-20389 Move website building flags into a profile.

Signed-off-by: Mike Drob <mdrob@apache.org>
This commit is contained in:
Sean Busbey 2018-04-12 21:55:27 -05:00
parent f695ecb2db
commit 7b7a2222b6
3 changed files with 113 additions and 62 deletions

View File

@ -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 # 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. # compiling in the forked executions. We have to do it awkwardly because MJAVADOC-444.
if mvn \ if mvn \
-DskipTests \
-Dmaven.javadoc.skip=true \
--batch-mode \ --batch-mode \
-Denforcer.skip=true \ -Psite-install-step \
-Dcheckstyle.skip=true \
-Dfindbugs.skip=true \
--log-file="${working_dir}/hbase-install-log-${CURRENT_HBASE_COMMIT}.txt" \ --log-file="${working_dir}/hbase-install-log-${CURRENT_HBASE_COMMIT}.txt" \
clean install \ clean install \
&& mvn site \ && mvn site \
--batch-mode \ --batch-mode \
-Denforcer.skip=true \ -Dscala.skip=true \
-Dmaven.main.skip=true \ -Psite-build-step \
-Dmaven.test.skip=true \
-DskipTests \
--log-file="${working_dir}/hbase-site-log-${CURRENT_HBASE_COMMIT}.txt"; then --log-file="${working_dir}/hbase-site-log-${CURRENT_HBASE_COMMIT}.txt"; then
echo "Successfully built site." echo "Successfully built site."
else else

View File

@ -430,59 +430,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<scalaVersion>${scala.version}</scalaVersion>
<args>
<arg>-feature</arg>
</args>
</configuration>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
<parallel>false</parallel>
</configuration>
<executions>
<execution>
<id>test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<argLine>-Xmx1536m -XX:ReservedCodeCacheSize=512m</argLine>
<parallel>false</parallel>
</configuration>
</execution>
</executions>
</plugin>
<!-- clover fails due to scala/java cross compile. This guarantees that the scala is <!-- clover fails due to scala/java cross compile. This guarantees that the scala is
compiled before the java that will be evaluated by code coverage (scala will not be). compiled before the java that will be evaluated by code coverage (scala will not be).
https://confluence.atlassian.com/display/CLOVERKB/Java-+Scala+cross-compilation+error+-+cannot+find+symbol https://confluence.atlassian.com/display/CLOVERKB/Java-+Scala+cross-compilation+error+-+cannot+find+symbol
@ -692,5 +639,77 @@
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<!-- Attempt to skip scala-maven-plugin work, see
https://github.com/davidB/scala-maven-plugin/issues/198
-->
<!-- 'scala.skip' is used by the website generation script on jenkins to
mitigate the impact of unneeded build forks while building our javadocs.
-->
<profile>
<id>build-scala-sources</id>
<activation>
<property>
<name>scala.skip</name>
<value>!true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<scalaVersion>${scala.version}</scalaVersion>
<args>
<arg>-feature</arg>
</args>
</configuration>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
<parallel>false</parallel>
</configuration>
<executions>
<execution>
<id>test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<argLine>-Xmx1536m -XX:ReservedCodeCacheSize=512m</argLine>
<parallel>false</parallel>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>

38
pom.xml
View File

@ -3478,6 +3478,44 @@
</plugins> </plugins>
</build> </build>
</profile> </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>
<!-- Because the scala-maven-plugin has no skip configuration option
this configuration setting here won't actually do anything.
However, if you pass it on the command line it'll activate
a profile in hbase-spark/pom.xml that will skip things.
-->
<scala.skip>true</scala.skip>
</properties>
</profile>
</profiles> </profiles>
<!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. --> <!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. -->
<reporting> <reporting>