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.

Sign up for GitHub

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

Jump to bottom

Remove maven-bundle-plugin to fix duplicate class errors #8653

Merged
merged 11 commits into from May 25, 2021
Merged

Remove maven-bundle-plugin to fix duplicate class errors #8653

merged 11 commits into from May 25, 2021

Commits on May 25, 2021

  1. Add headerfiles to Makefile

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    eb3ab8c View commit details
    Browse the repository at this point in the history

  2. Add another header to Makefile

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    f9a60fc View commit details
    Browse the repository at this point in the history

  3. Add another file to Makefile

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    76bd17c View commit details
    Browse the repository at this point in the history

  4. Updating makefile to pass the tests

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    f447554 View commit details
    Browse the repository at this point in the history

  5. Run update_file_lists.sh

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    6319a23 View commit details
    Browse the repository at this point in the history

  6. Reverting last change since tests are still failing

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    eb57ffe View commit details
    Browse the repository at this point in the history

  7. Fixing objc tests

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    2f8d310 View commit details
    Browse the repository at this point in the history

  8. resolving conflicts

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    021329b View commit details
    Browse the repository at this point in the history

  9. Removing files that were added during rebasing

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    713f2d0 View commit details
    Browse the repository at this point in the history

  10. Removing more files that were added during rebasing

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    3f8f6e9 View commit details
    Browse the repository at this point in the history

  11. Reverting the Makefile spacing changes

    @deannagarcia
    deannagarcia committed May 25, 2021
    Copy the full SHA
    5fac12f View commit details
    Browse the repository at this point in the history