maven-tools 0.34.4 → 0.34.5

data/lib/maven/tools/dsl.rb

@@ -133,6 +133,9 @@ module Maven
       end
 
       def setup_gem_support( options, spec = nil, config = {} )
+        unless model.properties.member?( 'project.build.sourceEncoding' )
+          properties( 'project.build.sourceEncoding' => 'utf-8' )
+        end
         if spec.nil?
           require_path = '.'
           name = File.basename( File.expand_path( '.' ) )
@@ -265,9 +268,6 @@ module Maven
 
       def spec( spec, name = nil, options = {} )
         name ||= "#{spec.name}-#{spec.version}.gemspec"
-        unless model.properties.member?( 'project.build.sourceEncoding' )
-          properties( 'project.build.sourceEncoding' => 'utf-8' ) 
-        end
 
         @gemfile_options = nil
 
@@ -942,6 +942,11 @@ module Maven
         end
         if args.last.is_a?(Hash)
           options = args.last
+        elsif @group
+          options = {}
+          args << options
+        end
+        if options
 
           # on ruby-maven side we ignore the require option
           options.delete( :require )
@@ -953,15 +958,15 @@ module Maven
             @has_path = true
           else
             platform = options.delete( :platform ) || options.delete( 'platform' )
-            group = options.delete( :group ) || options.delete( 'group' ) || @group || nil
-             if group
+            group = options.delete( :group ) || options.delete( 'group' ) || @group
+            if group
                case group.to_sym
                when :test
                  options[ :scope ] = :test 
                when :development
                  options[ :scope ] = :provided
                end
-             end
+            end
             if platform.nil? || is_jruby_platform( platform )
               options[ :version ] = '[0,)' if args.size == 2 && options[ :version ].nil? && options[ 'version' ].nil?
               do_dependency( bang, :gem, *args )

data/lib/maven/tools/version.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '0.34.4'.freeze
+    VERSION = '0.34.5'.freeze
   end
 end

data/lib/maven/tools/versions.rb

@@ -27,10 +27,10 @@ module Maven
         :war_plugin => "2.2",
         :jar_plugin => "2.4",
         :clean_plugin => "2.4",
-        :jruby_plugins => "1.0.0-rc4",
-        :bundler_version => "1.3.5",
-        :jruby_version => "1.7.6",
-        :tesla_version => "0.0.8"
+        :jruby_plugins => "1.0.0",
+        :bundler_version => "1.6.2",
+        :jruby_version => "1.7.12",
+        :tesla_version => "0.0.9"
       }.freeze
     end
   end

data/rspec/maven/tools/gem_project_spec.rb

@@ -40,7 +40,6 @@ XML
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-default</artifactId>
-      <version>[0,)</version>
       <type>pom</type>
     </dependency>
   </dependencies>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 0.34.4
   prerelease:
+  version: 0.34.5
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus