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

master back to develop #11

Merged
merged 1 commit into from
Jan 18, 2023
Merged

master back to develop #11

merged 1 commit into from
Jan 18, 2023

Conversation

dominik-cnx
Copy link
Collaborator

  • updating poms for 3.0.1-SNAPSHOT development

  • updating poms for branch'release-3.0.0' with non-snapshot versions

  • updating develop poms to master versions to avoid merge conflicts

  • Updating develop poms back to pre merge state

  • Migrate to GitHub actions (Migrate to GitHub actions #9)

  • Migrate to Github actions

  • Migrate to Github actions

Co-authored-by: Ball, Nware [email protected]

Co-authored-by: Travis-CI [email protected]
Co-authored-by: Ball, Nware [email protected]

* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>
@dominik-cnx dominik-cnx merged commit ba08ef1 into develop Jan 18, 2023
dominik-cnx added a commit that referenced this pull request Jan 18, 2023
* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

* pr to master to trigger release (#10) (#11)

* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

* Update README.md

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>
dominik-cnx added a commit that referenced this pull request Jan 19, 2023
* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

* pr to master to trigger release (#10) (#11)

* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

* Update README.md

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>
dominik-cnx added a commit that referenced this pull request Jan 19, 2023
* pr to master to trigger release (#10)

* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

* pr to master again to trigger release (#12)

* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

* pr to master to trigger release (#10) (#11)

* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

* Update README.md

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

* merge back to master (#13)

* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

* pr to master to trigger release (#10) (#11)

* updating poms for 3.0.1-SNAPSHOT development

* updating poms for branch'release-3.0.0' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Migrate to GitHub actions (#9)

* Migrate to Github actions

* Migrate to Github actions

Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

* Update README.md

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>

Co-authored-by: Travis-CI <[email protected]>
Co-authored-by: Ball, Nware <[email protected]>
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.

1 participant