Author: toulmean
Date: Sun Mar 11 19:09:20 2012
New Revision: 1299428
URL: http://svn.apache.org/viewvc?rev=1299428&view=rev
Log:
BUILDR-628 Move to Apache Ant 1.8.3 and use canonical repository
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/generate.rb
buildr/trunk/lib/buildr/java/ant.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1299428&r1=1299427&r2=1299428&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Mar 11 19:09:20 2012
@@ -1,5 +1,7 @@
1.4.8 (Pending)
* Added: Add several utility methods to IDEA extension for defining artifacts
and configurations.
+* Change: Upgraded to Apache Ant 1.8.3
+* Change: Default maven2 repository is now repo1.maven.org/maven2.
* Change: Make minimumTokenCount and encoding configurable for the PMD/CPD
action
and default encoding to UTF-8 for compatibility with external tools
(i.e. Jenkins)
* Change: BUILDR-615 VersionRequirement.version? now returns true for
Modified: buildr/trunk/lib/buildr/core/generate.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/generate.rb?rev=1299428&r1=1299427&r2=1299428&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/generate.rb (original)
+++ buildr/trunk/lib/buildr/core/generate.rb Sun Mar 11 19:09:20 2012
@@ -52,7 +52,7 @@ GROUP = "#{name}"
COPYRIGHT = ""
# Specify Maven 2.0 remote repositories here, like this:
-repositories.remote << "http://www.ibiblio.org/maven2/";
+repositories.remote << "http://repo1.maven.org/maven2";
desc "The #{name.capitalize} project"
define "#{name}" do
@@ -122,7 +122,7 @@ define "#{name}" do
legacy = repository["layout"].to_s =~ /legacy/
!legacy
} rescue nil
- repositories = [{"name" => "Standard maven2 repository", "url" =>
"http://www.ibiblio.org/maven2"}] if repositories.nil? || repositories.empty?
+ repositories = [{"name" => "Standard maven2 repository", "url" =>
"http://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
repositories.each do |repository|
name, url = repository["name"], repository["url"]
script << "# #{name}"
Modified: buildr/trunk/lib/buildr/java/ant.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/ant.rb?rev=1299428&r1=1299427&r2=1299428&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/ant.rb (original)
+++ buildr/trunk/lib/buildr/java/ant.rb Sun Mar 11 19:09:20 2012
@@ -22,7 +22,7 @@ module Buildr
module Ant
# Which version of Ant we're using by default.
- VERSION = '1.8.0'
+ VERSION = '1.8.3'
class << self
# Current version of Ant being used.
@@ -34,8 +34,7 @@ module Buildr
def dependencies
# Ant-Trax required for running the JUnitReport task, and there's no
other place
# to put it but the root classpath.
- @dependencies ||= ["org.apache.ant:ant:jar:#{version}",
"org.apache.ant:ant-launcher:jar:#{version}",
- "org.apache.ant:ant-trax:jar:#{version}"]
+ @dependencies ||= ["org.apache.ant:ant:jar:#{version}",
"org.apache.ant:ant-launcher:jar:#{version}"]
end
private
