maven-tools 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf78be52e455a8af44a9d4e16c3b23f2c6edf9b
-  data.tar.gz: e171856084989ae3b92520fcbe208c9517ddf20d
+  metadata.gz: a18e9180582c32d4fd33f48db8f8070e4f4c9bcd
+  data.tar.gz: 21736ea084645a61641b463e6b7aa1ca10149de8
 SHA512:
-  metadata.gz: cd1bac1d3e1407f26fbd3acb4340e9a4569d6c2effb1d3a11ae0d3bdf697c87774d87e76a8cea8f5938f435401e710b93deb115ed48ebfa908d6fc9dbce03162
-  data.tar.gz: fb0eef80a2741896901ece8bb566aa8abc5558b8d291b2be8fca0e7d1d927945708a937389ae86782b29114ff5269341a7e8b57c02562a8a80d22891109fe575
+  metadata.gz: 504783a9fc765d0e9bc7927a01805c408ae040fa63d36c50313c9a82f9b9609b254875c76b406cbac429115fe446c1b625e7a4523bdf5762adc4f3524a0b3ac2
+  data.tar.gz: 845c3169b54b99a6b019e14797d5829a74ce4fb5e6ab894846cc04136bdfc719030369ee17764c8435aad915f101bea5ecdad2d092d0cee99113fb993fb9ae53

data/lib/maven/tools/dsl.rb

@@ -4,6 +4,7 @@ require 'maven/tools/artifact'
 require 'maven/tools/jarfile'
 require 'maven/tools/versions'
 require 'maven/tools/gemfile_lock'
+require 'maven/tools/dsl/jars_lock'
 
 module Maven
   module Tools
@@ -126,8 +127,12 @@ module Maven
           name = 'Gemfile'
         end
         name = ::File.join( basedir, name ) unless ::File.exists?( name )
-        
-        @inside_gemfile = true   
+        if @context == :project
+          build do
+            directory '${basedir}/pkg'
+          end
+        end
+        @inside_gemfile = true
         # the eval might need those options for gemspec declaration
         lockfile = ::File.expand_path( name + '.lock' )
         if File.exists? lockfile
@@ -169,7 +174,7 @@ module Maven
         end
 
         if pr && pr.dependencies.empty?
-          if @current.respond_to? :delete
+          if @current.profiles.respond_to? :delete
             @current.profiles.delete( pr )
           else
             @current.profiles.remove( pr )
@@ -177,15 +182,19 @@ module Maven
         end
 
         if pr && !pr.dependencies.empty?
+          locked = GemfileLock.new( lockfile )
+          has_bundler = gem?( 'bundler' )
           profile :gemfile_lock do
             activation do
               file( :exists => name + '.lock' )
             end
-            locked = GemfileLock.new( lockfile )
             done = add_scoped_hull( locked, pr.dependencies )
             done += add_scoped_hull( locked, pr.dependencies,
                                         done, :provided )
             add_scoped_hull( locked, pr.dependencies, done, :test )
+            if locked['bundler'] && !  has_bundler
+              gem( 'bundler', locked['bundler'].version )
+            end
           end
         end
 
@@ -198,6 +207,7 @@ module Maven
                           :args => 'install' )
           end
         end
+        DSL::JarsLock.new(self)
       ensure
         @inside_gemfile = nil
         @gemspec_args = nil
@@ -629,6 +639,9 @@ module Maven
         resource = Resource.new
         fill_options( resource, options )
         nested_block( :test_resource, resource, block ) if block
+        unless resource.directory
+          resource.directory = '${basedir}'
+        end
         if @context == :project
           ( @current.build ||= Build.new ).test_resources << resource
         else
@@ -640,13 +653,30 @@ module Maven
         resource = Resource.new
         fill_options( resource, options )
         nested_block( :resource, resource, block ) if block
+        unless resource.directory
+          resource.directory = '${basedir}'
+        end
         if @context == :project
           ( @current.build ||= Build.new ).resources << resource
         else
           @current.resources << resource
         end
       end
-      
+
+      def packaging( val )
+        @current.packaging = val
+        if val =~ /jruby[WJ]ar/
+          if not @current.properties.key?( 'jruby9.plugins.version' ) and
+           not (@context == :profile and model.properties.key?( 'jruby9.plugins.version' ) )
+            properties( 'jruby9.plugins.version' => VERSIONS[ :jruby9_plugins ] )
+          end
+          extension 'de.saumya.mojo', 'jruby9-extensions', '${jruby9.plugins.version}'
+          build do
+            directory '${basedir}/pkg'
+          end
+        end
+      end
+
       def build_method( m, val )
         m = "#{m}=".to_sym
         if @context == :project

data/lib/maven/tools/dsl/gemspec.rb

@@ -41,13 +41,13 @@ module Maven
           spec = gem_specification( name )
           name ||= "#{spec.name}-#{spec.version}.gemspec"
           process( spec, name, options )
+          JarsLock.new( parent ) if parent.respond_to? :profile
         end
 
         attr_reader :parent
 
         def help
-          warn "\n# Jarfile DSL #\n"
-          warn self.class.help_block( :local => "path-to-local-jar", :jar => nil, :pom => nil, :repository => nil, :snapshot_repository => nil, :jruby => nil, :scope => nil)[0..-2]
+          warn "\n# gemspec(filename) - default find gemspec in current directory #\n"
         end
 
         def gem( scope, coord )

data/lib/maven/tools/dsl/jars_lock.rb

@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+module Maven
+  module Tools
+    module DSL
+      class JarsLock
+ 
+        def initialize( parent, file = 'Jars.lock' )
+          file = File.join( parent.basedir, file )
+          if File.exists?(file)
+            parent.profile File.basename(file) do
+              parent.activation do
+                parent.file( :exists => File.basename(file) )
+              end
+              File.read(file).each_line do |line|
+                data = line.sub(/-\ /, '').strip.split(':')
+                case data.size
+                when 3
+                  data = Hash[ [:groupId, :artifactId, :version].zip( data ) ]
+                  parent.jar data[:groupId], data[:artifactId], data[:version], :scope => :compile
+                when 4
+                  data = Hash[ [:groupId, :artifactId, :version, :scope].zip( data ) ]
+                  parent.jar data[:groupId], data[:artifactId], data[:version], :scope => data[:scope]
+                when 5
+                  data = Hash[ [:groupId, :artifactId, :classifier, :version, :scope].zip( data ) ]
+                  parent.jar data[:groupId], data[:artifactId], data[:version], :classifier => data[:classifier], :scope => data[:scope]
+                else
+                  warn "can not parse: #{line}"
+                end
+              end
+            end
+          end
+        end
+
+        def help
+          warn "\n# jars.lock(file) - default JArs.lock #\n"
+        end
+
+      end
+    end
+  end
+end

data/lib/maven/tools/dsl/profile_gemspec.rb

@@ -31,11 +31,6 @@ module Maven
           setup_gem_support( @parent, options, spec )
           super
         end
-
-        def help
-          warn "\n# Jarfile DSL #\n"
-          warn self.class.help_block( :local => "path-to-local-jar", :jar => nil, :pom => nil, :repository => nil, :snapshot_repository => nil, :jruby => nil, :scope => nil)[0..-2]
-        end
       end
     end
   end

data/lib/maven/tools/dsl/project_gemspec.rb

@@ -77,11 +77,6 @@ module Maven
             super
           end
         end
-
-        def help
-          warn "\n# Jarfile DSL #\n"
-          warn self.class.help_block( :local => "path-to-local-jar", :jar => nil, :pom => nil, :repository => nil, :snapshot_repository => nil, :jruby => nil, :scope => nil)[0..-2]
-        end
       end
     end
   end

data/lib/maven/tools/gemfile_lock.rb

@@ -38,10 +38,17 @@ module Maven
       def initialize(file)
         super()
         current = nil
+        bundler = false
         f = file.is_a?(File) ? file.path: file
         if File.exists? f
           File.readlines(f).each do |line|
-            if line =~ /^    [^ ]/
+            if line =~ /^BUNDLED WITH/
+              bundler = true
+            elsif bundler
+              line.strip!
+              current = Dependency.new("bundler (#{line})")
+              self[current.name] = current
+            elsif line =~ /^    [^ ]/
               line.strip!
               current = Dependency.new(line)
               self[current.name] = current

data/lib/maven/tools/version.rb

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

data/lib/maven/tools/versions.rb

@@ -24,9 +24,10 @@ module Maven
       VERSIONS = { 
         :jar_plugin => "2.4",
         :clean_plugin => "2.4",
-        :jruby_plugins => "1.0.9",
-        :bundler_version => "1.9.3",
-        :jruby_version => "1.7.19",
+        :jruby_plugins => "1.1.1",
+        :jruby9_plugins => "0.2.1",
+        :bundler_version => "1.10.6",
+        :jruby_version => "1.7.22",
         :tesla_version => "0.1.1",
         :polyglot_version => "0.1.18"
       }.freeze

data/maven-tools.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.test_files += Dir['spec/**/*.java']
   s.test_files += Dir['spec/**/*.xml']
   s.test_files += Dir['spec/**/*file']
-  s.test_files += Dir['spec/**/Gemfile.lock']
+  s.test_files += Dir['spec/**/*.lock']
   s.test_files += Dir['spec/**/.keep']
   s.test_files += Dir['spec/**/*gemspec']
   s.test_files += Dir['spec/**/*gem']

data/spec/dsl/gemspec_spec/jars_and_poms.xml

@@ -5,7 +5,7 @@
   <version>0.0.0</version>
   <name>gemspec_spec</name>
   <properties>
-    <jruby.plugins.version>1.0.9</jruby.plugins.version>
+    <jruby.plugins.version>1.1.1</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml

@@ -5,7 +5,7 @@
   <version>0.0.0</version>
   <name>gemspec_spec</name>
   <properties>
-    <jruby.plugins.version>1.0.9</jruby.plugins.version>
+    <jruby.plugins.version>1.1.1</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

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

@@ -5,7 +5,7 @@
   <version>0.0.0</version>
   <name>BASEDIR</name>
   <properties>
-    <jruby.plugins.version>1.0.9</jruby.plugins.version>
+    <jruby.plugins.version>1.1.1</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

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

@@ -0,0 +1,52 @@
+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.1
+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
+org.apache.maven.wagon:wagon-http-shared4:jar:2.4
+org.sonatype.plexus:plexus-cipher:jar:1.4
+org.sonatype.sisu:sisu-guice:jar:no_aop:3.1.0
+org.apache.maven:maven-model:jar:3.1.0
+org.sonatype.plexus:plexus-sec-dispatcher:jar:1.3
+org.codehaus.plexus:plexus-classworlds:jar:2.4
+org.apache.maven:maven-aether-provider:jar:3.1.0
+org.apache.maven.wagon:wagon-provider-api:jar:1.0
+io.netty:netty:jar:3.4.4.Final
+aopalliance:aopalliance:jar:1.0
+org.eclipse.aether:aether-api:jar:0.9.0.M2
+org.jsoup:jsoup:jar:1.7.1
+org.codehaus.plexus:plexus-interpolation:jar:1.16
+javax.enterprise:cdi-api:jar:1.0
+org.slf4j:slf4j-api:jar:1.6.6
+asm:asm:jar:3.3.1
+com.google.code.findbugs:jsr305:jar:1.3.9
+org.apache.maven:maven-repository-metadata:jar:3.1.0
+org.bouncycastle:bcpkix-jdk15on:jar:1.49
+org.apache.httpcomponents:httpcore:jar:4.2.3
+javax.annotation:jsr250-api:jar:1.0
+org.eclipse.sisu:org.eclipse.sisu.inject:jar:0.0.0.M2a
+org.apache.maven:maven-settings:jar:3.1.0
+org.apache.maven.wagon:wagon-file:jar:2.4
+org.slf4j:slf4j-simple:jar:1.6.6
+org.bouncycastle:bcprov-jdk15on:jar:1.49
+org.eclipse.aether:aether-util:jar:0.9.0.M2
+commons-io:commons-io:jar:2.0.1
+org.apache.httpcomponents:httpclient:jar:4.2.3
+org.eclipse.aether:aether-connector-file:jar:0.9.0.M2
+org.eclipse.aether:aether-spi:jar:0.9.0.M2
+org.apache.maven:maven-settings-builder:jar:3.1.0
+javax.inject:javax.inject:jar:1
+org.apache.maven:maven-model-builder:jar:3.1.0
+org.codehaus.plexus:plexus-component-annotations:jar:1.5.5
+org.apache.maven.wagon:wagon-http:jar:2.4
+org.codehaus.plexus:plexus-utils:jar:3.0.10
+org.eclipse.aether:aether-connector-asynchttpclient:jar:0.9.0.M2
+commons-codec:commons-codec:jar:1.6
+com.beust:jcommander:jar:1.27
+org.hamcrest:hamcrest-core:jar:1.1
+junit:junit:jar:4.10
+org.mockito:mockito-core:jar:1.9.5
+org.testng:testng:jar:6.8
+org.beanshell:bsh:jar:2.0b4
+org.objenesis:objenesis:jar:1.0

data/spec/dsl/jarfile_lock_spec/Jarfile.lock

@@ -0,0 +1,75 @@
+---
+:jruby:
+- joda-time:joda-time:jar:2.3
+- com.martiansoftware:nailgun-server:jar:0.9.1
+- com.github.jnr:jnr-netdb:jar:1.1.2
+- com.headius:invokebinder:jar:1.2
+- org.jruby.joni:joni:jar:2.1.1
+- com.github.jnr:jnr-posix:jar:3.0.1
+- org.jruby.extras:bytelist:jar:1.0.11
+- com.github.jnr:jnr-x86asm:jar:1.0.2
+- 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.2
+- com.github.jnr:jnr-enxio:jar:0.4
+- org.jruby:yecht:jar:1.0
+- org.jruby:jruby-stdlib:jar:1.7.11
+- org.jruby.jcodings:jcodings:jar:1.0.10
+- com.github.jnr:jffi:jar:1.2.7
+- org.jruby:jruby-core:jar:noasm:1.7.11
+- com.github.jnr:jnr-unixsocket:jar:0.3
+: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.1
+- 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
+- org.apache.maven.wagon:wagon-http-shared4:jar:2.4
+- org.sonatype.plexus:plexus-cipher:jar:1.4
+- org.sonatype.sisu:sisu-guice:jar:no_aop:3.1.0
+- org.apache.maven:maven-model:jar:3.1.0
+- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.3
+- org.codehaus.plexus:plexus-classworlds:jar:2.4
+- org.apache.maven:maven-aether-provider:jar:3.1.0
+- org.apache.maven.wagon:wagon-provider-api:jar:1.0
+- io.netty:netty:jar:3.4.4.Final
+- aopalliance:aopalliance:jar:1.0
+- org.eclipse.aether:aether-api:jar:0.9.0.M2
+- org.jsoup:jsoup:jar:1.7.1
+- org.codehaus.plexus:plexus-interpolation:jar:1.16
+- javax.enterprise:cdi-api:jar:1.0
+- org.slf4j:slf4j-api:jar:1.6.6
+- asm:asm:jar:3.3.1
+- com.google.code.findbugs:jsr305:jar:1.3.9
+- org.apache.maven:maven-repository-metadata:jar:3.1.0
+- org.bouncycastle:bcpkix-jdk15on:jar:1.49
+- org.apache.httpcomponents:httpcore:jar:4.2.3
+- javax.annotation:jsr250-api:jar:1.0
+- org.eclipse.sisu:org.eclipse.sisu.inject:jar:0.0.0.M2a
+- org.apache.maven:maven-settings:jar:3.1.0
+- org.apache.maven.wagon:wagon-file:jar:2.4
+- org.slf4j:slf4j-simple:jar:1.6.6
+- org.bouncycastle:bcprov-jdk15on:jar:1.49
+- org.eclipse.aether:aether-util:jar:0.9.0.M2
+- commons-io:commons-io:jar:2.0.1
+- org.apache.httpcomponents:httpclient:jar:4.2.3
+- org.eclipse.aether:aether-connector-file:jar:0.9.0.M2
+- org.eclipse.aether:aether-spi:jar:0.9.0.M2
+- org.apache.maven:maven-settings-builder:jar:3.1.0
+- javax.inject:javax.inject:jar:1
+- org.apache.maven:maven-model-builder:jar:3.1.0
+- org.codehaus.plexus:plexus-component-annotations:jar:1.5.5
+- org.apache.maven.wagon:wagon-http:jar:2.4
+- org.codehaus.plexus:plexus-utils:jar:3.0.10
+- org.eclipse.aether:aether-connector-asynchttpclient:jar:0.9.0.M2
+- commons-codec:commons-codec:jar:1.6
+:test:
+- com.beust:jcommander:jar:1.27
+- org.hamcrest:hamcrest-core:jar:1.1
+- junit:junit:jar:4.10
+- org.mockito:mockito-core:jar:1.9.5
+- org.testng:testng:jar:6.8
+- org.beanshell:bsh:jar:2.0b4
+- org.objenesis:objenesis:jar:1.0

data/spec/dsl/profile_gemspec_spec/jars_and_poms.xml

@@ -6,7 +6,7 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.9</jruby.plugins.version>
+    <jruby.plugins.version>1.1.1</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml

@@ -6,7 +6,7 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.9</jruby.plugins.version>
+    <jruby.plugins.version>1.1.1</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>