Skip to content

Commit e726626

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
---
yaml --- r: 7813 b: refs/heads/tswast-patch-1 c: b67c153 h: refs/heads/master i: 7811: 46c36f8
1 parent 48082bc commit e726626

58 files changed

Lines changed: 216 additions & 212 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: eb805f7b32d6b6351306a8ca5d035f42d93a83cb
60+
refs/heads/tswast-patch-1: b67c153efbbbb6023ec385567a62ab7bc527deed
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/RELEASING.md‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
### Overview
22

3-
Most of the release process is handled by the `after_success.sh` script, triggered after Travis CI successfully completes a non-PR build. A new artifact will be released to Maven Central Repository via Travis CI when "-SNAPSHOT" is not included in the version (as listed in the base directory's `pom.xml`). The website and README files will also be updated automatically in this case. When "-SNAPSHOT" is included in the version, Travis only updates the artifact in the snapshot repository.
3+
The release process for SNAPSHOT versions is handled by the `after_success.sh` script, triggered after Travis CI successfully completes a non-PR build. A new SNAPSHOT artifact will be released to the snapshot repository as part of this script.
44

55
### To push a release version
66

7-
1. Run `utilities/update_pom_version.sh` from the repository's base directory.
8-
This script takes an optional argument denoting the new version. By default, if the current version is X.Y.Z-SNAPSHOT, the script will update the version in all the pom.xml files to X.Y.Z. If desired, another version can be supplied via command line argument instead.
7+
1. Make sure the team agrees that it is time to release. Verify that all unit and integration tests for the last commit have passed.
98

10-
2. Create a PR to update the pom.xml version. If releasing a new client library, this PR should also update javadoc grouping in the base directory's [pom.xml](./pom.xml).
11-
PRs that don't release new modules should look something like [#225](https://github.com/GoogleCloudPlatform/google-cloud-java/pull/225). PRs that do release a new module should also add the appropriate packages to the javadoc groups "SPI" and "Test helpers", as shown in [#802](https://github.com/GoogleCloudPlatform/google-cloud-java/pull/802) for `google-cloud-dns`. After this PR is merged into GoogleCloudPlatform/google-cloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files. Do not merge in any non-release-related pull requests between the start of step 2 and the end of step 6. Between these steps, the project version is a non-snapshot version, so any commits to the master branch will cause Travis to spend extra resources attempting to redeploy artifacts.
9+
2. Run `utilities/update_pom_version.sh` from the repository's base directory.
10+
This script takes an optional argument denoting the new version. By default, if the current version is X.Y.Z-SNAPSHOT, the script will update the version in all the pom.xml files to X.Y.Z. If desired, another version can be supplied via command line argument instead. Commit this version locally:
1211

13-
3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository. Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/google-cloud-java/builds), and open the second build's logs for Step 2's PR. Be sure that you are not opening the "Pull Request" build logs. When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed. Search for `google-cloud` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~google-cloud) and check the latest version number. In rare cases (when the Maven plugin that determines the version of the repository fails), the artifacts may not be deployed even if the version in the pom.xml files doesn't contain `SNAPSHOT`. If the artifacts weren't deployed due to invalid version parsing or a flaky test, rerun the build.
12+
```
13+
git commit -m "Release [VERSION HERE]"
14+
```
15+
16+
3. Run `utilities/stage_release.sh`.
17+
This script builds and stages the release artifact on the Maven Central Repository, updates the README.md files with the release version + commits them locally, and finally generates a new site version for the gh-pages branch under a temporary directory named `tmp_gh-pages`. If you haven't run the release process before, it's worth verifying everything; check the staged release on the Sonatype website, and verify that the local commits have the right version updates.
18+
19+
4. Run `utilities/finalize_release.sh`.
20+
This script will release the staged artifact on the Maven Central Repository and push the README.md and gh-pages updates to github.
1421

15-
4. Publish a release on Github manually.
22+
5. Publish a release on Github manually.
1623
Go to the [releases page](https://github.com/GoogleCloudPlatform/google-cloud-java/releases) and open the appropriate release draft. Make sure the "Tag Version" is `vX.Y.Z` and the "Release Title" is `X.Y.Z`, where `X.Y.Z` is the release version as listed in the `pom.xml` files. The draft should already have all changes that impact users since the previous release. To double check this, you can use the `git log` command and look through the merged master branch pull requests. Here is an example of the log command to get non-merge commits between v0.0.12 and v0.1.0:
1724

1825
```
@@ -21,12 +28,12 @@ Go to the [releases page](https://github.com/GoogleCloudPlatform/google-cloud-ja
2128

2229
Ensure that the format is consistent with previous releases (for an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/google-cloud-java/releases/tag/v0.1.0)). After adding any missing updates and reformatting as necessary, publish the draft. Finally, create a new draft for the next release.
2330

24-
5. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
31+
6. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
2532
As mentioned before, there is an optional version argument. By default, the script will update the version from "X.Y.Z" to "X.Y.Z+1-SNAPSHOT". Suppose a different version is desired, for example X+1.0.0-SNAPSHOT. Then the appropriate command to run would be `utilities/update_pom_version.sh X+1.0.0-SNAPSHOT`.
2633

27-
6. Create and merge in another PR to reflect the updated project version. For an example of what this PR should look like, see [#227](https://github.com/GoogleCloudPlatform/google-cloud-java/pull/227).
34+
7. Create and merge in another PR to reflect the updated project version. For an example of what this PR should look like, see [#227](https://github.com/GoogleCloudPlatform/google-cloud-java/pull/227).
2835

29-
7. Be sure to update Google Cloud Platform docs, [java-docs-samples](https://github.com/GoogleCloudPlatform/java-docs-samples) code/docs, and [getting-started-java](https://github.com/GoogleCloudPlatform/getting-started-java) code/docs. See directions [here](https://docs.google.com/a/google.com/document/d/1SS3xNn2v0qW7EadGUPBUAPIQAH5VY6WSFmT17ZjjUVE/).
36+
8. Be sure to update Google Cloud Platform docs, [java-docs-samples](https://github.com/GoogleCloudPlatform/java-docs-samples) code/docs, and [getting-started-java](https://github.com/GoogleCloudPlatform/getting-started-java) code/docs. See directions [here](https://docs.google.com/a/google.com/document/d/1SS3xNn2v0qW7EadGUPBUAPIQAH5VY6WSFmT17ZjjUVE/).
3037

3138
### To push a snapshot version
3239

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,19 @@
1919
import com.google.cloud.Identity;
2020
import com.google.cloud.Policy;
2121
import com.google.cloud.Role;
22-
import com.google.cloud.pubsub.deprecated.Message;
23-
import com.google.cloud.pubsub.deprecated.PubSub;
24-
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
25-
import com.google.cloud.pubsub.deprecated.PubSubOptions;
26-
import com.google.cloud.pubsub.deprecated.PushConfig;
27-
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
28-
import com.google.cloud.pubsub.deprecated.Subscription;
29-
import com.google.cloud.pubsub.deprecated.SubscriptionId;
30-
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
31-
import com.google.cloud.pubsub.deprecated.Topic;
32-
import com.google.cloud.pubsub.deprecated.TopicInfo;
22+
import com.google.cloud.pubsub.Message;
23+
import com.google.cloud.pubsub.PubSub;
24+
import com.google.cloud.pubsub.PubSub.MessageProcessor;
25+
import com.google.cloud.pubsub.PubSubOptions;
26+
import com.google.cloud.pubsub.PushConfig;
27+
import com.google.cloud.pubsub.ReceivedMessage;
28+
import com.google.cloud.pubsub.Subscription;
29+
import com.google.cloud.pubsub.SubscriptionId;
30+
import com.google.cloud.pubsub.SubscriptionInfo;
31+
import com.google.cloud.pubsub.Topic;
32+
import com.google.cloud.pubsub.TopicInfo;
3333
import com.google.common.collect.ImmutableMap;
34+
3435
import java.util.ArrayList;
3536
import java.util.Arrays;
3637
import java.util.HashMap;

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PubSubSnippets.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,18 @@
2727
import com.google.cloud.Page;
2828
import com.google.cloud.Policy;
2929
import com.google.cloud.Role;
30-
import com.google.cloud.pubsub.deprecated.Message;
31-
import com.google.cloud.pubsub.deprecated.PubSub;
32-
import com.google.cloud.pubsub.deprecated.PubSub.ListOption;
33-
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
34-
import com.google.cloud.pubsub.deprecated.PushConfig;
35-
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
36-
import com.google.cloud.pubsub.deprecated.Subscription;
37-
import com.google.cloud.pubsub.deprecated.SubscriptionId;
38-
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
39-
import com.google.cloud.pubsub.deprecated.Topic;
40-
import com.google.cloud.pubsub.deprecated.TopicInfo;
30+
import com.google.cloud.pubsub.Message;
31+
import com.google.cloud.pubsub.PubSub;
32+
import com.google.cloud.pubsub.PubSub.ListOption;
33+
import com.google.cloud.pubsub.PubSub.MessageProcessor;
34+
import com.google.cloud.pubsub.PushConfig;
35+
import com.google.cloud.pubsub.ReceivedMessage;
36+
import com.google.cloud.pubsub.Subscription;
37+
import com.google.cloud.pubsub.SubscriptionId;
38+
import com.google.cloud.pubsub.SubscriptionInfo;
39+
import com.google.cloud.pubsub.Topic;
40+
import com.google.cloud.pubsub.TopicInfo;
41+
4142
import java.util.Iterator;
4243
import java.util.LinkedList;
4344
import java.util.List;

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionSnippets.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@
2525
import com.google.cloud.Identity;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.deprecated.Message;
29-
import com.google.cloud.pubsub.deprecated.PubSub.MessageConsumer;
30-
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
31-
import com.google.cloud.pubsub.deprecated.PushConfig;
32-
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
33-
import com.google.cloud.pubsub.deprecated.Subscription;
28+
import com.google.cloud.pubsub.Message;
29+
import com.google.cloud.pubsub.PubSub.MessageConsumer;
30+
import com.google.cloud.pubsub.PubSub.MessageProcessor;
31+
import com.google.cloud.pubsub.PushConfig;
32+
import com.google.cloud.pubsub.ReceivedMessage;
33+
import com.google.cloud.pubsub.Subscription;
34+
3435
import java.util.Iterator;
3536
import java.util.LinkedList;
3637
import java.util.List;

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicSnippets.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
import com.google.cloud.Page;
2828
import com.google.cloud.Policy;
2929
import com.google.cloud.Role;
30-
import com.google.cloud.pubsub.deprecated.Message;
31-
import com.google.cloud.pubsub.deprecated.PubSub.ListOption;
32-
import com.google.cloud.pubsub.deprecated.SubscriptionId;
33-
import com.google.cloud.pubsub.deprecated.Topic;
30+
import com.google.cloud.pubsub.Message;
31+
import com.google.cloud.pubsub.PubSub.ListOption;
32+
import com.google.cloud.pubsub.SubscriptionId;
33+
import com.google.cloud.pubsub.Topic;
34+
3435
import java.util.Iterator;
3536
import java.util.LinkedList;
3637
import java.util.List;

‎branches/tswast-patch-1/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,29 @@
2525
import com.google.cloud.Page;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.deprecated.PubSub;
29-
import com.google.cloud.pubsub.deprecated.PubSubOptions;
30-
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
31-
import com.google.cloud.pubsub.deprecated.Subscription;
32-
import com.google.cloud.pubsub.deprecated.SubscriptionId;
33-
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
34-
import com.google.cloud.pubsub.deprecated.Topic;
35-
import com.google.cloud.pubsub.deprecated.TopicInfo;
28+
import com.google.cloud.pubsub.PubSub;
29+
import com.google.cloud.pubsub.PubSubOptions;
30+
import com.google.cloud.pubsub.ReceivedMessage;
31+
import com.google.cloud.pubsub.Subscription;
32+
import com.google.cloud.pubsub.SubscriptionId;
33+
import com.google.cloud.pubsub.SubscriptionInfo;
34+
import com.google.cloud.pubsub.Topic;
35+
import com.google.cloud.pubsub.TopicInfo;
3636
import com.google.common.collect.Iterators;
3737
import com.google.common.collect.Sets;
38+
39+
import org.junit.AfterClass;
40+
import org.junit.BeforeClass;
41+
import org.junit.Rule;
42+
import org.junit.Test;
43+
import org.junit.rules.Timeout;
44+
3845
import java.util.HashSet;
3946
import java.util.Iterator;
4047
import java.util.List;
4148
import java.util.Set;
4249
import java.util.UUID;
4350
import java.util.concurrent.ExecutionException;
44-
import org.junit.AfterClass;
45-
import org.junit.BeforeClass;
46-
import org.junit.Rule;
47-
import org.junit.Test;
48-
import org.junit.rules.Timeout;
4951

5052
public class ITPubSubSnippets {
5153

‎branches/tswast-patch-1/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionSnippets.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,23 @@
2525
import com.google.cloud.Identity;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.deprecated.Message;
29-
import com.google.cloud.pubsub.deprecated.PubSub;
30-
import com.google.cloud.pubsub.deprecated.PubSubOptions;
31-
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
32-
import com.google.cloud.pubsub.deprecated.Subscription;
33-
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
34-
import com.google.cloud.pubsub.deprecated.Topic;
35-
import com.google.cloud.pubsub.deprecated.TopicInfo;
36-
import java.util.Iterator;
37-
import java.util.UUID;
38-
import java.util.concurrent.ExecutionException;
28+
import com.google.cloud.pubsub.Message;
29+
import com.google.cloud.pubsub.PubSub;
30+
import com.google.cloud.pubsub.PubSubOptions;
31+
import com.google.cloud.pubsub.ReceivedMessage;
32+
import com.google.cloud.pubsub.Subscription;
33+
import com.google.cloud.pubsub.SubscriptionInfo;
34+
import com.google.cloud.pubsub.Topic;
35+
import com.google.cloud.pubsub.TopicInfo;
36+
3937
import org.junit.AfterClass;
4038
import org.junit.BeforeClass;
4139
import org.junit.Test;
4240

41+
import java.util.Iterator;
42+
import java.util.UUID;
43+
import java.util.concurrent.ExecutionException;
44+
4345
public class ITSubscriptionSnippets {
4446

4547
private static final String TOPIC =

‎branches/tswast-patch-1/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicSnippets.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,21 @@
2525
import com.google.cloud.Page;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.deprecated.PubSub;
29-
import com.google.cloud.pubsub.deprecated.PubSubOptions;
30-
import com.google.cloud.pubsub.deprecated.SubscriptionId;
31-
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
32-
import com.google.cloud.pubsub.deprecated.Topic;
33-
import com.google.cloud.pubsub.deprecated.TopicInfo;
28+
import com.google.cloud.pubsub.PubSub;
29+
import com.google.cloud.pubsub.PubSubOptions;
30+
import com.google.cloud.pubsub.SubscriptionId;
31+
import com.google.cloud.pubsub.SubscriptionInfo;
32+
import com.google.cloud.pubsub.Topic;
33+
import com.google.cloud.pubsub.TopicInfo;
3434
import com.google.common.collect.Iterators;
35-
import java.util.UUID;
36-
import java.util.concurrent.ExecutionException;
35+
3736
import org.junit.AfterClass;
3837
import org.junit.BeforeClass;
3938
import org.junit.Test;
4039

40+
import java.util.UUID;
41+
import java.util.concurrent.ExecutionException;
42+
4143
public class ITTopicSnippets {
4244

4345
private static final String TOPIC = "it-topic-snippets-topic-" + UUID.randomUUID().toString();

branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/AckDeadlineRenewer.java renamed to branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/AckDeadlineRenewer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub.deprecated;
17+
package com.google.cloud.pubsub;
1818

1919
import com.google.cloud.Clock;
2020
import com.google.cloud.GrpcServiceOptions.ExecutorFactory;

0 commit comments

Comments
 (0)