You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2015/06/18 04:47:51 UTC
[1/2] hbase git commit: HBASE-13666 Correct PDF renaming and bump
version of maven-antrun-plugin
Repository: hbase
Updated Branches:
refs/heads/master 623fd6382 -> 41d9e8d9b
HBASE-13666 Correct PDF renaming and bump version of maven-antrun-plugin
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/624a169d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/624a169d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/624a169d
Branch: refs/heads/master
Commit: 624a169d9d4f9516f6514be9666cf00e6f8f59a7
Parents: 623fd63
Author: Gábor Lipták <gl...@gmail.com>
Authored: Thu Jun 4 19:11:15 2015 -0400
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Wed Jun 17 18:58:28 2015 -0700
----------------------------------------------------------------------
dev-support/make_rc.sh | 2 +-
dev-support/publish_hbase_website.sh | 4 ++--
dev-support/test-patch.sh | 8 ++++----
pom.xml | 5 +++--
4 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/624a169d/dev-support/make_rc.sh
----------------------------------------------------------------------
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 4c5c12d..4892252 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -55,7 +55,7 @@ function tgz_mover {
function deploy {
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
MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/624a169d/dev-support/publish_hbase_website.sh
----------------------------------------------------------------------
diff --git a/dev-support/publish_hbase_website.sh b/dev-support/publish_hbase_website.sh
index 072de8d..8da18e7 100755
--- a/dev-support/publish_hbase_website.sh
+++ b/dev-support/publish_hbase_website.sh
@@ -88,7 +88,7 @@ if [ $INTERACTIVE ]; then
read -p "Build the site? (y/n)" yn
case $yn in
[Yy]* )
- mvn clean package javadoc:aggregate site post-site site:stage -DskipTests
+ mvn clean package javadoc:aggregate post-site site:stage -DskipTests
status=$?
if [ $status -ne 0 ]; then
echo "The website does not build. Aborting."
@@ -101,7 +101,7 @@ if [ $INTERACTIVE ]; then
esac
else
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=$?
if [ $status != 0 ]; then
echo "The website does not build. Aborting."
http://git-wip-us.apache.org/repos/asf/hbase/blob/624a169d/dev-support/test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 701b426..e7c98ce 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -901,18 +901,18 @@ checkSiteXml () {
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}"
- $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
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
fi
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
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/624a169d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 492365a..b9d0ef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1080,6 +1080,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.version}</version>
<inherited>false</inherited>
@@ -1191,7 +1192,7 @@
<bouncycastle.version>1.46</bouncycastle.version>
<!-- Plugin Dependencies -->
<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>
<findbugs-annotations>1.3.9-1</findbugs-annotations>
<javadoc.version>2.9</javadoc.version>
@@ -1794,7 +1795,7 @@
</goals>
<configuration>
<tasks>
- <echo>Maven Exceution Environment</echo>
+ <echo>Maven Execution Environment</echo>
<echo>MAVEN_OPTS="${env.MAVEN_OPTS}"</echo>
</tasks>
</configuration>
[2/2] hbase git commit: HBASE-13929 make_rc.sh publishes empty shaded
artifacts
Posted by nd...@apache.org.
HBASE-13929 make_rc.sh publishes empty shaded artifacts
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/41d9e8d9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/41d9e8d9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/41d9e8d9
Branch: refs/heads/master
Commit: 41d9e8d9b4895d0711f006d926a39e5ae3bd7c9d
Parents: 624a169
Author: Nick Dimiduk <nd...@apache.org>
Authored: Wed Jun 17 19:38:38 2015 -0700
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Wed Jun 17 19:39:06 2015 -0700
----------------------------------------------------------------------
dev-support/make_rc.sh | 2 +-
src/main/asciidoc/_chapters/developer.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/41d9e8d9/dev-support/make_rc.sh
----------------------------------------------------------------------
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 4892252..0d0319b 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -57,7 +57,7 @@ function deploy {
MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease
MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests post-site assembly:single -Prelease
tgz_mover
- MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release
+ MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release -Prelease
}
# Build src tarball
http://git-wip-us.apache.org/repos/asf/hbase/blob/41d9e8d9/src/main/asciidoc/_chapters/developer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc
index ce66a90..984d4b8 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -643,7 +643,7 @@ This profile invokes the Apache pom referenced by our pom files, and also signs
[source,bourne]
----
-$ mvn deploy -DskipTests -Papache-release
+$ mvn deploy -DskipTests -Papache-release -Prelease
----
+
This command copies all artifacts up to a temporary staging Apache mvn repository in an 'open' state.