diff --git a/pom.xml b/pom.xml index a96c0b5c67ae..660ca29cc15f 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ github-pages-site Deployment through GitHub's site deployment plugin - site/${project.version}/ + ${project.version}/ @@ -372,25 +372,6 @@ - - com.github.github - site-maven-plugin - 0.12 - - Creating site for ${project.artifactId} ${project.version} - ${project.distributionManagement.site.url} - true - - - - github-site - - site - - site-deploy - - - diff --git a/utilities/after_success.sh b/utilities/after_success.sh index 883b7518f942..46ac33dce9de 100755 --- a/utilities/after_success.sh +++ b/utilities/after_success.sh @@ -9,25 +9,22 @@ echo "Travis JDK version: " ${TRAVIS_JDK_VERSION} if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then mvn cobertura:cobertura coveralls:report - # Deploy site if not a SNAPSHOT SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)') if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then - mvn site-deploy -DskipTests=true --settings=target/travis/settings.xml - - # Update "latest" webpage + # Deploy site if not a SNAPSHOT git config --global user.name "travis-ci" git config --global user.email "travis@travis-ci.org" git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/gcloud-java/ tmp_gh-pages + mkdir -p tmp_gh-pages/$SITE_VERSION + mvn site -DskipTests=true + mvn site:stage -DtopSiteURL=http://googlecloudplatform.github.io/gcloud-java/site/${SITE_VERSION}/ cd tmp_gh-pages - mkdir -p site/latest/ - echo "" > site/latest/index.html - git add site/latest/index.html - - # Update "Quickstart with Maven" block on landing page to reflect latest version - sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" site/${SITE_VERSION}/index.html - git add site/${SITE_VERSION}/index.html - - git commit -m "Update the redirect in 'latest/index.html' and the version in the 'Quickstart with Maven' landing page box to $SITE_VERSION" + cp -r ../target/staging/$SITE_VERSION/* $SITE_VERSION/ + sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${SITE_VERSION}/index.html # Update "Quickstart with Maven" to reflect version change + git add $SITE_VERSION + echo "" > index.html + git add index.html + git commit -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect." git config --global push.default simple git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" > /dev/null 2>&1 else