From 1d1b89703da6b1eb45bfd7de2eb09aa562ad483d Mon Sep 17 00:00:00 2001 From: Daniel Stonier <d.stonier@gmail.com> Date: Wed, 16 Oct 2013 18:43:51 +0900 Subject: [PATCH] use the project version for the subfolder message generation (rosjava_test_msgs). --- .../main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy index 61d19d2..518023a 100644 --- a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy +++ b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy @@ -156,10 +156,10 @@ class CatkinPackage { /* * Hack to work around for rosjava_test_msgs - look in a subfolder for the - * msgs and name the artifact by the subfolder name. + * msgs and name the artifact by the subfolder name/version. */ def void generateMessageArtifactInSubFolder(Project p, String subfolderName, List<String> dependencies) { - p.version = version + // p.version = version use the subfolder's project version p.dependencies.add("compile", 'org.ros.rosjava_bootstrap:message_generation:0.1.+') dependencies.each { d -> p.dependencies.add("compile", p.dependencies.project(path: ':' + d)) -- GitLab