change the test for tools.jar presence to test the presence of a class that is there in both versions of JDK
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/db57d676 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/db57d676 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/db57d676 Branch: refs/heads/master Commit: db57d6764fd93bb3c56f47018b84165b1482f97e Parents: 6784bb7 Author: Antoine Toulme <[email protected]> Authored: Sun Aug 14 22:37:07 2016 -0700 Committer: Antoine Toulme <[email protected]> Committed: Sun Aug 14 22:47:36 2016 -0700 ---------------------------------------------------------------------- spec/java/compiler_spec.rb | 2 +- spec/java/ecj_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/db57d676/spec/java/compiler_spec.rb ---------------------------------------------------------------------- diff --git a/spec/java/compiler_spec.rb b/spec/java/compiler_spec.rb index 385e4fa..cfc3878 100644 --- a/spec/java/compiler_spec.rb +++ b/spec/java/compiler_spec.rb @@ -100,7 +100,7 @@ describe 'javac compiler' do it 'should include tools.jar dependency' do write 'src/main/java/UseJarSigner.java', <<-JAVA - import sun.security.tools.jarsigner.Main; + import sun.tools.jar.Manifest; public class UseJarSigner { } JAVA define('foo').compile.invoke http://git-wip-us.apache.org/repos/asf/buildr/blob/db57d676/spec/java/ecj_spec.rb ---------------------------------------------------------------------- diff --git a/spec/java/ecj_spec.rb b/spec/java/ecj_spec.rb index a1ca98c..2a964f9 100644 --- a/spec/java/ecj_spec.rb +++ b/spec/java/ecj_spec.rb @@ -75,14 +75,14 @@ describe 'ecj compiler' do file('target/classes/DependencyTest.class').should exist end end - + it 'should include tools.jar dependency' do repositories.remote << "http://repo1.maven.org/maven2/" write 'src/main/java/UseJarSigner.java', <<-JAVA - import sun.security.tools.jarsigner.Main; + import sun.tools.jar.Manifest; public class UseJarSigner { } JAVA - define('foo').compile.using(:ecj).invoke + define('foo').compile.invoke file('target/classes/UseJarSigner.class').should exist end
