maven-tools 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e19d1a856b4e631741ad0ce39566eccc749c75
-  data.tar.gz: 583cc562022e0749ecf88e3c83ac49359becf447
+  metadata.gz: bd77fa2d8549271ae147991be591a6dde3ef2592
+  data.tar.gz: 20e2799b2ac9f984dfed4c010bdb4870331994a8
 SHA512:
-  metadata.gz: f5f29ed74b6375ec904aa5ff99baaba6936f5005bc5b7df8ff067b87747168a2c4094aa0daedce75c41daa4afbd2cb36bba225364ef1fa9a0410b093e62e20c2
-  data.tar.gz: 608aeec206313fc9c7117703311ea47072e588ad7cca1f7895156e45b50d320a27cfd4e4919ca6fcdba72163ed641347f9d0bbfce3d1eed101ac4fe666fc5f49
+  metadata.gz: 1a63eb60ce4792afbd158cd837fd605783e0aca9fb3202c4113944e4b464c62061fd393549daa2a1078112134efafdd6039c0fc757dcd9c54d053fd3ebd6cced
+  data.tar.gz: 93d7b66f753f270e473622a122deda761dd7ddbfa6f0c24dd4792171d3ff284fc6bfc101a3089c1304deed99dbd7da10b6cf5dce1c71a5be5dc21d4dcb18d86d

data/Mavenfile

@@ -13,27 +13,15 @@ properties( 'jruby.plugins.version' => '1.1.4',
             'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.5.0'].join(','),
             'jruby.modes' => ['1.9', '2.0', '2.2'].join(','),
             # just lock the versions
-            'jruby.version' => '1.7.24',
-            'push.skip' => true )
-
+            'jruby.version' => '1.7.24' )
 
 profile :id => :release do
   properties 'maven.test.skip' => true, 'invoker.skip' => true, 'push.skip' => false
 
-#  distribution_management do
-#    repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
-#  end
-
   build do
     default_goal :deploy
   end
 
-#  plugin :gpg, '1.5' do
-#    execute_goal :sign, :id => 'sign artifacts', :phase => :verify
-#  end
-#  plugin :deploy, '2.8.2' do
-#    execute_goal :deploy, :phase => :deploy, :id => 'deploy gem to maven central'
-#  end
 end
 
 # vim: syntax=Ruby

data/lib/maven/tools/dsl.rb

@@ -410,11 +410,18 @@ module Maven
       alias :dependencies :licenses
       alias :repositories :licenses
       alias :plugin_repositories :licenses
-      alias :extensions :licenses
       alias :resources :licenses
       alias :testResources :licenses
       alias :plugins :licenses
 
+      def extensions(*args)
+        if @context == :plugin || @context == :report_plugin
+          @current.extensions = args[0]
+        else
+          yield
+        end
+      end
+
       def build( &block )
         build = @current.build ||= Build.new
         nested_block( :build, build, block ) if block
@@ -1217,9 +1224,12 @@ module Maven
           reports = reports[ 0..-2 ]
           id = options.delete( :id ) || options.delete( 'id' )
           set.id = id if id
-          inherited = options.delete( :inherited ) ||
-            options.delete( 'inherited' )
-          set.inherited = inherited if inherited
+          inherited = options.delete( :inherited )
+          inherited = options.delete( 'inherited' ) if inherited.nil?
+          set.inherited = inherited unless inherited.nil?
+          extensions = options.delete( :extensions )
+          extensions = options.delete( 'extensions' ) if extensions.nil?
+          set.extensions = extensions unless extensions.nil?
         end
         set_config( set, options )
         set.reports = reports#.to_java
@@ -1373,8 +1383,12 @@ module Maven
 
       def prepare_config( receiver, options )
         return unless options
-        inherited = options.delete( 'inherited' ) || options.delete( :inherited )
-        receiver.inherited = inherited if inherited
+        inh = options.delete( 'inherited' )
+        inh = options.delete( :inherited ) if inh.nil?
+        receiver.inherited = inh unless inh.nil?
+        ext = options.delete( 'extensions' )
+        ext = options.delete( :extensions ) if ext.nil?
+        receiver.extensions = ext unless ext.nil?
       end
 
       def set_config( receiver, options )

data/lib/maven/tools/version.rb

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

data/spec/mavenfile/Mavenfile

@@ -222,11 +222,11 @@ test_resource do
   excludes [ '*~' ]
 end
 
-plugin :jar, '1.0', :inherited => true do
+plugin :jar, '1.0', 'inherited' => 'false', :extensions => true do
   configuration :finalName => :testing
 end
 
-jruby_plugin :gem, '1.0.0' do
+jruby_plugin :gem, '1.0.0', :extensions => false do
   gem :bundler, '1.7.13'
 end
 

data/spec/pom.xml

@@ -344,7 +344,8 @@
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <version>1.0</version>
-        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <inherited>false</inherited>
         <configuration>
           <finalName>testing</finalName>
         </configuration>
@@ -353,6 +354,7 @@
         <groupId>de.saumya.mojo</groupId>
         <artifactId>gem-maven-plugin</artifactId>
         <version>1.0.0</version>
+        <extensions>false</extensions>
         <dependencies>
           <dependency>
             <groupId>rubygems</groupId>

data/spec/pom_maven_alternative_style/pom.rb

@@ -164,11 +164,11 @@ project 'my name', 'example.com' do
       excludes [ '*~' ]
     end
 
-    plugin :jar, '1.0', :inherited => true do
+    plugin :jar, '1.0', :inherited => false, :extensions => true do
       configuration :finalName => :testing
     end
     
-    jruby_plugin :gem, '1.0.0' do
+    jruby_plugin :gem, '1.0.0', 'extensions' => false do
       gem :bundler, '1.7.13'
     end
 

data/spec/pom_maven_hash_style/pom.rb

@@ -185,10 +185,11 @@ project :name => 'my name', :url => 'example.com' do
                    :includes => [ '**/*' ],
                    :excludes => [ '*~' ] )
     plugin( :jar, '1.0',
-            :inherited => true,
+            :inherited => false,
+            :extensions => true,
             :finalName => :testing )
 
-    jruby_plugin :gem, '1.0.0' do
+    jruby_plugin :gem, '1.0.0', 'extensions' => false do
       gem :bundler, '1.7.13'
     end
 

data/spec/pom_maven_style/pom.rb

@@ -249,11 +249,13 @@ project do
     end
 
     plugin :jar, '1.0' do
-      inherited true
+      inherited false
+      extensions 'true'
       configuration :finalName => :testing
     end
 
     jruby_plugin :gem, '1.0.0' do
+      extensions false
       dependency do
         group_id 'rubygems'
         artifact_id 'bundler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement