From c05b937f79248c67056b89195445459035fc5521 Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthurthompson@google.com>
Date: Wed, 13 Jan 2016 21:29:16 -0800
Subject: [PATCH 1/6] Allow travis to stage release build

---
 .travis.yml                                 |   7 ++-
 client-libraries/java/rest-client/build.xml |  55 ++++++++++++++++++--
 client-libraries/java/rest-client/pom.xml   |   2 +-
 settings.xml                                |  13 +++++
 sign.key.enc                                | Bin 0 -> 5472 bytes
 5 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 sign.key.enc

diff --git a/.travis.yml b/.travis.yml
index 1d09c13..0f9e907 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
 language: java
 script:
 - ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib
-  deploy
+  stage
 before_install:
+- openssl aes-256-cbc -K $encrypted_8864fe5d711d_key -iv $encrypted_8864fe5d711d_iv
+  -in sign.key.enc -out sign.key -d
+- gpg --import sign.key
 - cp settings.xml ${HOME}/.m2/settings.xml
 after_success:
 - echo "deploy completed."
@@ -13,3 +16,5 @@ env:
   global:
   - secure: JLi7Nhp/kr5Nv8e3Ldg0jEyitvjSljZwNLlR5SHphvUlV7POvVNqXJ994358wySD9sDEFCupHdO5sCmIkw4f9rQfEOB7uCWVr3qBR7qalQAeSCSjxkPAZMB7oZZrlgBR+aviwiUHlElVB+Qn6QtUWZfwT5qmCzKDTFTPiDaby2s=
   - secure: MN7EKwGBOUQ9FDA4TXnq4lDprIBXmkXHMsp6jSBhdyXaZt0ix/FcmCqCYNumxrAVxquHRmcgb6hI5EuqZNHfI0hTvhbPGG9MIKweMNzWC3O9Lw44ufvog2wa2Xa/+hJDHNSLsL5HiF4sWy//V7/GcfYnIpdl/GN43dKBsd8FooQ=
+  - secure: Me3raHMfhxGb9nYnxBSBW+vAzsw1Aq+pAajwmbqXonr6L9Qq4hRAd07g7NavPw3sGGeLpTe9s0TzKnEAi01DmTLcAu+CWTaBjSxUlNXZHGdUBl3czOpjcm4iqw86HPAlxb+ZkqBRmHe24w/kJY6oqIOo+9Zj4lw09QAUYflLqvI=
+  - secure: bvJg8pV4qPqbuh+BX3QxyZcCZmdJGD5VQnzMRz/9F1enonfuwJfbPqerScDONgOYl8V0P+Q1NN8HOa/SkjHp7IeVqJmWHFhfM1r3uahck/6fGO+FsfWqjBfjpRx7QDNPq3hKXVLoRBmNBlnQxoMpzOogiszWXOG22BLr511DdZM=
diff --git a/client-libraries/java/rest-client/build.xml b/client-libraries/java/rest-client/build.xml
index 24a63ad..5858e9e 100644
--- a/client-libraries/java/rest-client/build.xml
+++ b/client-libraries/java/rest-client/build.xml
@@ -16,7 +16,6 @@
 -->
 <project name="gcm-server" default="dist" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
-  <property name="version" value="dev"/>
   <property name="src" location="src"/>
   <property name="test" location="test"/>
   <property name="lib"  location="lib"/>
@@ -30,7 +29,7 @@
   <!-- define Maven coordinates -->
   <property name="groupId" value="com.google.gcm" />
   <property name="artifactId" value="gcm-server" />
-  <property name="version" value="1.0-SNAPSHOT" />
+  <property name="version" value="1.0.0" />
   <!-- define artifacts' name, which follows the convention of Maven -->
   <property name="jar" value="${dist}/${artifactId}-${version}.jar" />
   <property name="javadoc-jar" value="${dist}/${artifactId}-${version}-javadoc.jar"/>
@@ -38,6 +37,8 @@
   <!-- defined maven snapshots and staging repository id and url -->
   <property name="ossrh-snapshots-repository-url"
             value="https://oss.sonatype.org/content/repositories/snapshots" />
+  <property name="ossrh-staging-repository-url"
+            value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
   <!-- there server id in the Maven settings.xml -->
   <property name="ossrh-server-id" value="ossrh" />
 
@@ -114,6 +115,20 @@
     </antcall>
   </target>
 
+  <target name="doc" depends="compile, tests" description="generate documentation">
+    <javadoc sourcepath="${src}" destdir="${dist}/javadoc">
+      <classpath>
+        <fileset dir="${lib}">
+          <include name="json_simple-1.1.jar"/>
+        </fileset>
+      </classpath>
+    </javadoc>
+  </target>
+
+  <target name="javadoc-jar" depends="doc" description="generate doc jar">
+    <jar destfile="${javadoc-jar}" basedir="${dist}/javadoc"/>
+  </target>
+
   <target name="_jar">
     <jar destfile="${_destfile}" basedir="${_basedir}">
       <manifest>
@@ -125,7 +140,7 @@
     </jar>
   </target>
 
-  <target name="dist" depends="jar, src-jar" description="Generate all artifacts."/>
+  <target name="dist" depends="jar, src-jar, javadoc-jar" description="Generate all artifacts."/>
 
   <target name="update-demo" depends="jar" description="Generates a new GCM server library JAR and copy it to the demo project.">
     <copy file="${jar}" todir="${demo-dir}/WebContent/WEB-INF/lib"/>
@@ -142,4 +157,38 @@
       <arg value="-e" />
     </artifact:mvn>
   </target>
+
+  <!-- before this, update project version (both build.xml and pom.xml) from SNAPSHOT to RELEASE -->
+  <target name="stage" depends="dist" description="deploy release version to Maven staging repository">
+    <!-- sign and deploy the main artifact -->
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+      <arg value="-Durl=${ossrh-staging-repository-url}" />
+      <arg value="-DrepositoryId=${ossrh-server-id}" />
+      <arg value="-DpomFile=client-libraries/java/rest-client/pom.xml" />
+      <arg value="-Dfile=${jar}" />
+      <arg value="-Pgpg" />
+    </artifact:mvn>
+    <!-- sign and deploy the sources artifact -->
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+      <arg value="-Durl=${ossrh-staging-repository-url}" />
+      <arg value="-DrepositoryId=${ossrh-server-id}" />
+      <arg value="-DpomFile=client-libraries/java/rest-client/pom.xml" />
+      <arg value="-Dfile=${sources-jar}" />
+      <arg value="-Dclassifier=sources" />
+      <arg value="-Pgpg" />
+    </artifact:mvn>
+    <!-- sign and deploy the javadoc artifact -->
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+      <arg value="-Durl=${ossrh-staging-repository-url}" />
+      <arg value="-DrepositoryId=${ossrh-server-id}" />
+      <arg value="-DpomFile=client-libraries/java/rest-client/pom.xml" />
+      <arg value="-Dfile=${javadoc-jar}" />
+      <arg value="-Dclassifier=javadoc" />
+      <arg value="-Pgpg" />
+    </artifact:mvn>
+  </target>
+
 </project>
diff --git a/client-libraries/java/rest-client/pom.xml b/client-libraries/java/rest-client/pom.xml
index 821edb4..90d56d4 100644
--- a/client-libraries/java/rest-client/pom.xml
+++ b/client-libraries/java/rest-client/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.gcm</groupId>
     <artifactId>gcm-server</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
     <name>GCM Java Server Client Library</name>
     <description>Manage GCM on server</description>
diff --git a/settings.xml b/settings.xml
index 2345142..fe72e6f 100644
--- a/settings.xml
+++ b/settings.xml
@@ -6,4 +6,17 @@
       <password>${env.CI_DEPLOY_PASSWORD}</password>
     </server>
   </servers>
+  <profiles>
+    <profile>
+      <id>gpg</id>
+      <properties>
+        <!-- Optionally specify a different path and name for the gpg executable
+              if it differs from the default of "gpg"
+        <gpg.executable>gpg2</gpg.executable>
+        -->
+        <gpg.keyname>${env.GPG_KEY_ID}</gpg.keyname>
+        <gpg.passphrase>${env.GPG_KEY_PASSPHRASE}</gpg.passphrase>
+      </properties>
+    </profile>
+  </profiles>
 </settings>
diff --git a/sign.key.enc b/sign.key.enc
new file mode 100644
index 0000000000000000000000000000000000000000..e39745a486770b7778c68d2a0c4e04113677a404
GIT binary patch
literal 5472
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
W%?wx=34$(F6bjJrXeFs~TNzpweVViY

literal 0
HcmV?d00001


From c25802c9da83565d7fadd7d5731a50d48f0e5b4f Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthurthompson@google.com>
Date: Thu, 14 Jan 2016 21:17:48 -0800
Subject: [PATCH 2/6] Deploy if tagged, stage otherwise

---
 .travis.yml                                 | 6 ++----
 build.sh                                    | 9 +++++++++
 client-libraries/java/rest-client/build.xml | 4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100755 build.sh

diff --git a/.travis.yml b/.travis.yml
index 0f9e907..fecb123 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,15 @@
 language: java
 script:
-- ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib
-  stage
+- ./build.sh
 before_install:
 - openssl aes-256-cbc -K $encrypted_8864fe5d711d_key -iv $encrypted_8864fe5d711d_iv
   -in sign.key.enc -out sign.key -d
 - gpg --import sign.key
 - cp settings.xml ${HOME}/.m2/settings.xml
-after_success:
-- echo "deploy completed."
 branches:
   only:
   - master
+  - /^v[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,3}$/
 env:
   global:
   - secure: JLi7Nhp/kr5Nv8e3Ldg0jEyitvjSljZwNLlR5SHphvUlV7POvVNqXJ994358wySD9sDEFCupHdO5sCmIkw4f9rQfEOB7uCWVr3qBR7qalQAeSCSjxkPAZMB7oZZrlgBR+aviwiUHlElVB+Qn6QtUWZfwT5qmCzKDTFTPiDaby2s=
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..d32ef84
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+tagCount=$(git tag -l --points-at HEAD | wc -l)
+if [ $tagCount -gt 0 ]; then
+  echo "tagged so deploy"
+  ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib deploy
+else
+  echo "not tagged so stage"
+  ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib stage
+fi
diff --git a/client-libraries/java/rest-client/build.xml b/client-libraries/java/rest-client/build.xml
index 5858e9e..1d2c8a8 100644
--- a/client-libraries/java/rest-client/build.xml
+++ b/client-libraries/java/rest-client/build.xml
@@ -147,7 +147,7 @@
     <copy file="${jar}" todir="${demo-appengine-dir}/WebContent/WEB-INF/lib"/>
   </target>
 
-  <target name="deploy" depends="dist" description="deploy snapshot version to Maven snapshot repository">
+  <target name="stage" depends="dist" description="deploy snapshot version to Maven snapshot repository">
     <artifact:mvn>
       <arg value="org.apache.maven.plugins:maven-deploy-plugin:2.6:deploy-file" />
       <arg value="-Durl=${ossrh-snapshots-repository-url}" />
@@ -159,7 +159,7 @@
   </target>
 
   <!-- before this, update project version (both build.xml and pom.xml) from SNAPSHOT to RELEASE -->
-  <target name="stage" depends="dist" description="deploy release version to Maven staging repository">
+  <target name="deploy" depends="dist" description="deploy release version to Maven staging repository">
     <!-- sign and deploy the main artifact -->
     <artifact:mvn>
       <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />

From 246fd34c9d9af6da95dd2c23115a458a509f9baa Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthurthompson@google.com>
Date: Fri, 15 Jan 2016 12:10:20 -0800
Subject: [PATCH 3/6] Use TRAVIS_TAG to check for tagged build Remove branch
 restrictions

---
 .travis.yml | 4 ----
 build.sh    | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fecb123..6066e3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,6 @@ before_install:
   -in sign.key.enc -out sign.key -d
 - gpg --import sign.key
 - cp settings.xml ${HOME}/.m2/settings.xml
-branches:
-  only:
-  - master
-  - /^v[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,3}$/
 env:
   global:
   - secure: JLi7Nhp/kr5Nv8e3Ldg0jEyitvjSljZwNLlR5SHphvUlV7POvVNqXJ994358wySD9sDEFCupHdO5sCmIkw4f9rQfEOB7uCWVr3qBR7qalQAeSCSjxkPAZMB7oZZrlgBR+aviwiUHlElVB+Qn6QtUWZfwT5qmCzKDTFTPiDaby2s=
diff --git a/build.sh b/build.sh
index d32ef84..911adae 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-tagCount=$(git tag -l --points-at HEAD | wc -l)
-if [ $tagCount -gt 0 ]; then
+tagLen=${#TRAVIS_TAG}
+if [ $tagLen -gt 0 ]; then
   echo "tagged so deploy"
   ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib deploy
 else

From babd7653051ff15917f9e00490beb84145a74f40 Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthurthompson@google.com>
Date: Fri, 15 Jan 2016 12:19:33 -0800
Subject: [PATCH 4/6] Decrypt and install gpg keys only when deploying

---
 .travis.yml | 3 ---
 build.sh    | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6066e3c..f90ad06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@ language: java
 script:
 - ./build.sh
 before_install:
-- openssl aes-256-cbc -K $encrypted_8864fe5d711d_key -iv $encrypted_8864fe5d711d_iv
-  -in sign.key.enc -out sign.key -d
-- gpg --import sign.key
 - cp settings.xml ${HOME}/.m2/settings.xml
 env:
   global:
diff --git a/build.sh b/build.sh
index 911adae..cbaa345 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,8 @@
 tagLen=${#TRAVIS_TAG}
 if [ $tagLen -gt 0 ]; then
   echo "tagged so deploy"
+  openssl aes-256-cbc -K $encrypted_8864fe5d711d_key -iv $encrypted_8864fe5d711d_iv -in sign.key.enc -out sign.key -d
+  gpg --import sign.key
   ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib deploy
 else
   echo "not tagged so stage"

From d10c3ab6cd7fe3fe56c4e9cfd0982247c6023aa0 Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthurthompson@google.com>
Date: Fri, 15 Jan 2016 14:25:52 -0800
Subject: [PATCH 5/6] Test PRs

---
 build.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index cbaa345..ab9df52 100755
--- a/build.sh
+++ b/build.sh
@@ -1,11 +1,16 @@
 #!/bin/bash
 tagLen=${#TRAVIS_TAG}
-if [ $tagLen -gt 0 ]; then
-  echo "tagged so deploy"
-  openssl aes-256-cbc -K $encrypted_8864fe5d711d_key -iv $encrypted_8864fe5d711d_iv -in sign.key.enc -out sign.key -d
-  gpg --import sign.key
-  ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib deploy
+if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+  if [ $tagLen -gt 0 ]; then
+    echo "tagged so deploy"
+    openssl aes-256-cbc -K $encrypted_8864fe5d711d_key -iv $encrypted_8864fe5d711d_iv -in sign.key.enc -out sign.key -d
+    gpg --import sign.key
+    ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib deploy
+  else
+    echo "not tagged so stage"
+    ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib stage
+  fi
 else
-  echo "not tagged so stage"
-  ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib stage
+  echo "PR so test"
+  ant -f ./client-libraries/java/rest-client/build.xml -lib ./client-libraries/java/rest-client/lib tests
 fi

From 11870e1120e1a37ca2d1bd6375896fed94332406 Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthurthompson@google.com>
Date: Fri, 15 Jan 2016 15:20:16 -0800
Subject: [PATCH 6/6] Add comments to build.sh

---
 build.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build.sh b/build.sh
index ab9df52..201bcc2 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,17 @@
 #!/bin/bash
+# This script chooses the appropriate build target.
+# Pull requests - use test target.
+# Commits on master - use stage target, stage SNAPSHOT artifacts.
+# Tagged commits - use deploy target, stage release artifacts.
+#
+# Get length of tag (len will be 0 if commit has no tag)
 tagLen=${#TRAVIS_TAG}
+# If commit is not a pull request use deploy or stage based on the commit tag,
+# if it is a pull request use tests.
 if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+  # If tag length is grater than 0 then decrypt and import gpg key then use
+  # deploy target to build sign and deploy artifacts. If tag length is 0 use
+  # stage target to build and stage artifacts.
   if [ $tagLen -gt 0 ]; then
     echo "tagged so deploy"
     openssl aes-256-cbc -K $encrypted_8864fe5d711d_key -iv $encrypted_8864fe5d711d_iv -in sign.key.enc -out sign.key -d