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

adapt to OpenSearch 2.x #69

Merged
merged 1 commit into from
Jun 5, 2024
Merged

adapt to OpenSearch 2.x #69

merged 1 commit into from
Jun 5, 2024

Conversation

rursprung
Copy link
Contributor

Description

DO NOT MERGE INTO main

this adapts the template to OpenSearch 2.x (currently: 2.15.0-SNAPSHOT).
as there's no 2.x branch on this repo yet i can only target the main branch. i'd suggest that you create a 2.x branch (based off of main; can only be done by maintainers) and then re-target this PR to the 2.x branch.

Issues Resolved

resolves #66

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.

@reta reta changed the base branch from main to 2.x June 5, 2024 12:20
build.gradle Outdated Show resolved Hide resolved
@reta reta changed the title adapt to OpenSearch 2.x (**DO NOT MERGE INTO MAIN**) adapt to OpenSearch 2.x Jun 5, 2024
@reta
Copy link
Collaborator

reta commented Jun 5, 2024

Ok, so one of the drawbacks of branches is that [Use this template] button does not allow to select a branch but will clone the repo (plugin template) with all branches [1]

[1] https://github.blog/changelog/2020-03-31-include-all-branches-when-creating-a-repository-from-a-template/

@rursprung
Copy link
Contributor Author

Ok, so one of the drawbacks of branches is that [Use this template] button does not allow to select a branch but will clone the repo (plugin template) with all branches [1]

[1] https://github.blog/changelog/2020-03-31-include-all-branches-when-creating-a-repository-from-a-template/

i'm aware of this, however i think it's a good approach: when you create the repo from the template you have to toggle the checkbox that it should copy all branches and then you get main (targeting 3.xand2.x` (targeting 2.x) and can implement both of them - the plugin repo will after all follow the same branch pattern. and if someone only wants to target 3.x they can just skip the checkbox.

the only alternative i see is that you could instead create a complete separate repo for 2.x, but that'd not match what actual plugins do which support multiple versions with different branches in the same repo

@rursprung rursprung requested a review from reta June 5, 2024 12:33
build.gradle Outdated Show resolved Hide resolved
resolves opensearch-project#66

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
@reta
Copy link
Collaborator

reta commented Jun 5, 2024

Thanks @rursprung , we need one more approval to get it in :)

Copy link
Collaborator

@AmiStrn AmiStrn left a comment

Choose a reason for hiding this comment

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

Thanks @rursprung !

@reta reta merged commit 561666f into opensearch-project:2.x Jun 5, 2024
7 checks passed
@rursprung rursprung deleted the 2.x branch June 5, 2024 19:25
@@ -114,6 +114,8 @@ run {
useCluster testClusters.integTest
}

dependencyLicenses.enabled = false
Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh, i just saw this: this is a leftover from when i wrongly added the org.apache.hc.core5dependency and should've been removed again (since now we don't have any dependency here) :|

i can provide a PR for that next week (or someone else can briefly remove this). sorry about that!

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.

[FEATURE] template for OpenSearch 2.x?
3 participants