maven-tools 1.0.0.rc2 → 1.0.0.rc3

data/spec/pom_maven_alternative_style/pom.rb

@@ -1,6 +1,6 @@
 project 'my name', 'example.com' do
 
-  model_version '1.0.0'
+  model_version '1.0.1'
 
   parent 'example', 'parent', '1.1' do
     relative_path '../pom.xml'
@@ -73,7 +73,6 @@ project 'my name', 'example.com' do
     repository( :first, 
                 'http://repo.example.com',
                 'First',
-                :unique_version => 123,
                 :layout => 'legacy' ) do
       releases( :enabled => true,
                 :update_policy => 'daily',
@@ -85,7 +84,6 @@ project 'my name', 'example.com' do
     snapshot_repository( 'snapshots', 
                          'http://snaphots.example.com',
                          'First Snapshots',
-                         :unique_version => 1234,
                          :layout => 'legacy' ) do
       releases( :enabled => false,
                 :update_policy => 'daily',
@@ -114,7 +112,6 @@ project 'my name', 'example.com' do
          :optional => false )
   end
   repository( 'first', 'http://repo.example.com', 'First' ) do
-    unique_version 123
     layout 'legacy'
     releases( :enabled => true,
               :update_policy => 'daily',
@@ -126,7 +123,6 @@ project 'my name', 'example.com' do
   snapshot_repository( 'snapshots', 
                        'http://snaphots.example.com',
                        'First Snapshots',
-                       :unique_version => 12345,
                        :layout => 'legacy' ) do
     releases( :update_policy => 'daily',
               :checksum_policy => :strict )
@@ -134,7 +130,6 @@ project 'my name', 'example.com' do
                :checksum_policy => 'none' )
   end
   plugin_repository( :first, 'http://pluginrepo.example.com', 'First' ) do
-    unique_version 12
     layout 'legacy'
     releases( :enabled => true,
               :update_policy => 'daily',
@@ -166,6 +161,62 @@ project 'my name', 'example.com' do
       includes [ '**/*' ]
       excludes [ '*~' ]
     end
+
+    plugin :jar, '1.0', :inherited => true do
+      configuration :finalName => :testing
+    end
+    
+    jruby_plugin :gem, '1.0.0' do
+      gem :bundler, '1.6.2'
+    end
+
+    phase :package do
+      plugin :antrun do
+        execute_goals( 'run',
+                       :id => 'copy',
+                       'tasks' => {
+                         'exec' => {
+                           '@executable' => '/bin/sh',
+                           '@osfamily' => 'unix',
+                           'arg' => {
+                             '@line' => '-c \'cp "${jruby.basedir}/bin/jruby.bash" "${jruby.basedir}/bin/jruby"\''
+                           }
+                         },
+                         'chmod' => {
+                           '@file' => '${jruby.basedir}/bin/jruby',
+                           '@perm' => '755'
+                         }
+                       } )
+        jar 'org.super.duper:executor:1.0.0'
+      end
+    end
+    
+    plugin 'org.codehaus.mojo:exec-maven-plugin' do
+      execute_goal( 'exec',
+                    :id => 'invoker-generator',
+                    'arguments' => [ '-Djruby.bytecode.version=${base.java.version}',
+                                     '-classpath',
+                                     xml( '<classpath/>' ),
+                                     'org.jruby.anno.InvokerGenerator',
+                                     '${anno.sources}/annotated_classes.txt',
+                                     '${project.build.outputDirectory}' ],
+                    'executable' =>  'java',
+                    'classpathScope' =>  'compile' )
+    end
+
+    overrides do
+      plugin( "org.mortbay.jetty:jetty-maven-plugin:8.1",
+              :path => '/',
+              :connectors => [ { :@implementation => "org.eclipse.jetty.server.nio.SelectChannelConnector",
+                                 :port => '${run.port}' },
+                               { :@implementation => "org.eclipse.jetty.server.ssl.SslSelectChannelConnector",
+                                 :port => '${run.sslport}',
+                                 :keystore => '${run.keystore}',
+                                 :keyPassword => '${run.keystore.pass}',
+                                 :trustPassword => '${run.truststore.pass}' } ],
+              :httpConnector => { :port => '${run.port}' } )
+    end
+    
   end
 end
 

data/spec/pom_maven_hash_style/pom.rb

@@ -1,6 +1,6 @@
 project :name => 'my name', :url => 'example.com' do
 
-  model_version '1.0.0'
+  model_version '1.0.1'
 
   parent( :group_id => 'example',
           :artifact_id => 'parent',
@@ -76,20 +76,18 @@ project :name => 'my name', :url => 'example.com' do
   end
   distribution( :status => 'active',
                 :download_url => 'http://dev.example.com/downloads' ) do
-    repository( :unique_version => 123,
-                :id => 'first',
+    repository( :id => 'first',
                 :name => 'First',
                 :url => 'http://repo.example.com',
                 :layout => 'legacy' ) do
       releases( :enabled => true,
                 :update_policy => 'daily',
                 :checksum_policy => :strict )
-      snapshots( :enabled =>false,
+      snapshots( :enabled => false,
                  :update_policy => :never,
                  :checksum_policy => 'none' )
     end
-    snapshot_repository( :unique_version => 1234,
-                         :id => 'snapshots',
+    snapshot_repository( :id => 'snapshots',
                          :name => 'First Snapshots',
                          :url => 'http://snaphots.example.com',
                          :layout => 'legacy' ) do
@@ -136,7 +134,6 @@ project :name => 'my name', :url => 'example.com' do
   repository( :id => 'first', 
               :url => 'http://repo.example.com', 
               :name => 'First',
-              :unique_version => 123,
               :layout => 'legacy' ) do
     releases( :enabled => true,
               :update_policy => 'daily',
@@ -148,7 +145,6 @@ project :name => 'my name', :url => 'example.com' do
   snapshot_repository( :id => 'snapshots', 
                        :url => 'http://snaphots.example.com',
                        :name => 'First Snapshots',
-                       :unique_version => 12345,
                        :layout => 'legacy' ) do
     releases( :update_policy => 'daily',
               :checksum_policy => :strict )
@@ -158,7 +154,6 @@ project :name => 'my name', :url => 'example.com' do
   plugin_repository( :id => :first, 
                      :url => 'http://pluginrepo.example.com', 
                      :name => 'First',
-                     :unique_version => 12,
                      :layout => 'legacy' ) do
     releases( :enabled => true,
               :update_policy => 'daily',
@@ -187,179 +182,65 @@ project :name => 'my name', :url => 'example.com' do
                    :directory => 'testresources',
                    :includes => [ '**/*' ],
                    :excludes => [ '*~' ] )
-  end
-end
+    plugin( :jar, '1.0',
+            :inherited => true,
+            :finalName => :testing )
 
+    jruby_plugin :gem, '1.0.0' do
+      gem :bundler, '1.6.2'
+    end
 
-#   <dependencies>
-#     <dependency>
-#       <groupId/>
-#       <artifactId/>
-#       <version/>
-#       <type/>
-#       <classifier/>
-#       <scope/>
-#       <systemPath/>
-#       <exclusions>
-#         <exclusion>
-#           <artifactId/>
-#           <groupId/>
-#         </exclusion>
-#       </exclusions>
-#       <optional/>
-#     </dependency>
-#   </dependencies>
+    plugin :antrun do
+      execute_goals( 'run',
+                     :id => 'copy',
+                     :phase => 'package',
+                     'tasks' => {
+                       'exec' => {
+                         '@executable' => '/bin/sh',
+                         '@osfamily' => 'unix',
+                         'arg' => {
+                           '@line' => '-c \'cp "${jruby.basedir}/bin/jruby.bash" "${jruby.basedir}/bin/jruby"\''
+                         }
+                       },
+                       'chmod' => {
+                         '@file' => '${jruby.basedir}/bin/jruby',
+                         '@perm' => '755'
+                       }
+                     } )
+      jar 'org.super.duper:executor:1.0.0'
+    end
 
-#   <repositories>
-#     <repository>
-#       <releases>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </releases>
-#       <snapshots>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </snapshots>
-#       <id/>
-#       <name/>
-#       <url/>
-#       <layout/>
-#     </repository>
-#   </repositories>
-#   <pluginRepositories>
-#     <pluginRepository>
-#       <releases>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </releases>
-#       <snapshots>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </snapshots>
-#       <id/>
-#       <name/>
-#       <url/>
-#       <layout/>
-#     </pluginRepository>
-#   </pluginRepositories>
+    plugin 'org.codehaus.mojo:exec-maven-plugin' do
+      execute_goal( 'exec',
+                    :id => 'invoker-generator',
+                    'arguments' => [ '-Djruby.bytecode.version=${base.java.version}',
+                                     '-classpath',
+                                     xml( '<classpath/>' ),
+                                     'org.jruby.anno.InvokerGenerator',
+                                     '${anno.sources}/annotated_classes.txt',
+                                     '${project.build.outputDirectory}' ],
+                    'executable' =>  'java',
+                    'classpathScope' =>  'compile' )
+    end
+    
+    plugin_management do
+      plugin( "org.mortbay.jetty:jetty-maven-plugin:8.1",
+              :path => '/',
+              :connectors => [ { :@implementation => "org.eclipse.jetty.server.nio.SelectChannelConnector",
+                                 :port => '${run.port}' },
+                               { :@implementation => "org.eclipse.jetty.server.ssl.SslSelectChannelConnector",
+                                 :port => '${run.sslport}',
+                                 :keystore => '${run.keystore}',
+                                 :keyPassword => '${run.keystore.pass}',
+                                 :trustPassword => '${run.truststore.pass}' } ],
+              :httpConnector => { :port => '${run.port}' } )
+    end
+  end
+end
 
-#   <build>
-#     <sourceDirectory/>
-#     <scriptSourceDirectory/>
-#     <testSourceDirectory/>
-#     <outputDirectory/>
-#     <testOutputDirectory/>
-#     <extensions>
-#       <extension>
-#         <groupId/>
-#         <artifactId/>
-#         <version/>
-#       </extension>
-#     </extensions>
-#     <defaultGoal/>
-#     <resources>
-#       <resource>
-#         <targetPath/>
-#         <filtering/>
-#         <directory/>
-#         <includes/>
-#         <excludes/>
-#       </resource>
-#     </resources>
-#     <testResources>
-#       <testResource>
-#         <targetPath/>
-#         <filtering/>
-#         <directory/>
-#         <includes/>
-#         <excludes/>
-#       </testResource>
-#     </testResources>
 #     <directory/>
 #     <finalName/>
 #     <filters/>
-#     <pluginManagement>
-#       <plugins>
-#         <plugin>
-#           <groupId/>
-#           <artifactId/>
-#           <version/>
-#           <extensions/>
-#           <executions>
-#             <execution>
-#               <id/>
-#               <phase/>
-#               <goals/>
-#               <inherited/>
-#               <configuration/>
-#             </execution>
-#           </executions>
-#           <dependencies>
-#             <dependency>
-#               <groupId/>
-#               <artifactId/>
-#               <version/>
-#               <type/>
-#               <classifier/>
-#               <scope/>
-#               <systemPath/>
-#               <exclusions>
-#                 <exclusion>
-#                   <artifactId/>
-#                   <groupId/>
-#                 </exclusion>
-#               </exclusions>
-#               <optional/>
-#             </dependency>
-#           </dependencies>
-#           <goals/>
-#           <inherited/>
-#           <configuration/>
-#         </plugin>
-#       </plugins>
-#     </pluginManagement>
-#     <plugins>
-#       <plugin>
-#         <groupId/>
-#         <artifactId/>
-#         <version/>
-#         <extensions/>
-#         <executions>
-#           <execution>
-#             <id/>
-#             <phase/>
-#             <goals/>
-#             <inherited/>
-#             <configuration/>
-#           </execution>
-#         </executions>
-#         <dependencies>
-#           <dependency>
-#             <groupId/>
-#             <artifactId/>
-#             <version/>
-#             <type/>
-#             <classifier/>
-#             <scope/>
-#             <systemPath/>
-#             <exclusions>
-#               <exclusion>
-#                 <artifactId/>
-#                 <groupId/>
-#               </exclusion>
-#             </exclusions>
-#             <optional/>
-#           </dependency>
-#         </dependencies>
-#         <goals/>
-#         <inherited/>
-#         <configuration/>
-#       </plugin>
-#     </plugins>
 #   </build>
 
 #   <reports/>

data/spec/pom_maven_style/pom.rb

@@ -1,6 +1,6 @@
 project do
 
-  model_version '1.0.0'
+  model_version '1.0.1'
 
   parent 'example:parent:1.1' do
     relative_path '../pom.xml'
@@ -102,7 +102,6 @@ project do
       id :first
       url 'http://repo.example.com'
       name 'First'
-      unique_version 123
       layout 'legacy'
       releases do 
         enabled true
@@ -118,7 +117,6 @@ project do
     snapshot_repository( 'snapshots', 
                          'http://snaphots.example.com',
                          'First Snapshots',
-                         :unique_version => 1234,
                          :layout => 'legacy' ) do
       releases( :enabled => false,
                 :update_policy => 'daily',
@@ -159,7 +157,6 @@ project do
     id :first
     url 'http://repo.example.com'
     name 'First'
-    unique_version 123
     layout 'legacy'
     releases do 
       enabled true
@@ -176,7 +173,6 @@ project do
     id 'snapshots'
     url 'http://snaphots.example.com'
     name 'First Snapshots'
-    unique_version 12345
     layout 'legacy'
     releases do 
       update_policy 'daily'
@@ -191,7 +187,6 @@ project do
     id :first
     url 'http://pluginrepo.example.com'
     name 'First'
-    unique_version 12
     layout 'legacy'
     releases do 
       enabled true
@@ -226,6 +221,64 @@ project do
       includes [ '**/*' ]
       excludes [ '*~' ]
     end
+
+    plugin :jar, '1.0' do
+      inherited true
+      configuration :finalName => :testing
+    end
+
+    jruby_plugin :gem, '1.0.0' do
+      gem :bundler, '1.6.2'
+    end
+
+    plugin :antrun do
+      execute_goals( 'run' ) do
+        configuration( 'tasks' => {
+                         'exec' => {
+                           '@executable' => '/bin/sh',
+                           '@osfamily' => 'unix',
+                           'arg' => {
+                             '@line' => '-c \'cp "${jruby.basedir}/bin/jruby.bash" "${jruby.basedir}/bin/jruby"\''
+                           }
+                         },
+                         'chmod' => {
+                           '@file' => '${jruby.basedir}/bin/jruby',
+                           '@perm' => '755'
+                         }
+                       } )
+        id 'copy'
+        phase 'package'
+      end
+      jar 'org.super.duper:executor:1.0.0'
+    end
+    
+    plugin 'org.codehaus.mojo:exec-maven-plugin' do
+      execute_goal( 'exec' ) do
+        id 'invoker-generator'
+        configuration( 'arguments' => [ '-Djruby.bytecode.version=${base.java.version}',
+                                        '-classpath',
+                                        xml( '<classpath/>' ),
+                                        'org.jruby.anno.InvokerGenerator',
+                                        '${anno.sources}/annotated_classes.txt',
+                                        '${project.build.outputDirectory}' ],
+                       'executable' =>  'java',
+                       'classpathScope' =>  'compile' )
+      end
+    end
+
+    plugin_management do
+      plugin( "org.mortbay.jetty:jetty-maven-plugin:8.1" ) do
+        configuration( :path => '/',
+                       :connectors => [ { :@implementation => "org.eclipse.jetty.server.nio.SelectChannelConnector",
+                                          :port => '${run.port}' },
+                                        { :@implementation => "org.eclipse.jetty.server.ssl.SslSelectChannelConnector",
+                                          :port => '${run.sslport}',
+                                          :keystore => '${run.keystore}',
+                                          :keyPassword => '${run.keystore.pass}',
+                                          :trustPassword => '${run.truststore.pass}' } ],
+                       :httpConnector => { :port => '${run.port}' } )
+      end
+    end
   end
 end
 #   <build>