From 1576d255d492b822295b89f215438cd1fee1d715 Mon Sep 17 00:00:00 2001
From: Leroy Ruegemer <lruegeme@techfak.uni-bielefeld.de>
Date: Wed, 15 Mar 2017 14:14:19 +0100
Subject: [PATCH] update for new rosjava_bootstrap

- bootstrap dependency bump
---
 README.md                                             | 3 +--
 package.xml                                           | 2 +-
 src/genjava/templates/genjava_project/build.gradle.in | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6d182ae..201b763 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,7 @@ This doesn't work exactly though because it doesn't pull in the full classpath.
         def generateSourcesTask = p.tasks.create("generateSources", JavaExec)
         generateSourcesTask.description = "Generate sources for " + pkg.name
         generateSourcesTask.outputs.dir(p.file(generatedSourcesDir))
-        /* generateSourcesTask.args = new ArrayList<String>([generatedSourcesDir, pkg.name]) */
-        generateSourcesTask.args = new ArrayList<String>([generatedSourcesDir, '--package-path=' + pkg.directory, pkg.name])
+        generateSourcesTask.args = new ArrayList<String>(['--output-path', generatedSourcesDir, '--package-path', pkg.directory, '--package-names', pkg.name])
         generateSourcesTask.classpath = p.configurations.runtime
         generateSourcesTask.main = 'org.ros.internal.message.GenerateInterfaces'
         p.tasks.compileJava.source generateSourcesTask.outputs.files
diff --git a/package.xml b/package.xml
index 02098f3..a907f61 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>genjava</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>
     Java ROS message and service generators.
   </description>
diff --git a/src/genjava/templates/genjava_project/build.gradle.in b/src/genjava/templates/genjava_project/build.gradle.in
index 621c3f4..0638d1d 100644
--- a/src/genjava/templates/genjava_project/build.gradle.in
+++ b/src/genjava/templates/genjava_project/build.gradle.in
@@ -49,7 +49,7 @@ ext {
 task generateSources (type: JavaExec) {
     description = "Generate sources for %(project_name)s"
     outputs.dir(file(generated_sources_directory))
-    args = new ArrayList<String>([generated_sources_directory, '--package-path=%(pkg_directory)s', '%(project_name)s'])
+    args = new ArrayList<String>(['--output-path', generated_sources_directory, '--package-path' ,'%(pkg_directory)s', '--package-names' ,'%(project_name)s'])
     classpath = configurations.runtime
     main = 'org.ros.internal.message.GenerateInterfaces'
     tasks.compileJava.source outputs.files
@@ -61,6 +61,7 @@ dependencies {
 }
 
 jar {
+    from sourceSets.main.output.classesDir
     manifest = osgiManifest {
         classesDir = sourceSets.main.output.classesDir
         classpath = configurations.runtime