Update JAVAPATH generation

Author: Erwan Le Huitouze

ament_build_type_gradle/ament_build_type_gradle/__init__.py

@@ -98,10 +98,11 @@ def on_build(self, context):
         # expand environment hook for JAVAPATH
         ext = '.sh.in' if not IS_WINDOWS else '.bat.in'
         template_path = self.get_environment_hook_template_path('javapath' + ext)
-        javapath = os.path.join('$AMENT_CURRENT_PREFIX', 'share', context.package_manifest.name, 'java', '*') + ':' \
-            + os.path.join('$AMENT_CURRENT_PREFIX', 'lib', 'java', '*')
+        javapath = os.path.join('$AMENT_CURRENT_PREFIX', 'share', context.package_manifest.name, 'java', '*')
+        javapath_depends = os.path.join('$AMENT_CURRENT_PREFIX', 'lib', 'java', '*')
         content = configure_file(template_path, {
-            'JAVAPATH': javapath
+            'JAVAPATH': javapath,
+            'JAVAPATH_DEPENDS': javapath_depends
         })
         javapath_environment_hook = os.path.join(
             environment_hooks_path, os.path.basename(template_path)[:-3])

ament_build_type_gradle/ament_build_type_gradle/template/environment_hook/javapath.sh.in

@@ -1,3 +1,4 @@
 # generated from ament_package/template/environment_hook/javapath.sh.in
 
 ament_prepend_unique_value JAVAPATH "@JAVAPATH@"
+ament_prepend_unique_value JAVAPATH "@JAVAPATH_DEPENDS@"