adds rmvn command since it comes with ruby-maven and make regular bin…

…/mvn inside the gem executable
jruby · Jul 6, 2015 · d0a2955 · d0a2955
1 parent ec3fc6b
commit d0a2955
Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/maven/jruby-dist/pom.rb b/maven/jruby-dist/pom.rb
@@ -66,6 +66,9 @@
       ( Dir[ File.join( gems, '**/*' ) ] + Dir[ File.join( gems, '**/.*' ) ] ).each do |f|
         File.chmod( 0644, f ) rescue nil if File.file?( f )
       end
+      Dir[ File.join( gems, '**/maven-home/bin/mvn' ) ].each do |f|
+        File.chmod( 0755, f ) rescue nil if File.file?( f )
+      end
     end
 
     execute :dump_full_specs_of_ruby_maven do |ctx|

diff --git a/maven/jruby-dist/src/main/assembly/jruby.xml b/maven/jruby-dist/src/main/assembly/jruby.xml
@@ -29,6 +29,13 @@
         <include>.mvn/**/*</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/rubygems-provided/gems</directory>
+      <outputDirectory>/lib/ruby/gems/shared/gems</outputDirectory>
+      <includes>
+        <include>ruby-maven-${ruby.maven.version}/bin/*</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>${project.build.directory}/rubygems-provided/gems/ruby-maven-libs-${ruby.maven.libs.version}/lib</directory>
       <outputDirectory>/lib/ruby/shared</outputDirectory>