You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2012/10/07 04:10:19 UTC
svn commit: r1395205 - in /buildr/trunk: CHANGELOG buildr.gemspec
lib/buildr/java/rjb.rb
Author: donaldp
Date: Sun Oct 7 02:10:19 2012
New Revision: 1395205
URL: http://svn.apache.org/viewvc?rev=1395205&view=rev
Log:
Upgrade to the next version of rjb
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/buildr.gemspec
buildr/trunk/lib/buildr/java/rjb.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1395205&r1=1395204&r2=1395205&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Oct 7 02:10:19 2012
@@ -1,13 +1,13 @@
1.4.8 (Pending)
* Added: Experimental support for jacoco code coverage tool.
-* Fixed: BUILDR-655 - Support JDK1.5 under OSX
+* Fixed: BUILDR-655 - Support JDK1.7 under OSX
* Change: Updated dependency versions;
- builder (3.1.3)
- highline (1.6.15)
- rubyforge (2.0.4)
- net-ssh (2.6.0)
- hoe (3.1.0)
- - rjb (1.4.1)
+ - rjb (1.4.2)
- rdoc (3.12)
- xml-simple (1.1.1)
- rspec-expectations (2.11.3)
Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1395205&r1=1395204&r2=1395205&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Sun Oct 7 02:10:19 2012
@@ -63,8 +63,7 @@ for those one-off tasks, with a language
spec.add_dependency 'json_pure', '1.7.5'
spec.add_dependency 'rubyforge', '2.0.4'
spec.add_dependency 'hoe', '3.1.0'
- # TODO: See note in rjb.rb when upgrading rjb
- spec.add_dependency 'rjb', '1.4.1' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
+ spec.add_dependency 'rjb', '1.4.2' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
spec.add_dependency 'atoulme-Antwrap', '~> 0.7.2'
spec.add_dependency 'diff-lcs', '1.1.3'
spec.add_dependency 'rspec-expectations', '2.11.3'
Modified: buildr/trunk/lib/buildr/java/rjb.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/rjb.rb?rev=1395205&r1=1395204&r2=1395205&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/rjb.rb (original)
+++ buildr/trunk/lib/buildr/java/rjb.rb Sun Oct 7 02:10:19 2012
@@ -17,16 +17,6 @@ if RbConfig::CONFIG['host_os'] =~ /darwi
# On OS X we attempt to guess where JAVA_HOME is, if not set
# We set JAVA_HOME early so we can use it without calling Java.load first.
ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home'
-
- if ENV['JAVA_HOME']
- # For JDK1.7 this file exists. We need to ensure JVM_LIB is set before loading rjb
- # As RJB uses it to determine which library to load.
- # SEE https://github.com/arton/rjb/issues/12#issuecomment-9179415
- # TODO: Remove this after upgrade to RJB > 1.4.1 as it should be built in.
- if File.exist?("#{ENV['JAVA_HOME']}/jre/lib/server/libjvm.dylib")
- ENV['JVM_LIB'] = "#{ENV['JAVA_HOME']}/jre/lib/server/libjvm.dylib"
- end
- end
end
require 'rjb'