diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index abc381e5d..5c4551efa 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -15,11 +15,18 @@ set -eo pipefail -source $(dirname "$0")/common.sh +# STAGING_REPOSITORY_ID must be set +if [ -z "${STAGING_REPOSITORY_ID}" ]; then + echo "Missing STAGING_REPOSITORY_ID environment variable" + exit 1 +fi +source $(dirname "$0")/common.sh pushd $(dirname "$0")/../../ setup_environment_secrets create_settings_xml_file "settings.xml" -mvn nexus-staging:drop --settings=settings.xml +mvn nexus-staging:drop -B \ + --settings=settings.xml \ + -DstagingRepositoryId=${STAGING_REPOSITORY_ID} diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 439e0fc3e..1fa95fa53 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -15,6 +15,12 @@ set -eo pipefail +# STAGING_REPOSITORY_ID must be set +if [ -z "${STAGING_REPOSITORY_ID}" ]; then + echo "Missing STAGING_REPOSITORY_ID environment variable" + exit 1 +fi + source $(dirname "$0")/common.sh pushd $(dirname "$0")/../../ @@ -22,4 +28,7 @@ pushd $(dirname "$0")/../../ setup_environment_secrets create_settings_xml_file "settings.xml" -mvn nexus-staging:release -DperformRelease=true --settings=settings.xml +mvn nexus-staging:release -B \ + -DperformRelease=true \ + --settings=settings.xml \ + -DstagingRepositoryId=${STAGING_REPOSITORY_ID} diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml index 5c0c7c515..4f3d198ca 100644 --- a/google-oauth-client-appengine/pom.xml +++ b/google-oauth-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.27.1-SNAPSHOT + 1.28.0 ../pom.xml google-oauth-client-appengine diff --git a/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml index 0026758bc..d743ccb93 100644 --- a/google-oauth-client-assembly/pom.xml +++ b/google-oauth-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.27.1-SNAPSHOT + 1.28.0 ../pom.xml com.google.oauth-client diff --git a/google-oauth-client-bom/README.md b/google-oauth-client-bom/README.md index b90e95aac..39dc222c5 100644 --- a/google-oauth-client-bom/README.md +++ b/google-oauth-client-bom/README.md @@ -12,7 +12,7 @@ To use it in Maven, add the following to your `pom.xml`: com.google.oauth-client google-oauth-client-bom - 1.27.0 + 1.28.0 pom import diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml index 526de00ba..310ca5bb7 100644 --- a/google-oauth-client-bom/pom.xml +++ b/google-oauth-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.oauth-client google-oauth-client-bom - 1.27.1-SNAPSHOT + 1.28.0 pom Google OAuth Client Library for Java BOM @@ -63,32 +63,32 @@ com.google.oauth-client google-oauth-client - 1.27.1-SNAPSHOT + 1.28.0 com.google.oauth-client google-oauth-client-appengine - 1.27.1-SNAPSHOT + 1.28.0 com.google.oauth-client google-oauth-client-assembly - 1.27.1-SNAPSHOT + 1.28.0 com.google.oauth-client google-oauth-client-java6 - 1.27.1-SNAPSHOT + 1.28.0 com.google.oauth-client google-oauth-client-jetty - 1.27.1-SNAPSHOT + 1.28.0 com.google.oauth-client google-oauth-client-servlet - 1.27.1-SNAPSHOT + 1.28.0 diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index 2f1d527e9..fefdb8b6e 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.27.1-SNAPSHOT + 1.28.0 ../pom.xml google-oauth-client-java6 diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml index bd0ff0ffc..6cbb276c9 100644 --- a/google-oauth-client-jetty/pom.xml +++ b/google-oauth-client-jetty/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.27.1-SNAPSHOT + 1.28.0 ../pom.xml google-oauth-client-jetty diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index 8fd8c7fbb..ff71281dc 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.27.1-SNAPSHOT + 1.28.0 ../pom.xml google-oauth-client-servlet diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index 5a8e92fb6..aa5f4f1ca 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.27.1-SNAPSHOT + 1.28.0 ../pom.xml google-oauth-client diff --git a/pom.xml b/pom.xml index 6419def60..5eb1ac1a8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.google.oauth-client google-oauth-client-parent - 1.27.1-SNAPSHOT + 1.28.0 pom Parent for the Google OAuth Client Library for Java @@ -264,7 +264,7 @@ maven-surefire-plugin - 2.19.1 + 3.0.0-M3 -Xmx1024m sponge_log @@ -426,7 +426,7 @@ --> 1.9.64 UTF-8 - 1.27.0 + 1.28.0 3.0.2 2.1 1.9.13 diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml index 15dde0124..8a49258bf 100644 --- a/samples/dailymotion-cmdline-sample/pom.xml +++ b/samples/dailymotion-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.27.1-SNAPSHOT + 1.28.0 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index d94e96a05..065662858 100644 --- a/versions.txt +++ b/versions.txt @@ -1,5 +1,5 @@ # Format: # module:released-version:current-version -google-oauth-client:1.27.0:1.27.1-SNAPSHOT -google-http-client:1.27.0:1.27.1-SNAPSHOT +google-oauth-client:1.28.0:1.28.0 +google-http-client:1.28.0:1.28.0