---

Ajay Kannan · Ajay Kannan · commit d7a7c86e66da · 2015-08-24T12:53:15.000-07:00
yaml --- r: 6105 b: refs/heads/tswast-patch-1 c: 63d01ce h: refs/heads/master i: 6103: 2871624
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: c02fe27836b24f29be0fef075ab41dccff34780c
+refs/heads/tswast-patch-1: 63d01ce437641850633c63bdcbf9720489413698
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -154,7 +154,7 @@ public B serviceRpcFactory(ServiceRpcFactory<ServiceRpcT, OptionsT> serviceRpcFa
 
   protected ServiceOptions(Builder<ServiceRpcT, OptionsT, ?> builder) {
     projectId = checkNotNull(builder.projectId != null ? builder.projectId : defaultProject());
-    host = firstNonNull(builder.host, defaultHost());
+    host = firstNonNull(builder.host, DEFAULT_HOST);
     httpTransportFactory =
         firstNonNull(builder.httpTransportFactory, DefaultHttpTransportFactory.INSTANCE);
     authCredentials = firstNonNull(builder.authCredentials, defaultAuthCredentials());
@@ -191,10 +191,6 @@ protected static String appEngineAppId() {
     return System.getProperty("com.google.appengine.application.id");
   }
 
-  protected String defaultHost() {
-    return DEFAULT_HOST;
-  }
-
   protected String defaultProject() {
     String projectId = System.getProperty(PROJECT_ENV_NAME, System.getenv(PROJECT_ENV_NAME));
     if (projectId == null) {
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -38,7 +38,6 @@ public class DatastoreOptions extends ServiceOptions<DatastoreRpc, DatastoreOpti
 
   private static final long serialVersionUID = -8636602944160689193L;
   private static final String DATASET_ENV_NAME = "DATASTORE_DATASET";
-  private static final String HOST_ENV_NAME = "DATASTORE_HOST";
   private static final String DATASTORE_SCOPE = "https://www.googleapis.com/auth/datastore";
   private static final String USERINFO_SCOPE = "https://www.googleapis.com/auth/userinfo.email";
   private static final Set<String> SCOPES = ImmutableSet.of(DATASTORE_SCOPE, USERINFO_SCOPE);
@@ -123,12 +122,6 @@ private DatastoreOptions normalize() {
     }
   }
 
-  @Override
-  protected String defaultHost() {
-    String host = System.getProperty(HOST_ENV_NAME, System.getenv(HOST_ENV_NAME));
-    return host != null ? host : super.defaultHost();
-  }
-
   @Override
   protected String defaultProject() {
     String projectId = System.getProperty(DATASET_ENV_NAME, System.getenv(DATASET_ENV_NAME));
diff --git a/branches/tswast-patch-1/src/site/resources/index.html b/branches/tswast-patch-1/src/site/resources/index.html
@@ -62,7 +62,7 @@ <h2>Quickstart with Maven: Add gcloud to your pom.xml</h2>
                         <pre>&lt;dependency&gt;
   &lt;groupId&gt;com.google.gcloud&lt;/groupId&gt;
   &lt;artifactId&gt;gcloud-java&lt;/artifactId&gt;
-  &lt;version&gt;0.0.6&lt;/version&gt;
+  &lt;version&gt;{{SITE_VERSION}}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                     </div><!-- end of .col.col-right -->
                 </div><!-- end of .container -->
diff --git a/branches/tswast-patch-1/utilities/after_success.sh b/branches/tswast-patch-1/utilities/after_success.sh
@@ -10,6 +10,28 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
     mvn cobertura:cobertura coveralls:report
     mvn site-deploy -DskipTests=true --settings=target/travis/settings.xml
     mvn deploy -DskipTests=true -Dgpg.skip=true --settings target/travis/settings.xml
+
+    # Update "site/latest/index.html" to redirect to the newly generated website (if not a SNAPSHOT)
+    git config --global user.name "travis-ci"
+    git config --global user.email "travis@travis-ci.org"
+    git clone https://github.com/GoogleCloudPlatform/gcloud-java.git tmp_gh-pages
+    cd tmp_gh-pages
+    SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|Download\w+:)')
+    if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
+        git checkout gh-pages
+        mkdir -p site/latest/
+        touch site/latest/index.html
+        echo "<html><head><meta http-equiv=\"refresh\" content=\"0; URL='http://GoogleCloudPlatform.github.io/gcloud-java/site/${SITE_VERSION}/index.html'\" /></head><body></body></html>" > 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 "Updating to reflect latest website version"
+        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
+    fi
 else
     echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."
 fi
