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

incubator-kie-issues#471: Add apache headers license into files #512

Merged
merged 3 commits into from
Oct 23, 2023

Conversation

jomarko
Copy link
Contributor

@jomarko jomarko commented Oct 19, 2023

JIRA:
Closes: apache/incubator-kie-issues#471

Please notice I am not adding headers to all .adoc files, because on apache pages is written it is not needed for code snippet that is included into some parent, that has header https://www.apache.org/legal/src-headers.html#faq-exceptions

This PR also replaces github kiegroup references to github apache references

Please make sure that your PR meets the following requirements:

  • You have read the contributions doc
  • Pull Request title is properly formatted: KOGITO-XYZ Subject
  • Pull Request title contains the target branch if not targeting main: [0.9.x] KOGITO-XYZ Subject
  • The nav.adoc file has a link to this guide in the proper category
  • The index.adoc file has a card to this guide in the proper category, with a meaningful description
How to backport a pull request to a different branch?

In order to automatically create a backporting pull request please add one or more labels having the following format backport-<branch-name>, where <branch-name> is the name of the branch where the pull request must be backported to (e.g., backport-7.67.x to backport the original PR to the 7.67.x branch).

NOTE: backporting is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.

Once the original pull request is successfully merged, the automated action will create one backporting pull request per each label (with the previous format) that has been added.

If something goes wrong, the author will be notified and at this point a manual backporting is needed.

NOTE: this automated backporting is triggered whenever a pull request on main branch is labeled or closed, but both conditions must be satisfied to get the new PR created.

@ricardozanini
Copy link
Member

Can you please rebase? 🙏

@jomarko
Copy link
Contributor Author

jomarko commented Oct 20, 2023

@ricardozanini rebased

Comment on lines 141 to 146
<<<<<<< HEAD
curl -S https://raw.githubusercontent.com/apache/incubator-kie-kogito-serverless-operator/{operator_version}/test/testdata/sonataflow.org_v1alpha08_sonataflow_devmode.yaml > workflow_devmode.yaml
=======
curl -S https://raw.githubusercontent.com/apache/incubator-kie-kogito-serverless-operator/{operator_version}/config/samples/sw.kogito_v1alpha08_sonataflow_devmode.yaml > workflow_devmode.yaml
>>>>>>> 744e7dc (kiegroup -> apache)
code workflow_devmode.yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this conflict hasn't been solved and has been left behind

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thank you for spotting @porcelli

Copy link
Contributor

@porcelli porcelli left a comment

Choose a reason for hiding this comment

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

lgtm

@porcelli porcelli merged commit 2957712 into apache:main Oct 23, 2023
1 check passed
Copy link
Member

@MarianMacik MarianMacik left a comment

Choose a reason for hiding this comment

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

LGTM.

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.

Replace copyright headers/comments on kogito-docs as part of the migration to Apache
4 participants