Skip to content

Conversation

@kushagraThapar
Copy link
Member

@kushagraThapar kushagraThapar commented Oct 19, 2019

@kushagraThapar
Copy link
Member Author

/azp run java - cosmos - tests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos-parent</artifactId>
<version>3.4.0</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
Copy link
Member

@mbhaskar mbhaskar Oct 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to double check - 3.4.0 was just a snapshot right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not anymore.
The practice has been changed to update the versions to next to be released version.

private final static ObjectMapper OBJECT_MAPPER = Utils.getSimpleObjectMapper();
private ObjectMapper om;
transient ObjectNode propertyBag = null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please refrain from making unrelated formatting changes, you can configure intellij to stop doing this automatically

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really wanted to, but couldn't stop it. :(
You can show me a demo sometime :)

@JimSuplizio
Copy link
Contributor

CC: @weshaggard
@kushagraThapar Why is the version of this ticked back down from 3.4.0 to 3.3.1? Is this supposed to be a hotfix? For hotfixes we generally recommend branching from the last release tag (https://github.com/Azure/azure-sdk/blob/master/docs/policies/repobranching.md#hotfix-branches) and applying just the fix you want, otherwise you risk picking up other changes you didn't want for that hotfix.

Last but not least, when versioning files please take a look at the Versions and versioning section of https://github.com/Azure/azure-sdk-for-java/blob/master/CONTRIBUTING.md. The versions of Cosmos versions should be updated in version_data.txt and then the update_versions.py script should be run which will update the pom and readme files. There's a secondary PR for this to update the version in java files as well which is going to run into merge issues of these version changes.

@kushagraThapar
Copy link
Member Author

CC: @weshaggard
@kushagraThapar Why is the version of this ticked back down from 3.4.0 to 3.3.1? Is this supposed to be a hotfix? For hotfixes we generally recommend branching from the last release tag (https://github.com/Azure/azure-sdk/blob/master/docs/policies/repobranching.md#hotfix-branches) and applying just the fix you want, otherwise you risk picking up other changes you didn't want for that hotfix.

Last but not least, when versioning files please take a look at the Versions and versioning section of https://github.com/Azure/azure-sdk-for-java/blob/master/CONTRIBUTING.md. The versions of Cosmos versions should be updated in version_data.txt and then the update_versions.py script should be run which will update the pom and readme files. There's a secondary PR for this to update the version in java files as well which is going to run into merge issues of these version changes.

@JimSuplizio, this wasn't a hotfix, but more like a small bug fix (that was needed in spring-data-cosmosdb SDK) that wasn't related to any previous changes.
Since the master wasn't updated since release 3.3.0, so released it from master itself.
This PR: #5959 changes the version back to 3.4.0 to avoid any confusion.

Going forward, I will make sure to create a hotfix branch, and follow the hotfix pattern for any bug fixes, or hotfixes releases.

Regarding tags, I couldn't find any tags under azure-sdk-for-java that were related to cosmos SDK previous releases. Since cosmos SDK and azure-sdk-for-java follow different release cycles, how can we create tags for previous versions that got released, and for this release as well?

Also, do we need to update version_data.txt every time we release a new cosmos SDK version?

For now, I can create a PR that updates the version_data.txt file. Will that be okay?

@weshaggard
Copy link
Member

Regarding tags, I couldn't find any tags under azure-sdk-for-java that were related to cosmos SDK previous releases. Since cosmos SDK and azure-sdk-for-java follow different release cycles, how can we create tags for previous versions that got released, and for this release as well?

The github UI doesn't do well with listing all the tags I suggest using the command line git tag -l azure-cosmos* should find you all the release tags for cosmos. Currently it only lists 3.2.2 but I suspect that is because the 3.3.0 package must not have been released with the correct release pipeline.

mbhaskar pushed a commit to mbhaskar/azure-sdk-for-java that referenced this pull request Oct 23, 2019
kushagraThapar pushed a commit that referenced this pull request Oct 24, 2019
* Porting JsonIgnore fix
port from: #5951

* Removed BadRequestException when FeedOptions.maxItemCount is -1
Port from: #5618

* Retry not happening with direct mode - port to v4
Port from: #5806

* Resolves issues 275 and 276
port from: #5829
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants