maven-tools 1.0.0.rc5 → 1.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 824ec21a7dc9f640e0054c0d6169257d278a8e16
-  data.tar.gz: 2db21fe36ab4f4eaeea4c3a43bcd1e350fa7a6ef
+  metadata.gz: 1601cbf1e73ea797bebffc753c925173153824f7
+  data.tar.gz: 08609fc9a6ea13a191458d7c5f1c449823be4500
 SHA512:
-  metadata.gz: 9a633083e857fa127017fd8f65eecd835e83c87524612aae4b374dbd28685ef658d3be9f508cd308166efd1ee1f4443a5d1722107e20dac4b29f3758a78047a8
-  data.tar.gz: facb9734d8a29364479fb433f010d10eebfed726b572a6823b1266d943c712e7648b1e7efbee87ca0912dbcb7e9ae2d704c6410d6fe58b00d9b16d94ea38cefe
+  metadata.gz: a2b2551400405f9aec9f3c09a98c58790ea402f53244055847c6701f1af2eb9e6972be4a8ac7d65728a32e3c192f1953670d7e8235c2127a34fb191fb0359446
+  data.tar.gz: e4928cbe9160003568ff70ba3c89e5935fa54495a891cc83da4b1a5fcd67f385b48c4af5a4cf9dfe6eaa474fc6667c8c56cd682002641c334cb26e6f9308c514

data/lib/maven/tools/artifact.rb

@@ -152,7 +152,7 @@ module Maven
 
       def exclusions
         if key?( :exclusions )
-          self[:exclusions].inspect.gsub( /[\[\]" ]/, '' ).split /,/
+          self[:exclusions].inspect.gsub( /[\[\]" ]/, '' ).split( /,/ )
         end
       end
 

data/lib/maven/tools/coordinate.rb

@@ -122,7 +122,7 @@ module Maven
       end
 
       def snapshot_version( val )
-        if val.match /[a-z]|[A-Z]/ and not val.match /-SNAPSHOT|[${}]/
+        if val.match(/[a-z]|[A-Z]/) && !val.match(/-SNAPSHOT|[${}]/)
           val + '-SNAPSHOT'
         else
           val

data/lib/maven/tools/dsl.rb

@@ -245,8 +245,12 @@ module Maven
             source_directory source
           end
         end
-        if jar && ( source || 
-                    ::File.exists?( ::File.join( basedir, 'src', 'main', 'java' ) ) ) && spec.platform.to_s.match( /java|jruby/ )
+        if jar && ( source ||
+                    ::File.exists?( ::File.join( basedir, 'src', 'main', 'java' ) ) )
+          unless spec.nil? || spec.platform.to_s.match( /java|jruby/ )
+            warn "gem is not a java platform gem but has a jar and source"
+          end
+ 
           plugin( :jar, VERSIONS[ :jar_plugin ],
                   :outputDirectory => output,
                   :finalName => jar ) do
@@ -254,7 +258,7 @@ module Maven
           end
           plugin( :clean, VERSIONS[ :clean_plugin ],
                   :filesets => [ { :directory => output,
-                                   :includes => [ "#{jar}.jar" ] } ] )
+                                   :includes => [ "#{jar}.jar", '*/**/*.jar' ] } ] )
           true
         else
           false
@@ -299,7 +303,7 @@ module Maven
           file.populate_unlocked do |dsl|
             setup_jruby( dsl.jruby )
             dsl.artifacts.each do |a|
-              dependency a
+              _dependency a
             end
           end
         else
@@ -395,6 +399,7 @@ module Maven
         config = { :gemspec => name.sub( /^#{basedir}\/?/, '' ) }
         if options[ :include_jars ] || options[ 'include_jars' ] 
           config[ :includeDependencies ] = true
+          config[ :useRepositoryLayout ] = true
         end
         jruby_plugin!( :gem, config )
 
@@ -409,7 +414,7 @@ module Maven
         
         unless deps.java_runtime.empty?
           deps.java_runtime.each do |d|
-            dependency Maven::Tools::Artifact.new( *d )
+            _dependency Maven::Tools::Artifact.new( *d )
           end
         end
       end
@@ -430,6 +435,21 @@ module Maven
       end
       private :all_deps
 
+      def licenses
+        yield
+      end
+      alias :developers :licenses
+      alias :contributors :licenses
+      alias :mailing_lists :licenses
+      alias :notifiers :licenses
+      alias :dependencies :licenses
+      alias :repositories :licenses
+      alias :plugin_repositories :licenses
+      alias :extensions :licenses
+      alias :resources :licenses
+      alias :testResources :licenses
+      alias :plugins :licenses
+
       def build( &block )
         build = @current.build ||= Build.new
         nested_block( :build, build, block ) if block
@@ -978,15 +998,15 @@ module Maven
         exec
       end
 
-      def dependency( type, *args, &block )
+      def _dependency( type, *args, &block )
         do_dependency( false, type, *args, &block )
       end
 
-      def dependency!( type, *args, &block )
+      def _dependency!( type, *args, &block )
         do_dependency( true, type, *args, &block )
       end
 
-      def dependency?( type, *args )
+      def _dependency?( type, *args )
         find_dependency( dependency_container,
                          retrieve_dependency( type, *args ) ) != nil
       end
@@ -1122,14 +1142,29 @@ module Maven
         end
       end
 
-      def profile( id, &block )
+      def profile( *args, &block )
         profile = Profile.new
-        profile.id = id if id
+        args, options = args_and_options( *args )
+        profile.id = args[ 0 ]
+        fill_options( profile, options )
         @current.profiles << profile
         nested_block( :profile, profile, block ) if block
         profile
       end
 
+      def dependency( *args, &block )
+        dep = Dependency.new
+        args, options = args_and_options( *args )
+        dep.group_id = args[ 0 ]
+        dep.artifact_id = args[ 1 ]
+        dep.version = args[ 2 ]
+        dep.type = :jar
+        fill_options( dep, options )
+        nested_block( :dependency, dep, block ) if block
+        dependency_container << dep
+        dep
+      end
+
       def report_set( *reports, &block )
         set = ReportSet.new
         case reports.last
@@ -1160,7 +1195,7 @@ module Maven
       end
 
       def jar!( *args )
-        dependency!( :jar, *args )
+        _dependency!( :jar, *args )
       end
 
       def gem( *args )
@@ -1217,7 +1252,7 @@ module Maven
 
       def local( path, options = {} )
         path = ::File.expand_path( path )
-        dependency( :jar,
+        _dependency( :jar,
                     Maven::Tools::Artifact.new_local( path, :jar, options ) )
       end
 
@@ -1260,11 +1295,11 @@ module Maven
             #     ( args.size == 1 && args[0].is_a?( Hash ) )
               case method.to_s[ -1 ]
               when '?'
-                dependency?( method.to_s[0..-2].to_sym, *args, &block )
+                _dependency?( method.to_s[0..-2].to_sym, *args, &block )
               when '!'
-                dependency!( method.to_s[0..-2].to_sym, *args, &block  )
+                _dependency!( method.to_s[0..-2].to_sym, *args, &block  )
               else
-                dependency( method, *args, &block )
+                _dependency( method, *args, &block )
               end
               # elsif @current.respond_to? method
               #   @current.send( method, *args )

data/lib/maven/tools/version.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '1.0.0.rc5'.freeze
+    VERSION = '1.0.0.rc6'.freeze
   end
 end

data/lib/maven/tools/versions.rb

@@ -24,10 +24,10 @@ module Maven
       VERSIONS = { 
         :jar_plugin => "2.4",
         :clean_plugin => "2.4",
-        :jruby_plugins => "1.0.2",
+        :jruby_plugins => "1.0.3",
         :bundler_version => "1.6.2",
-        :jruby_version => "1.7.12",
-        :tesla_version => "0.1.0"
+        :jruby_version => "1.7.13",
+        :tesla_version => "0.1.1"
       }.freeze
     end
   end

data/spec/gemfile/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_include_jars/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -67,6 +67,7 @@
         <configuration>
           <gemspec>bouncy-castle-java.gemspec</gemspec>
           <includeDependencies>true</includeDependencies>
+          <useRepositoryLayout>true</useRepositoryLayout>
         </configuration>
       </plugin>
     </plugins>

data/spec/gemfile_with_access_to_model/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
     <version_from_model>1.5.0</version_from_model>
   </properties>
   <repositories>

data/spec/gemfile_with_custom_source/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -89,6 +89,7 @@
               <directory>mylib</directory>
               <includes>
                 <include>bouncy-castle-java.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/spec/gemfile_with_custom_source_and_custom_jarname/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -89,6 +89,7 @@
               <directory>lib</directory>
               <includes>
                 <include>green.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/spec/gemfile_with_extras/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <tesla.dump.readonly>true</tesla.dump.readonly>
   </properties>
@@ -78,6 +78,7 @@
         <configuration>
           <gemspec>bouncy-castle-java.gemspec</gemspec>
           <includeDependencies>true</includeDependencies>
+          <useRepositoryLayout>true</useRepositoryLayout>
         </configuration>
       </plugin>
       <plugin>

data/spec/gemfile_with_groups/pom.xml

@@ -17,7 +17,7 @@
   <name>gemfile_with_groups</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_with_groups_and_lockfile/pom.xml

@@ -17,7 +17,7 @@
   <name>gemfile_with_groups_and_lockfile</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <repositories>
     <repository>

data/spec/gemfile_with_lock/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_with_path/pom.xml

@@ -17,7 +17,7 @@
   <name>gemfile_with_path</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_with_source/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -85,6 +85,7 @@
               <directory>mylib</directory>
               <includes>
                 <include>bouncy-castle-java.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/spec/gemfile_with_source_and_custom_jarname/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -88,6 +88,7 @@
               <directory>mylib</directory>
               <includes>
                 <include>green.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/spec/gemfile_with_source_and_no_jar/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_with_test_group/pom.xml

@@ -8,7 +8,7 @@
   <name>gemfile_with_test_group</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <repositories>
     <repository>

data/spec/gemfile_without_gemspec/pom.xml

@@ -17,7 +17,7 @@
   <name>gemfile_without_gemspec</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemspec/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemspec_in_profile/pom.xml

@@ -32,7 +32,7 @@
       </build>
       <properties>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-        <jruby.plugins.version>1.0.2</jruby.plugins.version>
+        <jruby.plugins.version>1.0.3</jruby.plugins.version>
       </properties>
       <dependencies>
         <dependency>

data/spec/gemspec_include_jars/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -67,6 +67,7 @@
         <configuration>
           <gemspec>bouncy-castle-java.gemspec</gemspec>
           <includeDependencies>true</includeDependencies>
+          <useRepositoryLayout>true</useRepositoryLayout>
         </configuration>
       </plugin>
     </plugins>

data/spec/gemspec_no_rubygems_repo/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemspec_prerelease/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemspec_prerelease_snapshot/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemspec_with_access_to_model/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
     <version_from_model>1.5.0</version_from_model>
   </properties>
   <repositories>

data/spec/gemspec_with_custom_source/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -89,6 +89,7 @@
               <directory>mylib</directory>
               <includes>
                 <include>bouncy-castle-java.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/spec/gemspec_with_custom_source_and_custom_jarname/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -89,6 +89,7 @@
               <directory>lib</directory>
               <includes>
                 <include>green.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/spec/gemspec_with_extras/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <tesla.dump.readonly>true</tesla.dump.readonly>
   </properties>
@@ -78,6 +78,7 @@
         <configuration>
           <gemspec>bouncy-castle-java.gemspec</gemspec>
           <includeDependencies>true</includeDependencies>
+          <useRepositoryLayout>true</useRepositoryLayout>
         </configuration>
       </plugin>
       <plugin>

data/spec/gemspec_with_prereleased_dependency/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemspec_with_source/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -85,6 +85,7 @@
               <directory>mylib</directory>
               <includes>
                 <include>bouncy-castle-java.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/spec/gemspec_with_source_and_custom_jarname/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -88,6 +88,7 @@
               <directory>mylib</directory>
               <includes>
                 <include>green.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/spec/gemspec_with_source_and_no_jar/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.2</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/pom_from_jarfile/pom.xml

@@ -19,7 +19,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.12</version>
+      <version>1.7.13</version>
       <type>pom</type>
       <scope>provided</scope>
     </dependency>

data/spec/pom_maven_style/pom.rb

@@ -23,43 +23,51 @@ project do
     url 'ngo.org'
   end
 
-  license do
-    name 'AGPL'
-    url 'gnu.org/agpl'
-    distribution 'online'
-    comments 'should be used more often'
+  licenses do
+    license do
+      name 'AGPL'
+      url 'gnu.org/agpl'
+      distribution 'online'
+      comments 'should be used more often'
+    end
   end
 
-  developer do
-    id '1'
-    name 'first'
-    email 'first@example.com'
-    url 'example.com/first'
-    organization 'orga'
-    organization_url 'example.org'
-    roles 'developer', 'architect'
-    timezone 'IST'
-    properties :gender => :male
+  developers do
+    developer do
+      id '1'
+      name 'first'
+      email 'first@example.com'
+      url 'example.com/first'
+      organization 'orga'
+      organization_url 'example.org'
+      roles 'developer', 'architect'
+      timezone 'IST'
+      properties :gender => :male
+    end
   end
-
-  contributor do
-    name 'first'
-    email 'first@example.com'
-    url 'example.com/first'
-    organization 'orga'
-    organization_url 'example.org'
-    roles 'developer', 'architect'
-    timezone 'IST'
-    properties :gender => :male
+  
+  contributors do
+    contributor do
+      name 'first'
+      email 'first@example.com'
+      url 'example.com/first'
+      organization 'orga'
+      organization_url 'example.org'
+      roles 'developer', 'architect'
+      timezone 'IST'
+      properties :gender => :male
+    end
   end
 
-  mailing_list do
-    name 'development'
-    subscribe 'subcribe@example.com'
-    unsubscribe 'unsubcribe@example.com'
-    post 'post@example.com'
-    archive 'example.com/archive'
-    other_archives 'example.com/archive1', 'example.com/archive2'
+  mailing_lists do
+    mailing_list do
+      name 'development'
+      subscribe 'subcribe@example.com'
+      unsubscribe 'unsubcribe@example.com'
+      post 'post@example.com'
+      archive 'example.com/archive'
+      other_archives 'example.com/archive1', 'example.com/archive2'
+    end
   end
 
   prerequisites do
@@ -136,67 +144,83 @@ project do
   end
   properties :key1 => 'value1', 'key2' => :value2
   dependency_management do
-    jar( 'com.example:tools:1.2.3' ) do
+    dependencies do
+      dependency do
+        group_id 'com.example'
+        artifact_id 'tools'
+        version '1.2.3'
+        classifier 'super'
+        scope 'provided'
+        system_path '/home/development/tools.jar'
+        optional true
+        exclusion 'org.example:some'
+        exclusion 'org.example', 'something'
+      end
+    end
+  end
+  dependencies do
+    dependency do
+      group_id 'com.example'
+      artifact_id 'tools'
+      version '2.3'
+      type :war
       classifier 'super'
       scope 'provided'
-      system_path '/home/development/tools.jar'
-      optional true
+      system_path '/home/development/wartools.jar'
+      optional false
       exclusion 'org.example:some'
       exclusion 'org.example', 'something'
     end
   end
-  war( 'com.example:tools', '2.3' ) do
-    classifier 'super'
-    scope 'provided'
-    system_path '/home/development/wartools.jar'
-    optional false
-    exclusion 'org.example:some'
-    exclusion 'org.example', 'something'
-  end
-  repository do
-    id :first
-    url 'http://repo.example.com'
-    name 'First'
-    layout 'legacy'
-    releases do 
-      enabled true
-      update_policy 'daily'
-      checksum_policy :strict
-    end
-    snapshots do 
-      enabled false
-      update_policy :never
-      checksum_policy 'none'
-    end
-  end
-  snapshot_repository do
-    id 'snapshots'
-    url 'http://snaphots.example.com'
-    name 'First Snapshots'
-    layout 'legacy'
-    releases do 
-      update_policy 'daily'
-      checksum_policy :strict
+  repositories do
+    repository do
+      id :first
+      url 'http://repo.example.com'
+      name 'First'
+      layout 'legacy'
+      releases do 
+        enabled true
+        update_policy 'daily'
+        checksum_policy :strict
+      end
+      snapshots do 
+        enabled false
+        update_policy :never
+        checksum_policy 'none'
+      end
     end
-    snapshots do
-      update_policy :never
-      checksum_policy 'none'
+  
+    snapshot_repository do
+      id 'snapshots'
+      url 'http://snaphots.example.com'
+      name 'First Snapshots'
+      layout 'legacy'
+      releases do 
+        update_policy 'daily'
+        checksum_policy :strict
+      end
+      snapshots do
+        update_policy :never
+        checksum_policy 'none'
+      end
     end
   end
-  plugin_repository do
-    id :first
-    url 'http://pluginrepo.example.com'
-    name 'First'
-    layout 'legacy'
-    releases do 
-      enabled true
-      update_policy 'daily'
-      checksum_policy :strict
-    end
-    snapshots do 
-      enabled false
-      update_policy :never
-      checksum_policy 'none'
+  plugin_repositories do
+    plugin_repository do
+      id :first
+      url 'http://pluginrepo.example.com'
+      name 'First'
+      layout 'legacy'
+      releases do 
+        enabled true
+        update_policy 'daily'
+        checksum_policy :strict
+      end
+      snapshots do 
+        enabled false
+        update_policy :never
+        checksum_policy 'none'
+      end
     end
   end
   build do
@@ -228,7 +252,12 @@ project do
     end
 
     jruby_plugin :gem, '1.0.0' do
-      gem :bundler, '1.6.2'
+      dependency do
+        group_id 'rubygems'
+        artifact_id 'bundler'
+        version '1.6.2'
+        type :gem
+      end
     end
 
     plugin :antrun do
@@ -249,7 +278,11 @@ project do
         id 'copy'
         phase 'package'
       end
-      jar 'org.super.duper:executor:1.0.0'
+      dependency do
+        group_id 'org.super.duper'
+        artifact_id 'executor'
+        version '1.0.0'
+      end
     end
     
     plugin 'org.codehaus.mojo:exec-maven-plugin' do

data/spec/pom_with_execute/pom.xml

@@ -16,7 +16,7 @@
   <version>0.0.0</version>
   <name>example with execute</name>
   <properties>
-    <tesla.version>0.1.0</tesla.version>
+    <tesla.version>0.1.1</tesla.version>
   </properties>
   <build>
     <plugins>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.0.rc6
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus