Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] Changes required for snapshot missing in 1.1 #63

Closed
wants to merge 2 commits into from

Conversation

peternied
Copy link
Member

Description

Backporting all changes from main onto branch 1.1

Issues

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@peternied peternied requested a review from dblock September 8, 2021 17:03
Comment on lines -37 to +46
run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
run: ./gradlew publishToMavenLocal

# common-utils
- name: Build and Test
run: |
./gradlew build -Dopensearch.version=1.1.0
./gradlew build -Dopensearch.version=1.1.0-SNAPSHOT

- name: Publish to Maven Local
run: |
./gradlew publishToMavenLocal -Dopensearch.version=1.1.0
./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
Copy link
Member

Choose a reason for hiding this comment

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

Why do we add all the snapshots back?

@@ -12,7 +12,7 @@
buildscript {
ext {
opensearch_group = "org.opensearch"
opensearch_version = System.getProperty("opensearch.version", "1.1.0")
opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
Copy link
Member

Choose a reason for hiding this comment

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

Same snapshots

Comment on lines +47 to +57
ext {
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
}

allprojects {
group 'org.opensearch.commons'
version = opensearch_version - '-SNAPSHOT' + '.0'
if (isSnapshot) {
version += "-SNAPSHOT"
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Same Why do we add all the snapshots back?

@peternied
Copy link
Member Author

@peterzhuamazon I did not make any code changes, just merged the 2 snapshot related PRs from main into this branch, if we need to have a branch specific change I'll need someone from common-util to take the lead

@peternied
Copy link
Member Author

@VachaShah Can you take a look?

@peternied peternied requested a review from VachaShah September 8, 2021 18:13
@dblock
Copy link
Member

dblock commented Sep 8, 2021

We should merge everything in main -> 1.x.

@peternied
Copy link
Member Author

I am going to leave this up to the branch owners to migrate

@peternied peternied closed this Sep 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants