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

Restws 741: Removing 1.8 submodule completed successfully #584

Closed
wants to merge 2 commits into from
Closed

Restws 741: Removing 1.8 submodule completed successfully #584

wants to merge 2 commits into from

Conversation

josephbate
Copy link

Description of what I changed

  1. transfered all code from class files from 1.8 to 1.9
  2. merged all inherited classes from 1.8 with those in 1.9
  3. transfered all test classes from 1.8 t 1.9 and tested them
  4. transfered all data resources from 1.8 to 1.9
  5. changed the supported versions on all resources to exclude 1.8.x versions
  6. removed omod-1.8 dependency from all pom.xml files
  7. deleted 1.8 submodule from openmrs-module-webservices.rest

Issue I worked on

see https://issues.openmrs.org/browse/RESTWS-741

Checklist: I completed these to help reviewers :)

  • My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute above command

  • All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

@josephbate
Copy link
Author

please review this pullrequest
cc. @mozzy11 @r-nathan @ibacher @dkayiwa @wluyima

@sherrif10
Copy link
Member

Basing on the changes introduced in this pull request. They are many, so you would split this ticket into sub tasks to help the reviewer quickly understand new changes introduced.

@josephbate
Copy link
Author

Basing on the changes introduced in this pull request. They are many, so you would split this ticket into sub tasks to help the reviewer quickly understand new changes introduced.

oh okay thank you
how may i go about if you dont mind me asking @sherrif10

@sherrif10
Copy link
Member

You can first handle this section you described here as transfering all code from class files from 1.8 to 1.9 make all changes neccessary and push a sub task PR.

@josephbate
Copy link
Author

any thought on why this is not merge @dkayiwa @ibacher

@dkayiwa
Copy link
Member

dkayiwa commented Nov 16, 2023

@josephbate with the merge conflicts?

@josephbate
Copy link
Author

@josephbate with the merge conflicts?

hello @dkayiwa
could you please care to explain in detail what you mean by this and if there's anything i can do

@sherrif10
Copy link
Member

Hello @josephbate . the ticket has merge conflicts, in otherwords, its not up to date with latest master, so you have to first git-pull to update your local branch, then resolve any conflicts and push again.

@josephbate
Copy link
Author

josephbate commented Nov 17, 2023

Hello @josephbate . the ticket has merge conflicts, in otherwords, its not up to date with latest master, so you have to first git-pull to update your local branch, then resolve any conflicts and push again.

thank you @sherrif10 let me see i can do

@josephbate josephbate closed this by deleting the head repository Nov 21, 2023
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.

3 participants