buildr 1.3.5 → 1.4.0

data/spec/groovy/compiler_spec.rb

@@ -16,12 +16,12 @@
 
 require File.join(File.dirname(__FILE__), '../spec_helpers')
 
-describe 'groovyc compiler' do 
-  
+describe 'groovyc compiler' do
+
   it 'should identify itself from groovy source directories' do
     write 'src/main/groovy/some/Hello.groovy', 'println "Hello Groovy"'
     write 'src/test/groovy/some/Hello.groovy', 'println "Hello Groovy"'
-    define('foo') do 
+    define('foo') do
       compile.compiler.should eql(:groovyc)
       test.compile.compiler.should eql(:groovyc)
     end
@@ -30,7 +30,7 @@ describe 'groovyc compiler' do
   it 'should identify if groovy sources are found on java directories' do
     write 'src/main/java/some/Hello.groovy', 'println "Hello Groovy"'
     write 'src/test/java/some/Hello.groovy', 'println "Hello Groovy"'
-    define('foo') do 
+    define('foo') do
       compile.compiler.should eql(:groovyc)
       test.compile.compiler.should eql(:groovyc)
     end
@@ -41,13 +41,13 @@ describe 'groovyc compiler' do
     write 'src/main/groovy/some/Hello.groovy', 'println "Hello Groovy"'
     write 'src/test/java/some/Empty.java', 'package some; public interface Empty {}'
     write 'src/test/groovy/some/Hello.groovy', 'println "Hello Groovy"'
-    define('foo') do 
+    define('foo') do
       compile.compiler.should eql(:groovyc)
       test.compile.compiler.should eql(:groovyc)
     end
   end
 
-  it 'should identify from custom layout' do 
+  it 'should identify from custom layout' do
     write 'groovy/Hello.groovy', 'println "Hello world"'
     write 'testing/Hello.groovy', 'println "Hello world"'
     custom = Layout.new
@@ -58,10 +58,10 @@ describe 'groovyc compiler' do
       test.compile.compiler.should eql(:groovyc)
     end
   end
-  
+
   it 'should identify from compile source directories' do
-    write 'src/com/example/Code.groovy', 'println "monkey code"' 
-    write 'testing/com/example/Test.groovy', 'println "some test"' 
+    write 'src/com/example/Code.groovy', 'println "monkey code"'
+    write 'testing/com/example/Test.groovy', 'println "some test"'
     define 'foo' do
       lambda { compile.from 'src' }.should change { compile.compiler }.to(:groovyc)
       lambda { test.compile.from 'testing' }.should change { test.compile.compiler }.to(:groovyc)
@@ -91,25 +91,36 @@ describe 'groovyc compiler' do
       lambda { compile.using(:groovyc) }.should_not change { compile.sources }
     end
   end
-  
+
   it 'should compile groovy sources' do
     write 'src/main/groovy/some/Example.groovy', 'package some; class Example { static main(args) { println "Hello" } }'
     define('foo').compile.invoke
     file('target/classes/some/Example.class').should exist
   end
 
+  it 'should compile test groovy sources that rely on junit' do
+    write 'src/main/groovy/some/Example.groovy', 'package some; class Example { static main(args) { println "Hello" } }'
+    write 'src/test/groovy/some/ExampleTest.groovy', "package some\n import junit.framework.TestCase\n class ExampleTest extends TestCase { public testHello() { println \"Hello\" } }"
+    foo = define('foo') do
+      test.using :junit
+    end
+    foo.test.compile.invoke
+    file('target/classes/some/Example.class').should exist
+    file('target/test/classes/some/ExampleTest.class').should exist
+  end
+
   it 'should include as classpath dependency' do
     write 'src/bar/groovy/some/Foo.groovy', 'package some; interface Foo {}'
     write 'src/main/groovy/some/Example.groovy', 'package some; class Example implements Foo { }'
-    define('bar', :version => '1.0') do 
+    define('bar', :version => '1.0') do
       compile.from('src/bar/groovy').into('target/bar')
       package(:jar)
     end
     lambda { define('foo').compile.with(project('bar').package(:jar)).invoke }.should run_task('foo:compile')
     file('target/classes/some/Example.class').should exist
   end
-     
-  it 'should cross compile java sources' do 
+
+  it 'should cross compile java sources' do
     write 'src/main/java/some/Foo.java', 'package some; public interface Foo { public void hello(); }'
     write 'src/main/java/some/Baz.java', 'package some; public class Baz extends Bar { }'
     write 'src/main/groovy/some/Bar.groovy', 'package some; class Bar implements Foo { def void hello() { } }'
@@ -117,7 +128,7 @@ describe 'groovyc compiler' do
     %w{Foo Bar Baz}.each { |f| file("target/classes/some/#{f}.class").should exist }
   end
 
-  it 'should cross compile test java sources' do 
+  it 'should cross compile test java sources' do
     write 'src/test/java/some/Foo.java', 'package some; public interface Foo { public void hello(); }'
     write 'src/test/java/some/Baz.java', 'package some; public class Baz extends Bar { }'
     write 'src/test/groovy/some/Bar.groovy', 'package some; class Bar implements Foo { def void hello() { } }'
@@ -137,7 +148,7 @@ describe 'groovyc compiler' do
 end
 
 describe 'groovyc compiler options' do
-  
+
   def groovyc(&prc)
     define('foo') do
       compile.using(:groovyc)
@@ -153,8 +164,8 @@ describe 'groovyc compiler options' do
     end
     project('foo').compile
   end
-  
-  it 'should set warning option to false by default' do 
+
+  it 'should set warning option to false by default' do
     groovyc do
       compile.options.warnings.should be_false
       @compiler.javac_options[:nowarn].should be_true
@@ -177,7 +188,7 @@ describe 'groovyc compiler options' do
     trace true
     groovyc.options.verbose.should be_true
   end
-  
+
   it 'should set debug option to false based on Buildr.options' do
     Buildr.options.debug = false
     groovyc.options.debug.should be_false

data/spec/ide/eclipse_spec.rb

@@ -33,7 +33,7 @@ PLUGIN_BUILDERS = Buildr::Eclipse::Plugin::BUILDERS
 module EclipseHelper
   def classpath_xml_elements
     task('eclipse').invoke
-    REXML::Document.new(File.open('.classpath')).root.elements
+    File.open('.classpath') { |f| REXML::Document.new(f).root.elements }
   end
 
   def classpath_sources(attribute='path')
@@ -63,7 +63,7 @@ module EclipseHelper
 
   def project_xml_elements
     task('eclipse').invoke
-    REXML::Document.new(File.open('.project')).root.elements
+    File.open('.project') { |f| REXML::Document.new(f).root.elements }
   end
 
   def project_natures
@@ -85,6 +85,54 @@ describe Buildr::Eclipse do
 
   describe "eclipse's .project file" do
 
+    describe 'default project' do
+      before do
+        write 'buildfile'
+        write 'src/main/nono/Main.nono'
+      end
+
+      it 'should not have natures' do
+        define('foo')
+        project_natures.should be_empty
+      end
+
+      it 'should not have build commands' do
+        define('foo')
+        build_commands.should be_empty
+      end
+
+      it 'should generate a .project file' do
+        define('foo')
+        task('eclipse').invoke
+        File.open('.project') do |f|
+          REXML::Document.new(f).root.
+            elements.collect("name") { |e| e.text }.should == ['foo']
+        end
+      end
+
+      it 'should not generate a .classpath file' do
+        define('foo')
+        task('eclipse').invoke
+        File.exists?('.classpath').should be_false
+      end
+    end
+
+    describe 'parent project' do
+      before do
+        write 'buildfile'
+        mkpath 'bar'
+      end
+
+      it 'should not generate a .project for the parent project' do
+        define('foo') do
+          define('bar')
+        end
+        task('eclipse').invoke
+        File.exists?('.project').should be_false
+        File.exists?(File.join('bar','.project')).should be_true
+      end
+    end
+
     describe 'java project' do
       before do
         write 'buildfile'
@@ -111,8 +159,10 @@ describe Buildr::Eclipse do
           define('foo') { compile.using(:javac); package :jar }
         }
         task('eclipse').invoke
-        REXML::Document.new(File.open(File.join('foo', '.project'))).root.
-          elements.collect("name") { |e| e.text }.should == ['myproject-foo']
+        File.open(File.join('foo', '.project')) do |f|
+          REXML::Document.new(f).root.
+            elements.collect("name") { |e| e.text }.should == ['myproject-foo']
+        end
       end
 
     end
@@ -201,6 +251,68 @@ describe Buildr::Eclipse do
         build_commands.should include(JAVA_BUILDER)
       end
     end
+
+    describe 'Plugin project' do
+
+      before do
+        write 'buildfile'
+        write 'src/main/java/Activator.java'
+        write 'plugin.xml'
+      end
+
+      it 'should have plugin nature before Java nature' do
+        define('foo')
+        project_natures.should include(PLUGIN_NATURE)
+        project_natures.should include(JAVA_NATURE)
+        project_natures.index(PLUGIN_NATURE).should < project_natures.index(JAVA_NATURE)
+      end
+
+      it 'should have plugin build commands and the Java build command' do
+        define('foo')
+        build_commands.should include(PLUGIN_BUILDERS[0])
+        build_commands.should include(PLUGIN_BUILDERS[1])
+        build_commands.should include(JAVA_BUILDER)
+      end
+    end
+
+    describe 'Plugin project with META-INF/MANIFEST.MF' do
+
+      before do
+        write 'buildfile'
+        write 'src/main/java/Activator.java'
+      end
+
+      it 'should have plugin nature by default if MANIFEST.MF contains "Bundle-SymbolicName:"' do
+        write 'META-INF/MANIFEST.MF', <<-MANIFEST
+Manifest-Version: 1.0
+Name: example/
+Specification-Title: "Examples"
+Specification-Version: "1.0"
+Specification-Vendor: "Acme Corp.".
+Implementation-Title: "example"
+Implementation-Version: "build57"
+Implementation-Vendor: "Acme Corp."
+Bundle-SymbolicName: acme.plugin.example
+MANIFEST
+        define('foo')
+        project_natures.should include(PLUGIN_NATURE)
+      end
+
+      it 'should not have plugin nature if MANIFEST.MF exists but doesn\'t contain "Bundle-SymbolicName:"' do
+        write 'META-INF/MANIFEST.MF', <<-MANIFEST
+Manifest-Version: 1.0
+Name: example/
+Specification-Title: "Examples"
+Specification-Version: "1.0"
+Specification-Vendor: "Acme Corp.".
+Implementation-Title: "example"
+Implementation-Version: "build57"
+Implementation-Vendor: "Acme Corp."
+MANIFEST
+        define('foo')
+        project_natures.should_not include(PLUGIN_NATURE)
+      end
+    end
   end
 
   describe "eclipse's .classpath file" do
@@ -348,8 +460,10 @@ describe Buildr::Eclipse do
           define('bar') { compile.using(:javac).with project('foo'); }
         }
         task('eclipse').invoke
-        REXML::Document.new(File.open(File.join('bar', '.classpath'))).root.
-          elements.collect("classpathentry[@kind='src']") { |n| n.attributes['path'] }.should include('/myproject-foo')
+        File.open(File.join('bar', '.classpath')) do |f|
+          REXML::Document.new(f).root.
+            elements.collect("classpathentry[@kind='src']") { |n| n.attributes['path'] }.should include('/myproject-foo')
+        end
       end
     end
   end
@@ -359,10 +473,26 @@ describe Buildr::Eclipse do
       write 'lib/some-local.jar'
       define('foo') { compile.using(:javac).with(_('lib/some-local.jar')) }
     end
-    
+
     it 'should have a lib artifact reference in the .classpath file' do
       classpath_xml_elements.collect("classpathentry[@kind='lib']") { |n| n.attributes['path'] }.
-        should include(File.expand_path 'lib/some-local.jar')
+        should include('lib/some-local.jar')
+    end
+  end
+
+  describe 'project .classpath' do
+    before do
+      mkdir_p '../libs'
+      write '../libs/some-local.jar'
+      define('foo') do
+        eclipse.classpath_variables :LIBS => '../libs', :LIBS2 => '../libs2'
+        compile.using(:javac).with(_('../libs/some-local.jar'))
+      end
+    end
+
+    it 'supports generating library paths with classpath variables' do
+      classpath_xml_elements.collect("classpathentry[@kind='var']") { |n| n.attributes['path'] }.
+        should include('LIBS/some-local.jar')
     end
   end
 
@@ -371,7 +501,7 @@ describe Buildr::Eclipse do
       write 'lib/some.class'
       define('foo') { compile.using(:javac).with(_('lib')) }
     end
-    
+
     it 'should have src reference in the .classpath file' do
       classpath_xml_elements.collect("classpathentry[@kind='src']") { |n| n.attributes['path'] }.
         should include('lib')
@@ -449,6 +579,13 @@ describe Buildr::Eclipse do
       project('foo:bar').eclipse.natures.should include('foo_nature')
       project('foo:bar2').eclipse.natures.should include('bar2_nature')
     end
+
+    it 'should handle arrays correctly' do
+      define('foo') do
+        eclipse.natures ['foo_nature', 'bar_nature']
+      end
+      project('foo').eclipse.natures.should == ['foo_nature', 'bar_nature']
+    end
   end
 
   describe 'builders variable' do
@@ -473,6 +610,13 @@ describe Buildr::Eclipse do
       project('foo:bar').eclipse.builders.should include('foo_builder')
       project('foo:bar2').eclipse.builders.should include('bar2_builder')
     end
+
+    it 'should handle arrays correctly' do
+      define('foo') do
+        eclipse.builders ['foo_builder', 'bar_builder']
+      end
+      project('foo').eclipse.builders.should == ['foo_builder', 'bar_builder']
+    end
   end
 
   describe 'classpath_containers variable' do
@@ -497,5 +641,37 @@ describe Buildr::Eclipse do
       project('foo:bar').eclipse.classpath_containers.should include('foo_classpath_containers')
       project('foo:bar2').eclipse.classpath_containers.should include('bar2_classpath_containers')
     end
+
+    it 'should handle arrays correctly' do
+      define('foo') do
+        eclipse.classpath_containers ['foo_cc', 'bar_cc']
+      end
+      project('foo').eclipse.classpath_containers.should == ['foo_cc', 'bar_cc']
+    end
+  end
+
+  describe 'exclude_libs' do
+    it 'should support artifacts' do
+      define('foo') do
+        compile.using(:javac).with('com.example:library:jar:2.0')
+        eclipse.exclude_libs += [ artifact('com.example:library:jar:2.0') ]
+      end
+      artifact('com.example:library:jar:2.0') { |task| write task.name }
+
+      task('eclipse').invoke
+      classpath_xml_elements.collect("classpathentry[@kind='var']") { |n| n.attributes['path'] }.
+        should_not include('M2_REPO/com/example/library/2.0/library-2.0.jar')
+    end
+    it 'should support string paths' do
+      define('foo') do
+        compile.using(:javac).with _('path/to/library.jar')
+        eclipse.exclude_libs += [ _('path/to/library.jar') ]
+      end
+      write project('foo').path_to('path/to/library.jar')
+
+      task('eclipse').invoke
+      classpath_xml_elements.collect("classpathentry[@kind='lib']") { |n| n.attributes['path'] }.
+        should_not include('path/to/library.jar')
+    end
   end
 end

data/spec/ide/idea7x_spec.rb

@@ -22,15 +22,15 @@ module Idea7xHelper
     task('idea7x').invoke
     REXML::Document.new(File.read("#{@project_name}-7x.ipr")).root.elements
   end
-  
+
   def ipr_module_elements
     ipr_xml_elements.to_a("//component[@name='ProjectModuleManager']/modules/module")
   end
-  
+
   def ipr_module_filepaths
     ipr_module_elements.collect { |m| m.attributes['filepath'] }
   end
-  
+
   def ipr_module_fileurls
     ipr_module_elements.collect { |m| m.attributes['fileurl'] }
   end
@@ -39,20 +39,20 @@ end
 
 describe Idea7x do
   include Idea7xHelper
-  
+
   describe "the project file" do
     before do
       @project_name = 'alphabet'
     end
-    
+
     it "includes a module for the root project" do
       # Current behavior is to only generate IMLs for packaged projects
-      define(@project_name) { project.version = '0.0.0'; package(:jar) } 
+      define(@project_name) { project.version = '0.0.0'; package(:jar) }
       ipr_module_elements.should have(1).element
       ipr_module_filepaths.should == ["$PROJECT_DIR$/alphabet-7x.iml"]
       ipr_module_fileurls.should  == ["file://$PROJECT_DIR$/alphabet-7x.iml"]
     end
-    
+
     it "includes an IML for a subproject" do
       mkpath 'h'
       define(@project_name) do
@@ -61,12 +61,12 @@ describe Idea7x do
           package(:jar)
         end
       end
-      
+
       ipr_module_elements.should have(2).elements
       ipr_module_filepaths.should include("$PROJECT_DIR$/h/alphabet-h-7x.iml")
       ipr_module_fileurls.should include("file://$PROJECT_DIR$/h/alphabet-h-7x.iml")
     end
-    
+
     it "pays attention to the base_dir for a subproject" do
       mkpath 'aitch'
       define(@project_name) do
@@ -75,10 +75,22 @@ describe Idea7x do
           package(:jar)
         end
       end
-     
+
       ipr_module_elements.should have(2).elements
       ipr_module_filepaths.should include("$PROJECT_DIR$/aitch/alphabet-h-7x.iml")
       ipr_module_fileurls.should include("file://$PROJECT_DIR$/aitch/alphabet-h-7x.iml")
     end
   end
+  
+  describe "idea7x:clean" do
+    
+    it "should remove the idea7x project" do
+      write "src/main/java/com/example/Hello.java", ""
+      write "foo-7x.iml", ""
+      foo = define("foo")
+      foo.task("idea7x:clean").invoke
+      File.exists?("foo-7x.iml").should be_false
+    end
+    
+  end
 end

data/spec/java/ant_spec.rb

@@ -18,13 +18,17 @@ require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe Buildr::Ant do
-  
+
   it 'should pick Ant version from ant build settings' do
-    Buildr::Ant.instance_eval { @dependencies = nil }
-    write 'build.yaml', 'ant: 1.2.3'
-    Buildr::Ant.dependencies.should include("org.apache.ant:ant:jar:1.2.3")
+    begin
+      Buildr::Ant.instance_eval { @dependencies = nil }
+      write 'build.yaml', 'ant: 1.2.3'
+      Buildr::Ant.dependencies.should include("org.apache.ant:ant:jar:1.2.3")
+    ensure
+      Buildr::Ant.instance_eval { @dependencies = nil }
+    end
   end
-  
+
   it 'should have REQUIRES up to version 1.5 since it was deprecated in version 1.3.3' do
     Buildr::VERSION.should < '1.5'
     lambda { Ant::REQUIRES }.should_not raise_error

data/spec/java/bdd_spec.rb

@@ -17,28 +17,21 @@ require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 describe Buildr::RSpec do
 
-  def foo(*args, &prc)
-    define('foo', *args) do 
+  before(:each) do
+    define('foo') do
       test.using :rspec, :output => false
-      if prc
-        instance_eval(&prc)
-      else
-        self
-      end
     end
   end
 
   it 'should be selected by :rspec name' do
-    foo { test.framework.should eql(:rspec) }
+    project('foo').test.framework.should eql(:rspec)
   end
 
   it 'should read passed specs from result yaml' do
-    success = File.expand_path('src/spec/ruby/success_spec.rb')
-    write(success, 'describe("success") { it("is true") { nil.should be_nil } }')
-    foo do
-      test.invoke
-      test.passed_tests.should eql([success])
-    end
+    write('src/spec/ruby/success_spec.rb', 'describe("success") { it("is true") { nil.should be_nil } }')
+    
+    project('foo').test.invoke
+    project('foo').test.passed_tests.should eql([File.expand_path('src/spec/ruby/success_spec.rb')])
   end
 
   it 'should read result yaml to obtain the list of failed specs' do
@@ -48,12 +41,12 @@ describe Buildr::RSpec do
     write(failure, 'describe("failure") { it("is false") { true.should == false } }')
     error = File.expand_path('src/spec/ruby/error_spec.rb')
     write(error, 'describe("error") { it("raises") { lambda; } }')
-    foo do
-      lambda { test.invoke }.should raise_error(/Tests failed/)
-      test.tests.should include(success, failure, error)
-      test.failed_tests.sort.should eql([failure, error].sort)
-      test.passed_tests.should eql([success])
-    end
+    
+    lambda { project('foo').test.invoke }.should raise_error(/Tests failed/)
+    project('foo').test.tests.should include(success, failure, error)
+    project('foo').test.failed_tests.sort.should eql([failure, error].sort)
+    project('foo').test.passed_tests.should eql([success])
+
   end
 
 end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # RSpec
@@ -61,9 +54,6 @@ end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # RSpec
 describe Buildr::JtestR do
 
   before do
-    # JtestR currently requires JUnit 4.4
-    Buildr.settings.build['junit'] = '4.4'
-
     # clear cached dependencies
     Buildr::JUnit.instance_eval { @dependencies = nil }
     Buildr::JtestR.instance_eval { @dependencies = nil }
@@ -119,7 +109,7 @@ describe Buildr::JtestR do
 
   it 'should apply to projects having junit sources' do
     define('one', :base_dir => 'one') do
-      write _('src/test/java/example/OneTest.java', <<-JAVA)
+      write _('src/test/java/example/OneTest.java'), <<-JAVA
         package example;
         public class OneTest extends junit.framework.TestCase { }
       JAVA
@@ -129,9 +119,9 @@ describe Buildr::JtestR do
 
   it 'should apply to projects having testng sources' do
     define('one', :base_dir => 'one') do
-      write _('src/test/java/example/OneTest.java', <<-JAVA)
+      write _('src/test/java/example/OneTest.java'), <<-JAVA
         package example;
-        public class OneTest { 
+        public class OneTest {
            @org.testng.annotations.Test
            public void testNothing() {}
         }
@@ -148,7 +138,7 @@ describe Buildr::JtestR do
   end
 
   it 'should load user jtestr_config.rb' do
-    foo do 
+    foo do
       hello = _('hello')
       write('src/spec/ruby/jtestr_config.rb', "File.open('#{hello}', 'w') { |f| f.write 'HELLO' }")
       write('src/spec/ruby/some_spec.rb')
@@ -161,13 +151,13 @@ describe Buildr::JtestR do
   it 'should run junit tests' do
     write('src/test/java/example/SuccessTest.java', <<-JAVA)
         package example;
-        public class SuccessTest extends junit.framework.TestCase { 
+        public class SuccessTest extends junit.framework.TestCase {
            public void testSuccess() { assertTrue(true); }
         }
     JAVA
     write('src/test/java/example/FailureTest.java', <<-JAVA)
         package example;
-        public class FailureTest extends junit.framework.TestCase { 
+        public class FailureTest extends junit.framework.TestCase {
            public void testFailure() { assertTrue(false); }
         }
     JAVA
@@ -179,7 +169,7 @@ describe Buildr::JtestR do
     end
   end
 
-  it 'should run testng tests' do 
+  it 'should run testng tests' do
     write('src/test/java/example/Success.java', <<-JAVA)
         package example;
         public class Success {
@@ -202,7 +192,7 @@ describe Buildr::JtestR do
     end
   end
 
-  it 'should run test_unit' do 
+  it 'should run test_unit' do
     success = File.expand_path('src/spec/ruby/success_test.rb')
     write(success, <<-TESTUNIT)
       require 'test/unit'
@@ -261,7 +251,7 @@ describe Buildr::JtestR do
     error = File.expand_path('src/spec/ruby/error_spec.rb')
     write(error, 'describe("error") { it("raises") { lambda; } }')
     pending =  File.expand_path('src/spec/ruby/pending_spec.rb')
-    write(pending, 'describe("peding") { it "is not implemented" }')
+    write(pending, 'describe("pending") { it "is not implemented" }')
     foo do
       lambda { test.invoke }.should raise_error(/Tests failed/)
       test.tests.should include(success, failure, error)
@@ -281,7 +271,7 @@ end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # JtestR
 
 describe Buildr::JBehave do
   def foo(*args, &prc)
-    define('foo', *args) do 
+    define('foo', *args) do
       test.using :jbehave
       if prc
         instance_eval(&prc)
@@ -314,7 +304,7 @@ describe Buildr::JBehave do
     foo { test.framework.should eql(:jbehave) }
   end
 
-  it 'should select a java compiler for its sources' do 
+  it 'should select a java compiler for its sources' do
     write 'src/test/java/SomeBehavior.java', 'public class SomeBehavior {}'
     foo do
       test.compile.language.should eql(:java)
@@ -330,8 +320,10 @@ describe Buildr::JBehave do
 
   it 'should include JMock dependencies' do
     foo do
-      test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
-      test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+      two_or_later = JMock.version[0,1].to_i >= 2
+      group = two_or_later ? "org.jmock" : "jmock"
+      test.compile.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
+      test.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
     end
   end
 
@@ -356,7 +348,7 @@ describe Buildr::JBehave do
   it 'should include classes implementing Behaviours' do
     write 'src/spec/java/some/MyBehaviours.java',  <<-JAVA
       package some;
-      public class MyBehaviours implements 
+      public class MyBehaviours implements
       org.jbehave.core.behaviour.Behaviours {
         public Class[] getBehaviours() {
            return new Class[] { some.FooBehave.class };