maven-tools 1.0.13 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61cf6a20d55270a571d8c5e3926871aea1c567d1
-  data.tar.gz: 39349a0d5cb27236ada163ca962ea6c00aded50d
+  metadata.gz: b742974a17c7cd3cf45392fb776a41f74df4304d
+  data.tar.gz: 8b014df2f65e5a2286401d83b0f31929d645efbe
 SHA512:
-  metadata.gz: 10b210c1d58d53129f1393f7655d26292bd865ae8e013ce1322def7b12a59ee562568244bd87c664190e94e9a9cdabc65b741c195a33e9a483e121d5796c3f5b
-  data.tar.gz: 5be5524e68ff18088270ccc6804e9e530851f5a6768b1e756798ae0c06ae7f01e16a2e2f45492c85c43347e81cacb0230b6d70988eb93a3e53cd8c85d46985c7
+  metadata.gz: 2e1768b75ab38044d80f763868564eacb509dac8422f3c106824ac1f8322b10c31ee426111e979893a8441bc50ab069584474a17f80074172e31151b15088971
+  data.tar.gz: c7c08292545673cd50bfb639c9e96fa037ea77c7b8a5d7aafc5da768277a508ce2198da57832f6f659628b824fd472241db515df10881bb487951c2f764cd2bf

data/Mavenfile

@@ -9,30 +9,31 @@ end
 #snapshot_repository :jruby, 'http://ci.jruby.org/snapshots/maven'
 
 # (jruby-1.6.7 produces a lot of yaml errors parsing gemspecs)
-properties( 'jruby.versions' => ['1.7.12', '1.7.20', '9.0.0.0.rc1'].join(','),
-            'jruby.modes' => ['1.9', '2.0', '2.1'].join(','),
+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.20',
+            'jruby.version' => '1.7.24',
             'push.skip' => true )
 
 
 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
+#  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
+#  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

@@ -88,7 +88,19 @@ module Maven
       end
 
       def source(*args)
-        warn "ignore source #{args}" if !(args[0].to_s =~ /^https?:\/\/rubygems.org/) && args[0] != :rubygems
+        url = args[0].to_s
+        url = 'https://rubygems.org' if url == :rubygems
+        id = url.gsub( /[\/:"<>|?*]/, '_').gsub(/_+/, '_') unless url == 'https://rubygems.org'
+
+        # we need to add the repo at project level
+        if @context == :profile
+          current = @current
+          @current = @model
+        end
+
+        repository :id => id || 'mavengems', :url => "mavengem:#{url}"
+        extension! 'org.torquebox.mojo:mavengem-wagon', '${mavengem.wagon.version}'
+        @current = current if current
       end
 
       def ruby( *args )
@@ -129,6 +141,7 @@ module Maven
         name = ::File.join( basedir, name ) unless ::File.exists?( name )
         if @context == :project
           build do
+            extension! 'org.torquebox.mojo:mavengem-wagon', '${mavengem.wagon.version}'
             directory '${basedir}/pkg'
           end
         end
@@ -138,7 +151,7 @@ module Maven
         if File.exists? lockfile
           pr = profile :gemfile do
             activation do
-              file( :missing => name + '.lock' )
+              file( :missing => name.sub(/#{basedir}./, '') + '.lock' )
             end
             
             FileUtils.cd( basedir ) do
@@ -186,7 +199,7 @@ module Maven
           has_bundler = gem?( 'bundler' )
           profile :gemfile_lock do
             activation do
-              file( :exists => name + '.lock' )
+              file( :exists => name.sub(/#{basedir}./, '') + '.lock' )
             end
             done = add_scoped_hull( locked, pr.dependencies )
             done += add_scoped_hull( locked, pr.dependencies,
@@ -262,10 +275,9 @@ module Maven
         
         unless options[ :only_metadata ]
         
-          if ( nil == model.repositories.detect { |r| r.id == 'rubygems-releases' } && options[ :no_rubygems_repo ] != true )
+          if ( nil == model.repositories.detect { |r| r.id == 'rubygems-releases' || r.id == 'mavengems' } && options[ :no_rubygems_repo ] != true )
             
-            repository( 'rubygems-releases',
-                        'http://rubygems-proxy.torquebox.org/releases' )
+            repository( 'mavengems', 'mavengem:https://rubygems.org' )
           end
           @needs_torquebox = true
 
@@ -670,7 +682,7 @@ module Maven
            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}'
+          extension 'org.torquebox.mojo', 'jruby9-extensions', '${jruby9.plugins.version}'
           build do
             directory '${basedir}/pkg'
           end
@@ -695,9 +707,30 @@ module Maven
         build_method( __method__, val )
       end
 
+      def default_goal( val )
+        build_method( __method__, val )
+      end
+
       def output_directory( val )
         build_method( __method__, val )
       end
+
+      def test_output_directory( val )
+        build_method( __method__, val )
+      end
+
+      def source_directory( val )
+        build_method( __method__, val )
+      end
+
+      def script_source_directory( val )
+        build_method( __method__, val )
+      end
+
+      def test_source_directory( val )
+        build_method( __method__, val )
+      end
+
       def repository( *args, &block )
         do_repository( :repository=, *args, &block )
       end
@@ -803,6 +836,12 @@ module Maven
       end
 
       def extension( *args )
+        ext, build = do_extension( *args )
+        build.extensions << ext
+        ext
+      end
+
+      def do_extension( *args )
         build = if @context == :build
                   @current
                 else
@@ -811,6 +850,13 @@ module Maven
         args, options = args_and_options( *args )
         ext = fill_gav( Extension, args.join( ':' ) )
         fill_options( ext, options )
+        [ ext, build ]
+      end
+
+      def extension!( *args )
+        ext, build = do_extension( *args )
+        old = build.extensions.detect { |e| e.group_id == ext.group_id && e.artifact_id == ext.artifact_id }
+        build.extensions.remove( old ) if old
         build.extensions << ext
         ext
       end
@@ -826,6 +872,7 @@ module Maven
         if not @current.properties.key?( 'jruby.plugins.version' ) and
            not (@context == :profile and model.properties.key?( 'jruby.plugins.version' ) )
           properties( 'jruby.plugins.version' => VERSIONS[ :jruby_plugins ] )
+          properties( 'mavengem.wagon.version' => VERSIONS[ :mavengem_wagon ] )
         end
       end
 

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

@@ -27,6 +27,7 @@ module Maven
           if not @parent.properties.key?( 'jruby.plugins.version' ) and
               not project.properties.key?( 'jruby.plugins.version' )
             @parent.properties( 'jruby.plugins.version' => VERSIONS[ :jruby_plugins ] )
+            @parent.properties( 'mavengem.wagon.version' => VERSIONS[ :mavengem_wagon ] )
           end
         end
 
@@ -42,10 +43,9 @@ module Maven
             name = spec.name
           end
 
-          if ( nil == project.current.repositories.detect { |r| r.id == 'rubygems-releases' } && options[ :no_rubygems_repo ] != true )
-              
-            @parent.repository( 'rubygems-releases',
-                                'http://rubygems-proxy.torquebox.org/releases' )
+          if ( nil == project.current.repositories.detect { |r| r.id == 'rubygems-releases' || r.id == 'mavengems' } && options[ :no_rubygems_repo ] != true && ! @parent.instance_variable_get(:@inside_gemfile))
+            @parent.repository( 'mavengems',
+                                'mavengem:https://rubygems.org' )
           end
           @parent.needs_torquebox = true
             

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

@@ -54,6 +54,11 @@ module Maven
           def dependencies
             @deps
           end
+
+          def basedir
+            # assume the lock file is inside the project dir
+            File.dirname(@lock.file)
+          end
         end
 
         def artifacts
@@ -113,7 +118,9 @@ module Maven
         end
 
         def local( path )
-          a = Artifact.new_local( ::File.expand_path( path ), :jar )
+          jar_path = ::File.expand_path( path )
+          jar_path.sub!( /#{@parent.basedir}/, '${basedir}' )
+          a = Artifact.new_local( jar_path, :jar )
           add( a )
           # TODO remove this part
           artifacts << a

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

@@ -40,7 +40,8 @@ module Maven
             end
           end
         end
-        
+        attr_reader :file
+
         def dump
           if @data and not @data.empty?
             File.write( @file, @data.to_yaml )

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

@@ -29,6 +29,10 @@ module Maven
 
         def process( spec, name, options )
           setup_gem_support( @parent, options, spec )
+          profile = @parent.current
+          @parent.instance_variable_set :@current, @parent.model
+          @parent.extension! 'org.torquebox.mojo:mavengem-wagon:${mavengem.wagon.version}'
+          @parent.instance_variable_set :@current, profile
           super
         end
       end

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

@@ -60,6 +60,7 @@ module Maven
           end
   
           @parent.packaging 'gem'
+          @parent.extension! 'org.torquebox.mojo:mavengem-wagon:${mavengem.wagon.version}'
           if setup_gem_support( @parent, options, spec )
             @parent.extension 'de.saumya.mojo:gem-with-jar-extension:${jruby.plugins.version}'
           else

data/lib/maven/tools/model.rb

@@ -1,5 +1,12 @@
 require 'virtus'
 
+# keep things in line with java collections
+class Array
+  def remove( *args )
+    delete( *args )
+  end
+end
+    
 module Maven
   module Tools
     Base = Virtus.model

data/lib/maven/tools/version.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '1.0.13'.freeze
+    VERSION = '1.1.0'.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.2",
-        :jruby9_plugins => "0.2.2",
+        :jruby_plugins => "1.1.4",
+        :jruby9_plugins => "0.3.0",
         :bundler_version => "1.10.6",
-        :jruby_version => "1.7.22",
-        :tesla_version => "0.1.1",
-        :polyglot_version => "0.1.18"
+        :jruby_version => "1.7.24",
+        :polyglot_version => "0.1.15",
+        :mavengem_wagon => "0.2.0"
       }.freeze
     end
   end

data/lib/maven/tools/visitor.rb

@@ -127,6 +127,9 @@ module Maven
           attr = hash.select do |k, v|
             [ k, v ] if k.to_s.match( /^@/ )
           end
+          # workaround error with :configuration => :gems => { ... }
+          method = name == :gems ? :raw_tag : :tag
+
           start_tag( name, attr )
           hash.each do |k, v|
             case v
@@ -135,7 +138,7 @@ module Maven
             when Hash
               accept_hash( k, v )
             else
-              tag( k, v ) unless k.to_s.match( /^@/ )
+              send( method, k, v ) unless k.to_s.match( /^@/ )
             end
           end
           end_tag( name )

data/spec/dsl/gemspec_spec/jars_and_poms.xml

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

data/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml

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

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

@@ -5,7 +5,8 @@
   <version>0.0.0</version>
   <name>BASEDIR</name>
   <properties>
-    <jruby.plugins.version>1.1.2</jruby.plugins.version>
+    <jruby.plugins.version>1.1.4</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.0</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.2
+commons-logging:commons-logging:jar:1.1.4
 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.2
+- com.github.jnr:jnr-netdb:jar:1.1.4
 - 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.2
+- com.jcraft:jzlib:jar:1.1.4
 - 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.2
+- commons-logging:commons-logging:jar:1.1.4
 - 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,7 +6,8 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.2</jruby.plugins.version>
+    <jruby.plugins.version>1.1.4</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>
@@ -35,11 +36,18 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <id>mavengems</id>
+      <url>mavengem:https://rubygems.org</url>
     </repository>
   </repositories>
   <build>
+    <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>${mavengem.wagon.version}</version>
+      </extension>
+    </extensions>
     <plugins>
       <plugin>
         <groupId>de.saumya.mojo</groupId>

data/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml

@@ -6,7 +6,8 @@
   <name>profile_gemspec_spec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.2</jruby.plugins.version>
+    <jruby.plugins.version>1.1.4</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>
@@ -35,11 +36,18 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <id>mavengems</id>
+      <url>mavengem:https://rubygems.org</url>
     </repository>
   </repositories>
   <build>
+    <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>${mavengem.wagon.version}</version>
+      </extension>
+    </extensions>
     <plugins>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>