Author: boisvert
Date: Tue Jul 20 18:03:10 2010
New Revision: 965936
URL: http://svn.apache.org/viewvc?rev=965936&view=rev
Log:
Revert commits 965910:965908; confused java() with javadoc()
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/java/commands.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=965936&r1=965935&r2=965936&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Jul 20 18:03:10 2010
@@ -19,7 +19,6 @@
* Fixed: BUILDR-469 test:failed causes all transitive tests to run
* Fixed: BUILDR-472 ECJ dependency now required to build any java project
* Fixed: BUILDR-479 Enforce using a minimal version of jruby
-* Fixed: BUILDR-482 Javadoc: cannot load class java.com.sun.tools.javadoc.Main
1.4.1 (2010-07-07)
* Added: BUILDR-420 Support external compiler
Modified: buildr/trunk/lib/buildr/java/commands.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/commands.rb?rev=965936&r1=965935&r2=965936&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/commands.rb (original)
+++ buildr/trunk/lib/buildr/java/commands.rb Tue Jul 20 18:03:10 2010
@@ -52,8 +52,6 @@ module Java
cmd_args = [path_to_bin('java')]
classpath = classpath_from(options)
- tools = Java.tools_jar
- classpath << tools if tools
cmd_args << '-classpath' << classpath.join(File::PATH_SEPARATOR)
unless classpath.empty?
options[:properties].each { |k, v| cmd_args << "-D#{k}=#{v}" } if
options[:properties]
cmd_args += (options[:java_args] || (ENV['JAVA_OPTS'] ||
ENV['JAVA_OPTIONS']).to_s.split).flatten
