maven-tools 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0b654fca583b62e7a10de128927b26468d8ee91
-  data.tar.gz: e9e2699b1d02ecbfc0a98c41056b9f883a60a12f
+  metadata.gz: 6a0b94c28533c3f03e26d0c43df381feb35eaf98
+  data.tar.gz: ca1edcc59f9f22df224f231ddf8822420af83787
 SHA512:
-  metadata.gz: ed509040eadb25e0143754f8028dc7fe1b7011e5d0a7e75703c3c13046c2995f94e26700fbd7b08bdf121ccd9e94e3b7645f6f457e25088e93edbed4a66b700f
-  data.tar.gz: 965b3cfb7816c21d407ccb1dff729c47aa42259a43d80f0fbe39bccbca29029f74fe485f5a380e5713770ee977cbe1ddfb6b55d2329ed3b05b16cf655eb8f182
+  metadata.gz: 1ecf9d81ba58a18947d3af6245bac72269359018e5db081775d72102488a94811c38b8c644d3509d169adbb8da84d5ed749e8052b5f696d877bdcc3cd2c25aaf
+  data.tar.gz: 2b6f26ef2b21ff7f18d8f25c101c16ef3d0115edbdf8ac06fb4745a62b40d2245aca32ae6429417c0ba6c910c63894bc05a6be650b4dffc458008e10671299e9

data/Mavenfile

@@ -10,10 +10,10 @@ end
 
 # (jruby-1.6.7 produces a lot of yaml errors parsing gemspecs)
 properties( 'jruby.plugins.version' => '1.1.4',
-            'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.5.0'].join(','),
+            'jruby.versions' => ['1.7.12', '1.7.25', '9.0.5.0', '9.1.2.0'].join(','),
             'jruby.modes' => ['1.9', '2.0', '2.2'].join(','),
             # just lock the versions
-            'jruby.version' => '1.7.24' )
+            'jruby.version' => '9.1.2.0' )
 
 profile :id => :release do
   properties 'maven.test.skip' => true, 'invoker.skip' => true, 'push.skip' => false

data/lib/maven/tools/dsl.rb

@@ -86,7 +86,7 @@ module Maven
         self.send a[:type].to_sym, a
       end
 
-      def source(*args)
+      def source(*args, &block)
         url = args[0].to_s
         url = 'https://rubygems.org' if url == :rubygems
         id = url.gsub( /[\/:"<>|?*]/, '_').gsub(/_+/, '_') unless url == 'https://rubygems.org'
@@ -100,6 +100,8 @@ module Maven
         repository :id => id || 'mavengems', :url => "mavengem:#{url}"
         extension! 'org.torquebox.mojo:mavengem-wagon', '${mavengem.wagon.version}'
         @current = current if current
+
+        block.call if block
       end
 
       def ruby( *args )
@@ -414,7 +416,7 @@ module Maven
       alias :plugin_repositories :licenses
       alias :resources :licenses
       alias :testResources :licenses
-      alias :plugins :licenses
+      alias :profiles :licenses
 
       def extensions(*args)
         if @context == :plugin || @context == :report_plugin
@@ -630,6 +632,19 @@ module Maven
         @current.file = file
       end
 
+      def os( options )
+        os = ActivationOS.new
+        os.family = options[ :family ] || options[ 'family' ]
+        os.version = options[ :version ] || options[ 'version' ]
+        os.arch = options[ :arch ] || options[ 'arch' ]
+        os.name = options[ :name ] || options[ 'name' ]
+        @current.os = os
+      end
+
+      def jdk( version )
+        @current.jdk = version
+      end
+
       def activation( &block )
         activation = Activation.new
         nested_block( :activation, activation, block ) if block
@@ -932,21 +947,25 @@ module Maven
       end
       private :plugin_gav
 
-      def plugins
-        if @current.respond_to? :build
-          @current.build ||= Build.new
-          if @context == :overrides
-            @current.build.plugin_management ||= PluginManagement.new
-            @current.build.plugin_management.plugins
-          else
-            @current.build.plugins
-          end
+      def plugins(&block)
+        if block
+          block.call
         else
-          if @context == :overrides
-            @current.plugin_management ||= PluginManagement.new
-            @current.plugin_management.plugins
+          if @current.respond_to? :build
+            @current.build ||= Build.new
+            if @context == :overrides
+              @current.build.plugin_management ||= PluginManagement.new
+              @current.build.plugin_management.plugins
+            else
+              @current.build.plugins
+            end
           else
-            @current.plugins
+            if @context == :overrides
+              @current.plugin_management ||= PluginManagement.new
+              @current.plugin_management.plugins
+            else
+              @current.plugins
+            end
           end
         end
       end

data/lib/maven/tools/model.rb

@@ -295,7 +295,7 @@ module Maven
       attribute :plugin_management, PluginManagement
       attribute :plugins, Array[ Plugin ]
     end
-    class Os
+    class ActivationOS
       include Base
 
       attribute :name, String
@@ -303,7 +303,7 @@ module Maven
       attribute :arch, String
       attribute :version, String
     end
-    class Property
+    class ActivationProperty
       include Base
 
       attribute :name, String
@@ -320,8 +320,8 @@ module Maven
 
       attribute :active_by_default, Boolean
       attribute :jdk, String
-      attribute :os, Os
-      attribute :property, Property
+      attribute :os, ActivationOS
+      attribute :property, ActivationProperty
       attribute :file, ActivationFile
     end
     class Profile

data/lib/maven/tools/version.rb

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

data/lib/maven/tools/versions.rb

@@ -24,12 +24,12 @@ module Maven
       VERSIONS = { 
         :jar_plugin => "2.4",
         :clean_plugin => "2.4",
-        :jruby_plugins => "1.1.4",
+        :jruby_plugins => "1.1.5",
         :jruby9_plugins => "0.3.0",
         :bundler_version => "1.10.6",
-        :jruby_version => "1.7.24",
-        :polyglot_version => "0.1.15",
-        :mavengem_wagon => "0.2.0"
+        :jruby_version => "9.1.2.0",
+        :polyglot_version => "0.1.18",
+        :mavengem_wagon => "0.2.1"
       }.freeze
     end
   end

data/lib/maven/tools/visitor.rb

@@ -146,7 +146,7 @@ module Maven
       end
       
       def escape_value( value )
-        value = value.to_s
+        value = value.to_s.dup
         value.gsub!( /&/, '&' )
         # undo double quote, somehow xyz.gemspec.rz have encoded values
         value.gsub!( /&(amp|lt|gt);/, '&\1;' )

data/spec/dsl/gemspec_spec/jars_and_poms.xml

@@ -5,8 +5,8 @@
   <version>0.0.0</version>
   <name>gemspec_spec</name>
   <properties>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml

@@ -5,8 +5,8 @@
   <version>0.0.0</version>
   <name>gemspec_spec</name>
   <properties>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/gemspec_spec/maven-tools.xml

@@ -5,8 +5,8 @@
   <version>0.0.0</version>
   <name>BASEDIR</name>
   <properties>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/jarfile_lock_spec/Jarfile.legacy.lock

@@ -1,6 +1,6 @@
 org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.0.0.M2a
 com.google.guava:guava:jar:10.0.1
-commons-logging:commons-logging:jar:1.1.4
+commons-logging:commons-logging:jar:1.1.5
 org.eclipse.aether:aether-connector-wagon:jar:0.9.0.M2
 org.eclipse.aether:aether-impl:jar:0.9.0.M2
 com.ning:async-http-client:jar:1.7.6

data/spec/dsl/jarfile_lock_spec/Jarfile.lock

@@ -2,7 +2,7 @@
 :jruby:
 - joda-time:joda-time:jar:2.3
 - com.martiansoftware:nailgun-server:jar:0.9.1
-- com.github.jnr:jnr-netdb:jar:1.1.4
+- com.github.jnr:jnr-netdb:jar:1.1.5
 - com.headius:invokebinder:jar:1.2
 - org.jruby.joni:joni:jar:2.1.1
 - com.github.jnr:jnr-posix:jar:3.0.1
@@ -11,7 +11,7 @@
 - org.yaml:snakeyaml:jar:1.13
 - com.github.jnr:jnr-constants:jar:0.8.5
 - com.github.jnr:jffi:jar:native:1.2.7
-- com.jcraft:jzlib:jar:1.1.4
+- com.jcraft:jzlib:jar:1.1.5
 - com.github.jnr:jnr-enxio:jar:0.4
 - org.jruby:yecht:jar:1.0
 - org.jruby:jruby-stdlib:jar:1.7.11
@@ -22,7 +22,7 @@
 :runtime:
 - org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.0.0.M2a
 - com.google.guava:guava:jar:10.0.1
-- commons-logging:commons-logging:jar:1.1.4
+- commons-logging:commons-logging:jar:1.1.5
 - org.eclipse.aether:aether-connector-wagon:jar:0.9.0.M2
 - org.eclipse.aether:aether-impl:jar:0.9.0.M2
 - com.ning:async-http-client:jar:1.7.6

data/spec/dsl/profile_gemspec_spec/jars_and_poms.xml

@@ -6,8 +6,8 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml

@@ -6,8 +6,8 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/profile_gemspec_spec/maven-tools.xml

@@ -6,8 +6,8 @@
   <name>BASEDIR</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/profile_gemspec_spec/no_gems.xml

@@ -6,8 +6,8 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <repositories>
     <repository>

data/spec/dsl/profile_gemspec_spec/snapshot.xml

@@ -6,8 +6,8 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <repositories>
     <repository>

data/spec/dsl/profile_gemspec_spec/unknown_license.xml

@@ -6,8 +6,8 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <repositories>
     <repository>

data/spec/dsl/project_gemspec_spec/extended.xml

@@ -26,8 +26,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/project_gemspec_spec/jars_and_poms.xml

@@ -26,8 +26,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/project_gemspec_spec/jars_and_poms_include_jars.xml

@@ -26,8 +26,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/project_gemspec_spec/maven-tools.xml

@@ -26,8 +26,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/project_gemspec_spec/no_gems.xml

@@ -26,8 +26,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <repositories>
     <repository>

data/spec/dsl/project_gemspec_spec/profile.xml

@@ -26,8 +26,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <repositories>
     <repository>

data/spec/dsl/project_gemspec_spec/snapshot.xml

@@ -26,8 +26,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <repositories>
     <repository>

data/spec/dsl/project_gemspec_spec/unknown_license.xml

@@ -24,8 +24,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <repositories>
     <repository>

data/spec/gemfile/pom.xml

@@ -30,8 +30,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_include_jars/pom.xml

@@ -30,8 +30,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_with_access_to_model/pom.xml

@@ -30,8 +30,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.4</jruby.plugins.version>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
     <version_from_model>1.5.0</version_from_model>
   </properties>
   <repositories>