You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/04/14 03:44:43 UTC
[2/2] hbase git commit: HBASE-20389 Move website building flags into
a profile.
HBASE-20389 Move website building flags into a profile.
Signed-off-by: Mike Drob <md...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7b7a2222
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7b7a2222
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7b7a2222
Branch: refs/heads/master
Commit: 7b7a2222b6ed842735b47016ba9a6fb68960177f
Parents: f695ecb
Author: Sean Busbey <bu...@apache.org>
Authored: Thu Apr 12 21:55:27 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Apr 13 22:43:19 2018 -0500
----------------------------------------------------------------------
.../jenkins-scripts/generate-hbase-website.sh | 12 +-
hbase-spark/pom.xml | 125 +++++++++++--------
pom.xml | 38 ++++++
3 files changed, 113 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7b7a2222/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..24b708b 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
http://git-wip-us.apache.org/repos/asf/hbase/blob/7b7a2222/hbase-spark/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml
index 05fd779..7654be4 100644
--- a/hbase-spark/pom.xml
+++ b/hbase-spark/pom.xml
@@ -430,59 +430,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</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
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
@@ -692,5 +639,77 @@
</dependency>
</dependencies>
</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>
</project>
http://git-wip-us.apache.org/repos/asf/hbase/blob/7b7a2222/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e3a4ec8..f8f1150 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3478,6 +3478,44 @@
</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>
+ <!-- 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>
<!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. -->
<reporting>