Hi I opened the bug BUILD-647 as I noticed that "rake spec" did not work anymore.
Replacing everywhere 'http://scala-tools.org/repo-snapshots' by 'https://oss.sonatype.org/content/repositories/snapshots' made the specs pass again. (see attached patch) I am however not sure whether we should use sometimes https://oss.sonatype.org/content/groups/scala-tools/ in place of http://scala-tools.org/repo-snapshots. Using only https://oss.sonatype.org/content/groups/scala-tools/ is not sufficient to make the specs pass. If you like the patch I will add it to the bug report and grant the Apache Foundation all the needed rights. Best regards -- Niklaus Giger
diff --git a/buildr.buildfile b/buildr.buildfile index 7bc24cb..14f27ce 100644 --- a/buildr.buildfile +++ b/buildr.buildfile @@ -18,8 +18,8 @@ require 'buildr/jetty' require 'buildr/nailgun' require 'buildr/scala' repositories.remote << 'http://repo1.maven.org/maven2' -repositories.remote << 'http://scala-tools.org/repo-releases/' +repositories.remote << 'https://oss.sonatype.org/content/repositories/snapshots' define 'buildr' do compile.using :source=>'1.5', :target=>'1.5', :debug=>false diff --git a/doc/languages.textile b/doc/languages.textile index 8d25fe6..b3e2d6c 100644 --- a/doc/languages.textile +++ b/doc/languages.textile @@ -189,7 +189,7 @@ You may also determine the version in use by querying the @Scala.version@ attrib Scala.version # => '2.8.0' {% endhighlight %} -Regardless of how the Scala version is determined, if you have the same Scala version installed on your system and the SCALA_HOME environment variable points to it, then your local installation will be used. Otherwise, Buildr will download it from the "Scala Tools repository":http://scala-tools.org/ which is automatically enlisted when you @require@ Scala. The only drawback if you don't have a local installation is the FSC compiler won't be available. +Regardless of how the Scala version is determined, if you have the same Scala version installed on your system and the SCALA_HOME environment variable points to it, then your local installation will be used. Otherwise, Buildr will download it from the "Scala Tools repository":https://oss.sonatype.org/content/repositories/snapshots which is automatically enlisted when you @require@ Scala. The only drawback if you don't have a local installation is the FSC compiler won't be available. p(tip). For Mac users, if you have installed Scala via "MacPorts":http://www.macports.org/ Buildr will look in the @/opt/local/share/scala/@ directory if you have not set @SCALA_HOME@. diff --git a/lib/buildr/scala.rb b/lib/buildr/scala.rb index df28674..e2c4c7e 100644 --- a/lib/buildr/scala.rb +++ b/lib/buildr/scala.rb @@ -15,7 +15,7 @@ ENV['SCALA_HOME'] ||= '/opt/local/share/scala/' if File.exist?('/opt/local/share/scala/lib/scala-compiler.jar') -Buildr.repositories.remote << 'http://scala-tools.org/repo-releases' +Buildr.repositories.remote << 'https://oss.sonatype.org/content/repositories/snapshots' require 'buildr/scala/compiler' require 'buildr/scala/tests' diff --git a/lib/buildr/scala/doc.rb b/lib/buildr/scala/doc.rb index 2a6f4fe..da6b5d5 100644 --- a/lib/buildr/scala/doc.rb +++ b/lib/buildr/scala/doc.rb @@ -74,7 +74,7 @@ module Buildr class VScaladoc < Base VERSION = '1.2-m1' - Buildr.repositories.remote << 'http://scala-tools.org/repo-snapshots' + Buildr.repositories.remote << 'https://oss.sonatype.org/content/repositories/snapshots' class << self def dependencies diff --git a/spec/sandbox.rb b/spec/sandbox.rb index 5ab2b5b..2603e5d 100644 --- a/spec/sandbox.rb +++ b/spec/sandbox.rb @@ -19,7 +19,7 @@ # repository and cache these across test cases. Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') } repositories.remote << 'http://repo1.maven.org/maven2' -repositories.remote << 'http://scala-tools.org/repo-releases' +repositories.remote << 'https://oss.sonatype.org/content/repositories/snapshots' # Force Scala version for specs; don't want to rely on SCALA_HOME module Buildr::Scala diff --git a/spec/scala/scala.rb b/spec/scala/scala.rb index 9e3e115..387710b 100644 --- a/spec/scala/scala.rb +++ b/spec/scala/scala.rb @@ -18,11 +18,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers') describe 'scala' do - it 'should automatically add the remote scala-tools.org repository' do + it 'should automatically add the remote oss.sonatype.org repository' do # NOTE: the sandbox environment clears "repositories.remote" so we can't # test for this spec right now. # - # repositories.remote.should include('http://scala-tools.org/repo-releases') + # repositories.remote.should include('https://oss.sonatype.org/content/repositories/snapshots') end it "should provide the Scala version string" do
