Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Commit

Permalink
Merge pull request #12 from adamantivm/kinetic-updates
Browse files Browse the repository at this point in the history
Version bump, including rosinstalls
  • Loading branch information
adamantivm committed Dec 18, 2016
2 parents e1116ce + 33fecd3 commit fdd740b
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 32 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Changelog for package rosjava
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.3.0 (2016-12-17)
------------------
* Updates for kinetic release.

0.2.1 (2015-03-02)
------------------
* added rocon_rosjava_core to the dependencies.
Expand Down
6 changes: 3 additions & 3 deletions android_core.rosinstall
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Prerequistes: https://raw.github.com/rosjava/rosjava/indigo/rosjava.rosinstall
# Prerequistes: https://raw.github.com/rosjava/rosjava/kinetic/rosjava.rosinstall
#
[
{'git': {'local-name': 'android_core', 'version': 'indigo', 'uri':'https://github.com/rosjava/android_core'}},
{'git': {'local-name': 'android_extras', 'version': 'indigo', 'uri':'https://github.com/rosjava/android_extras'}},
{'git': {'local-name': 'android_core', 'version': 'kinetic', 'uri':'https://github.com/rosjava/android_core'}},
{'git': {'local-name': 'android_extras', 'version': 'kinetic', 'uri':'https://github.com/rosjava/android_extras'}},
]
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>rosjava</name>
<version>0.2.2</version>
<version>0.3.0</version>
<description>
This is a meta package for the official rosjava repositories.
</description>
Expand All @@ -27,7 +27,7 @@
<run_depend>rocon_rosjava_core</run_depend>

<export>
<metapackage/>
<metapackage/>
</export>
</package>

18 changes: 9 additions & 9 deletions rosjava.rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
# Note: usually don't have yocs_msgs sources in an underlay, so add it here.
[
# A minimal source environment for rosjava that utilises rosjava_messages for message generation
{'git': {'local-name': 'rosjava_build_tools', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
{'git': {'local-name': 'genjava', 'version': 'indigo', 'uri':'https://github.com/rosjava/genjava.git'}},
{'git': {'local-name': 'rosjava_bootstrap', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_bootstrap'}},
{'git': {'local-name': 'rosjava_test_msgs', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_test_msgs.git'}},
{'git': {'local-name': 'rosjava_messages', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_messages'}},
{'git': {'local-name': 'rosjava_core', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_core'}},
{'git': {'local-name': 'rosjava_extras', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_extras'}},
{'git': {'local-name': 'zeroconf_jmdns_suite', 'version': 'indigo', 'uri':'https://github.com/rosjava/zeroconf_jmdns_suite'}},
{'git': {'local-name': 'rosjava', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava.git'}},
{'git': {'local-name': 'rosjava_build_tools', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
{'git': {'local-name': 'genjava', 'version': 'kinetic', 'uri':'https://github.com/rosjava/genjava.git'}},
{'git': {'local-name': 'rosjava_bootstrap', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_bootstrap'}},
{'git': {'local-name': 'rosjava_test_msgs', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_test_msgs.git'}},
{'git': {'local-name': 'rosjava_messages', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_messages'}},
{'git': {'local-name': 'rosjava_core', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_core'}},
{'git': {'local-name': 'rosjava_extras', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_extras'}},
{'git': {'local-name': 'zeroconf_jmdns_suite', 'version': 'kinetic', 'uri':'https://github.com/rosjava/zeroconf_jmdns_suite'}},
{'git': {'local-name': 'rosjava', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava.git'}},
# Rocon rosjava
{'git': {'local-name': 'rocon_rosjava_core', 'version': 'indigo', 'uri':'https://github.com/robotics-in-concert/rocon_rosjava_core'}},
# Temporary requirements
Expand Down
8 changes: 4 additions & 4 deletions rosjava_messages.rosinstall
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Messages and temporarily forked sources for rosjava messages

[
{'git': {'local-name': 'rosjava_build_tools', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
{'git': {'local-name': 'rosjava_bootstrap', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_bootstrap.git'}},
{'git': {'local-name': 'genjava', 'version': 'indigo', 'uri':'https://github.com/rosjava/genjava.git'}},
{'git': {'local-name': 'rosjava_messages', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_messages.git'}},
{'git': {'local-name': 'rosjava_build_tools', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
{'git': {'local-name': 'rosjava_bootstrap', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_bootstrap.git'}},
{'git': {'local-name': 'genjava', 'version': 'kinetic', 'uri':'https://github.com/rosjava/genjava.git'}},
{'git': {'local-name': 'rosjava_messages', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_messages.git'}},

# Till map_store update is released...or replaced with world_canvas_msgs
{'git': {'local-name': 'map_store', 'version': 'hydro-devel', 'uri':'https://github.com/stonier/map_store.git'}},
Expand Down
28 changes: 14 additions & 14 deletions rosjava_minimal.rosinstall
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@

[
# The core rosjava packages
{'git': {'local-name': 'rosjava_build_tools', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
{'git': {'local-name': 'rosjava_bootstrap', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_bootstrap.git'}},
{'git': {'local-name': 'rosjava_build_tools', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
{'git': {'local-name': 'rosjava_bootstrap', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_bootstrap.git'}},
{'git': {'local-name': 'genmsg', 'version': 'indigo-devel', 'uri':'https://github.com/ros/genmsg.git'}},
{'git': {'local-name': 'gencpp', 'version': 'indigo-devel', 'uri':'https://github.com/ros/gencpp.git'}},
{'git': {'local-name': 'genpy', 'version': 'indigo-devel', 'uri':'https://github.com/ros/genpy.git'}},
{'git': {'local-name': 'message_generation', 'version': 'groovy-devel', 'uri':'https://github.com/ros/message_generation.git'}},
{'git': {'local-name': 'genpy', 'version': 'kinetic-devel', 'uri':'https://github.com/ros/genpy.git'}},
{'git': {'local-name': 'message_generation', 'version': 'kinetic-devel', 'uri':'https://github.com/ros/message_generation.git'}},
{'git': {'local-name': 'message_runtime', 'version': 'groovy-devel', 'uri':'https://github.com/ros/message_runtime.git'}},
{'git': {'local-name': 'genjava', 'version': 'indigo', 'uri':'https://github.com/rosjava/genjava.git'}},
{'git': {'local-name': 'rosjava_test_msgs', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_test_msgs.git'}},
#{'git': {'local-name': 'rosjava_messages', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_messages.git'}},
{'git': {'local-name': 'rosjava_core', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_core.git'}},
{'git': {'local-name': 'rosjava_extras', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava_extras.git'}},
{'git': {'local-name': 'zeroconf_jmdns_suite', 'version': 'indigo', 'uri':'https://github.com/rosjava/zeroconf_jmdns_suite.git'}},
{'git': {'local-name': 'rosjava', 'version': 'indigo', 'uri':'https://github.com/rosjava/rosjava.git'}},
{'git': {'local-name': 'genjava', 'version': 'kinetic', 'uri':'https://github.com/rosjava/genjava.git'}},
{'git': {'local-name': 'rosjava_test_msgs', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_test_msgs.git'}},
#{'git': {'local-name': 'rosjava_messages', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_messages.git'}},
{'git': {'local-name': 'rosjava_core', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_core.git'}},
{'git': {'local-name': 'rosjava_extras', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava_extras.git'}},
{'git': {'local-name': 'zeroconf_jmdns_suite', 'version': 'kinetic', 'uri':'https://github.com/rosjava/zeroconf_jmdns_suite.git'}},
{'git': {'local-name': 'rosjava', 'version': 'kinetic', 'uri':'https://github.com/rosjava/rosjava.git'}},

# Message dependencies (geometry_experimental is for tf2)
{'git': {'local-name': 'ros_comm_msgs', 'version': 'indigo-devel', 'uri':'https://github.com/ros/ros_comm_msgs.git'}},
{'git': {'local-name': 'std_msgs', 'version': 'groovy-devel', 'uri':'https://github.com/ros/std_msgs.git'}},
{'git': {'local-name': 'common_msgs', 'version': 'indigo-devel', 'uri':'https://github.com/ros/common_msgs.git'}},
{'git': {'local-name': 'common_msgs', 'version': 'jade-devel', 'uri':'https://github.com/ros/common_msgs.git'}},
{'git': {'local-name': 'geometry_experimental', 'version': 'indigo-devel', 'uri':'https://github.com/ros/geometry_experimental.git'}}, #tf2
#{'git': {'local-name': 'ros', 'version': 'indigo-devel', 'uri':'https://github.com/ros/ros.git'}}, # test_roslib_comm
#{'git': {'local-name': 'ros_comm', 'version': 'indigo-devel', 'uri':'https://github.com/ros/ros_comm.git'}}, # lots of test messages
#{'git': {'local-name': 'ros', 'version': 'kinetic-devel', 'uri':'https://github.com/ros/ros.git'}}, # test_roslib_comm
#{'git': {'local-name': 'ros_comm', 'version': 'kinetic-devel', 'uri':'https://github.com/ros/ros_comm.git'}}, # lots of test messages

]

0 comments on commit fdd740b

Please sign in to comment.