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

Use only pluginZip publication of Apache Maven artifacts #226

Merged
merged 3 commits into from
Nov 30, 2023

Conversation

reta
Copy link
Contributor

@reta reta commented Nov 30, 2023

Description

Use only pluginZip publication of Apache Maven artifacts

Issues Resolved

Fixes #186

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
Copy link
Contributor Author

reta commented Nov 30, 2023

@owaiskazi19 should fix the publication for pluginZip

@owaiskazi19
Copy link
Member

owaiskazi19 commented Nov 30, 2023

@reta Thanks for the PR. Not to be a bad news here. Still not able to see artifacts for opensearch-flow-framework under m2

ls ~/.m2/repository/org/opensearch/opensearch
opensearch/                                              opensearch-job-scheduler-spi-1.2.0.0-javadoc.jar.sha1    opensearch-ml/
opensearch-benchmarks/                                   opensearch-job-scheduler-spi-1.2.0.0-javadoc.jar.sha256  opensearch-ml-client/
opensearch-cli/                                          opensearch-job-scheduler-spi-1.2.0.0-javadoc.jar.sha512  opensearch-ml-common/
opensearch-common/                                       opensearch-job-scheduler-spi-1.2.0.0-sources.jar         opensearch-ml-spi/
opensearch-compress/                                     opensearch-job-scheduler-spi-1.2.0.0-sources.jar.md5     opensearch-nio/
opensearch-core/                                         opensearch-job-scheduler-spi-1.2.0.0-sources.jar.sha1    opensearch-performance-analyzer/
opensearch-dissect/                                      opensearch-job-scheduler-spi-1.2.0.0-sources.jar.sha256  opensearch-plugin-classloader/
opensearch-geo/                                          opensearch-job-scheduler-spi-1.2.0.0-sources.jar.sha512  opensearch-plugin-cli/
opensearch-grok/                                         opensearch-job-scheduler-spi-1.2.0.0.jar                 opensearch-secure-sm/
opensearch-job-scheduler/                                opensearch-job-scheduler-spi-1.2.0.0.jar.md5             opensearch-ssl-config/
opensearch-job-scheduler-sample-extension/               opensearch-job-scheduler-spi-1.2.0.0.jar.sha1            opensearch-telemetry/
opensearch-job-scheduler-spi/                            opensearch-job-scheduler-spi-1.2.0.0.jar.sha256          opensearch-upgrade-cli/
opensearch-job-scheduler-spi-1.2.0.0-javadoc.jar         opensearch-job-scheduler-spi-1.2.0.0.jar.sha512          opensearch-x-content/
opensearch-job-scheduler-spi-1.2.0.0-javadoc.jar.md5     opensearch-launchers/  

@reta
Copy link
Contributor Author

reta commented Nov 30, 2023

@reta Thanks for the PR. Not to be a bad news here. Still not able to see artifacts for opensearch-flow-framework under m2

@owaiskazi19 Please check ls ~/.m2/repository/org/opensearch/plugin , since this is plugin

@owaiskazi19
Copy link
Member

owaiskazi19 commented Nov 30, 2023

@reta Thanks for the PR. Not to be a bad news here. Still not able to see artifacts for opensearch-flow-framework under m2

@owaiskazi19 Please check ls ~/.m2/repository/org/opensearch/plugin , since this is plugin

Ah! Yes. Missed that. First time working with a plugin.

 ls ~/.m2/repository/org/opensearch/plugin/opensearch-flow-framework/
3.0.0.0-SNAPSHOT/         maven-metadata-local.xml  

Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks @reta

@owaiskazi19
Copy link
Member

@reta we have spotless for our build files too. Can you run ./gradlew spotlessApply and push again? Thanks

Copy link
Member

@joshpalis joshpalis left a comment

Choose a reason for hiding this comment

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

Thanks @reta for the changes. I'd prefer we hold off on merging until the spotless failure is resolved

Copy link
Member

@amitgalitz amitgalitz left a comment

Choose a reason for hiding this comment

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

LGTM, just wanted to get an understanding if known what is different in our plugin that needs this since I didn't have context on the changes needed here

Signed-off-by: Andriy Redko <[email protected]>
@reta
Copy link
Contributor Author

reta commented Nov 30, 2023

@reta we have spotless for our build files too. Can you run ./gradlew spotlessApply and push again? Thanks

Thanks @owaiskazi19 , fixed!

@owaiskazi19
Copy link
Member

owaiskazi19 commented Nov 30, 2023

@reta looks like we need to add these fields in the POM

 description is missing in [/home/runner/work/flow-framework/flow-framework/build/distributions/opensearch-flow-framework-3.0.0.0-SNAPSHOT.pom]
> Task :generatePomFileForNebulaPublication
licenses is empty in [/home/runner/work/flow-framework/flow-framework/build/distributions/opensearch-flow-framework-3.0.0.0-SNAPSHOT.pom]
developers is empty in [/home/runner/work/flow-framework/flow-framework/build/distributions/opensearch-flow-framework-3.0.0.0-SNAPSHOT.pom]

> Task :validateNebulaPom FAILED

build.gradle Outdated Show resolved Hide resolved
Signed-off-by: Andriy Redko <[email protected]>
@owaiskazi19 owaiskazi19 merged commit 76c7065 into opensearch-project:main Nov 30, 2023
19 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 30, 2023
* Use only pluginZip publication of Apache Maven artifacts

Signed-off-by: Andriy Redko <[email protected]>

* Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

* Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

---------

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 76c7065)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link

The backport to feature/agent_framework failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-feature/agent_framework feature/agent_framework
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-feature/agent_framework
# Create a new branch
git switch --create backport/backport-226-to-feature/agent_framework
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 76c70652a92344ab74fc157fee4165e4e22bf934
# Push it to GitHub
git push --set-upstream origin backport/backport-226-to-feature/agent_framework
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-feature/agent_framework

Then, create a pull request where the base branch is feature/agent_framework and the compare/head branch is backport/backport-226-to-feature/agent_framework.

joshpalis pushed a commit that referenced this pull request Nov 30, 2023
…ts (#228)

Use only pluginZip publication of Apache Maven artifacts (#226)

* Use only pluginZip publication of Apache Maven artifacts



* Address code review comments



* Address code review comments



---------


(cherry picked from commit 76c7065)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis pushed a commit to dbwiddis/flow-framework that referenced this pull request Dec 11, 2023
…project#226)

* Use only pluginZip publication of Apache Maven artifacts

Signed-off-by: Andriy Redko <[email protected]>

* Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

* Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

---------

Signed-off-by: Andriy Redko <[email protected]>
dbwiddis added a commit that referenced this pull request Dec 12, 2023
* Rename repo name in code files and CI (#182)

Signed-off-by: owaiskazi19 <[email protected]>

* Update actions/setup-java action to v4 (#219)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Use only pluginZip publication of Apache Maven artifacts (#226)

* Use only pluginZip publication of Apache Maven artifacts

Signed-off-by: Andriy Redko <[email protected]>

* Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

* Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

---------

Signed-off-by: Andriy Redko <[email protected]>

* Integration test infrastructure set up (#230)

* Initial integ test framework modification, sets up integration test cluster and fixes ./gradlew run

Signed-off-by: Joshua Palis <[email protected]>

* spotless

Signed-off-by: Joshua Palis <[email protected]>

* Updating DEVELOPER_GUIDE

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>

* Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.23.2 (#229)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Update to Gradle 8.5 (#227)

Signed-off-by: Andriy Redko <[email protected]>
Co-authored-by: Owais Kazi <[email protected]>

* Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.23.3 (#252)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Update dependency org.eclipse.platform:org.eclipse.core.runtime to v3.30.0 (#255)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Add setting to limit max workflow steps

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: owaiskazi19 <[email protected]>
Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Joshua Palis <[email protected]>
Signed-off-by: Daniel Widdis <[email protected]>
Co-authored-by: Owais Kazi <[email protected]>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: Andriy Redko <[email protected]>
Co-authored-by: Joshua Palis <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 12, 2023
* Rename repo name in code files and CI (#182)

Signed-off-by: owaiskazi19 <[email protected]>

* Update actions/setup-java action to v4 (#219)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Use only pluginZip publication of Apache Maven artifacts (#226)

* Use only pluginZip publication of Apache Maven artifacts

Signed-off-by: Andriy Redko <[email protected]>

* Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

* Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

---------

Signed-off-by: Andriy Redko <[email protected]>

* Integration test infrastructure set up (#230)

* Initial integ test framework modification, sets up integration test cluster and fixes ./gradlew run

Signed-off-by: Joshua Palis <[email protected]>

* spotless

Signed-off-by: Joshua Palis <[email protected]>

* Updating DEVELOPER_GUIDE

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>

* Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.23.2 (#229)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Update to Gradle 8.5 (#227)

Signed-off-by: Andriy Redko <[email protected]>
Co-authored-by: Owais Kazi <[email protected]>

* Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.23.3 (#252)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Update dependency org.eclipse.platform:org.eclipse.core.runtime to v3.30.0 (#255)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Add setting to limit max workflow steps

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: owaiskazi19 <[email protected]>
Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Joshua Palis <[email protected]>
Signed-off-by: Daniel Widdis <[email protected]>
Co-authored-by: Owais Kazi <[email protected]>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: Andriy Redko <[email protected]>
Co-authored-by: Joshua Palis <[email protected]>
(cherry picked from commit 7bec6e8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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.

[BUG] Unable to publish Flow Framework plugin to maven local
4 participants