Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13666 Correct PDF renaming and bump version of maven-antrun-plugin

This commit is contained in:
Gábor Lipták 2015-06-04 19:11:15 -04:00 committed by Nick Dimiduk
parent 623fd63827
commit 624a169d9d
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-support/make_rc.sh
View File

@ -55,7 +55,7 @@ function tgz_mover {
function deploy { function deploy {
MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease
MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests site assembly:single -Prelease MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single -Prelease
tgz_mover tgz_mover
MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release
} }

4
dev-support/publish_hbase_website.sh
View File

@ -88,7 +88,7 @@ if [ $INTERACTIVE ]; then
read -p "Build the site? (y/n)" yn read -p "Build the site? (y/n)" yn
case $yn in case $yn in
[Yy]* ) [Yy]* )
mvn clean package javadoc:aggregate site post-site site:stage -DskipTests mvn clean package javadoc:aggregate post-site site:stage -DskipTests
status=$? status=$?
if [ $status -ne 0 ]; then if [ $status -ne 0 ]; then
echo "The website does not build. Aborting." echo "The website does not build. Aborting."
@ -101,7 +101,7 @@ if [ $INTERACTIVE ]; then
esac esac
else else
echo "Building the site in auto mode." echo "Building the site in auto mode."
mvn clean package javadoc:aggregate site post-site site:stage -DskipTests mvn clean package javadoc:aggregate post-site site:stage -DskipTests
status=$? status=$?
if [ $status != 0 ]; then if [ $status != 0 ]; then
echo "The website does not build. Aborting." echo "The website does not build. Aborting."

8
dev-support/test-patch.sh
View File

@ -901,18 +901,18 @@ checkSiteXml () {
echo "" echo ""
echo "" echo ""
echo "$MVN package site -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchSiteOutput.txt 2>&1" echo "$MVN package post-site -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchSiteOutput.txt 2>&1"
export MAVEN_OPTS="${MAVEN_OPTS}" export MAVEN_OPTS="${MAVEN_OPTS}"
$MVN package site -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchSiteOutput.txt 2>&1 $MVN package post-site -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchSiteOutput.txt 2>&1
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT JIRA_COMMENT="$JIRA_COMMENT
{color:red}-1 site{color}. The patch appears to cause mvn site goal to fail." {color:red}-1 site{color}. The patch appears to cause mvn post-site goal to fail."
return 1 return 1
fi fi
JIRA_COMMENT="$JIRA_COMMENT JIRA_COMMENT="$JIRA_COMMENT
{color:green}+1 site{color}. The mvn site goal succeeds with this patch." {color:green}+1 site{color}. The mvn post-site goal succeeds with this patch."
return 0 return 0
} }

5
pom.xml
View File

@ -1080,6 +1080,7 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.version}</version> <version>${maven.antrun.version}</version>
<inherited>false</inherited> <inherited>false</inherited>
@ -1191,7 +1192,7 @@
<bouncycastle.version>1.46</bouncycastle.version> <bouncycastle.version>1.46</bouncycastle.version>
<!-- Plugin Dependencies --> <!-- Plugin Dependencies -->
<maven.assembly.version>2.4</maven.assembly.version> <maven.assembly.version>2.4</maven.assembly.version>
<maven.antrun.version>1.6</maven.antrun.version> <maven.antrun.version>1.8</maven.antrun.version>
<jamon.plugin.version>2.3.4</jamon.plugin.version> <jamon.plugin.version>2.3.4</jamon.plugin.version>
<findbugs-annotations>1.3.9-1</findbugs-annotations> <findbugs-annotations>1.3.9-1</findbugs-annotations>
<javadoc.version>2.9</javadoc.version> <javadoc.version>2.9</javadoc.version>
@ -1794,7 +1795,7 @@
</goals> </goals>
<configuration> <configuration>
<tasks> <tasks>
<echo>Maven Exceution Environment</echo> <echo>Maven Execution Environment</echo>
<echo>MAVEN_OPTS="${env.MAVEN_OPTS}"</echo> <echo>MAVEN_OPTS="${env.MAVEN_OPTS}"</echo>
</tasks> </tasks>
</configuration> </configuration>