Skip to content

Comments

Port changes ament java: update how to export jars#186

Merged
ivanpauno merged 6 commits intomainfrom
ivanpauno/backport-changes-ament-java
Jun 17, 2021
Merged

Port changes ament java: update how to export jars#186
ivanpauno merged 6 commits intomainfrom
ivanpauno/backport-changes-ament-java

Conversation

@ivanpauno
Copy link
Contributor

Starting to contribute back from https://github.com/osrf/ros2_java.
These are the first three commits in osrf:galactic-devel that differ from main.

I think we will also need to merge ros2-java/ament_java#15 together with this.
Maybe we can first merge that PR without deleting the .sh and .bat templates, and then merge this one (to avoid breaking CI in the middle).

Required for Dashing, but can be removed in Eloquent.

Signed-off-by: Jacob Perron <[email protected]>
@ivanpauno ivanpauno requested a review from jacobperron June 14, 2021 21:31
@ivanpauno ivanpauno self-assigned this Jun 14, 2021
@jacobperron
Copy link
Contributor

I don't recall if there was an issue leaving the old .sh and .bat templates, but if you have the bandwidth could you try and open a PR leaving them in?

@jacobperron
Copy link
Contributor

Or, I suppose we could just merge ros2-java/ament_java#15, since we don't care too much about being backwards compatible.

@jacobperron
Copy link
Contributor

@ivanpauno Can you add a commit to this PR that updates the repos file(s) to use the new main branch of ament_java?

@ivanpauno
Copy link
Contributor Author

@ivanpauno Can you add a commit to this PR that updates the repos file(s) to use the new main branch of ament_java?

Sounds good!
I'm first moving to https://github.com/jacobperron/ament_java/tree/reapply_10 to see if that makes CI pass.
If that works, we can merge ros2-java/ament_java#15 to the new ament_java main branch and then merge this one (including the commit that switches to ament_java main branch).

Signed-off-by: Ivan Santiago Paunovic <[email protected]>
Signed-off-by: Ivan Santiago Paunovic <[email protected]>
@ivanpauno
Copy link
Contributor Author

If that works, we can merge ros2-java/ament_java#15 to the new ament_java main branch and then merge this one (including the commit that switches to ament_java main branch).

Okay that worked, using ament_java main branch now.
We can merge this one after ros2-java/ament_java#15 gets merged.

@ivanpauno ivanpauno closed this Jun 17, 2021
@ivanpauno ivanpauno reopened this Jun 17, 2021
@ivanpauno ivanpauno merged commit 2ac6f6c into main Jun 17, 2021
@ivanpauno ivanpauno deleted the ivanpauno/backport-changes-ament-java branch June 17, 2021 16:18
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.

2 participants