This is an automated email from the ASF dual-hosted git repository. donaldp pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/buildr.git
commit 678418cace66722ee29b5bb7c441859819c7b48f Author: Peter Donald <[email protected]> AuthorDate: Tue Feb 26 10:13:30 2019 +1100 Remove references to http://www.ibiblio.org/maven2/ --- CHANGELOG | 2 ++ doc/artifacts.textile | 4 ++-- doc/projects.textile | 2 +- doc/quick_start.textile | 6 +++--- lib/buildr/packaging/artifact_search.rb | 2 +- spec/ide/idea_spec.rb | 2 +- spec/packaging/artifact_spec.rb | 8 ++++---- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 68493f5..f32fe14 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ 1.5.8 (Pending) * Fixed: Changed references to `https://repo1.maven.org/maven2` to use https where possible. * Change: Use the `zapwhite` gem to manage file whitespace within repository. +* Fixed: Replace references to long removed `http://www.ibiblio.org/maven2/` repository with + `https://repo1.maven.org/maven2`. 1.5.7 (2019-02-16) * Fixed: The fix that allowed special characters in usernames and passwords was only partially applied diff --git a/doc/artifacts.textile b/doc/artifacts.textile index b07044e..6733026 100644 --- a/doc/artifacts.textile +++ b/doc/artifacts.textile @@ -99,7 +99,7 @@ Buildr can download artifacts for you, but only if you tell it where to find the When you call @repositories.remote@, you get an array of URLs for the various remote repositories. Initially, it's an empty array, to which you can add new repositories. For example: {% highlight ruby %} -repositories.remote << 'http://www.ibiblio.org/maven2/' +repositories.remote << 'https://repo1.maven.org/maven2' {% endhighlight %} If your repository requires HTTP authentication, you can write, @@ -171,7 +171,7 @@ artifacts(OPENJPA).each(&:invoke) When you let Buildr download artifacts for you, or by invoking the artifact task yourself, it scans through the remote repositories assuming each repository follows the Maven 2 structure. Starting from the root repository URL, it will look for each artifact using the path @group/id/version/id-version.type@ (or ...@/id-version-classifier.type@). The group identifier becomes a path by turning periods (@.@) into slashes (@/@). So to find @org.apache.axis2:axis2:jar:1.2@, we're going to lo [...] -You'll find a lot of open source Java libraries in public repositories that support this structure (for example, the "Ibiblio Maven":http://www.ibiblio.org/maven2/ repository). And, of course, every remote repository you setup for your projects. +You'll find a lot of open source Java libraries in public repositories that support this structure (for example, the "Maven Central":https://repo1.maven.org/maven2 repository). And, of course, every remote repository you setup for your projects. But there are exceptions to the rule. Say we want to download the Dojo widget library and use it in our project. It's available from the Dojo Web site, but that site doesn't follow the Maven repository conventions, so our feeble attempt to use existing remote repositories will fail. diff --git a/doc/projects.textile b/doc/projects.textile index 3418075..75c8f11 100644 --- a/doc/projects.textile +++ b/doc/projects.textile @@ -26,7 +26,7 @@ AXIS_OF_WS = [AXIOM, AXIS2] OPENJPA = ['org.apache.openjpa:openjpa:jar:1.2.0', 'net.sourceforge.serp:serp:jar:1.12.0'] -repositories.remote << 'http://www.ibiblio.org/maven2/' +repositories.remote << 'https://repo1.maven.org/maven2' desc 'Code. Build. ??? Profit!' define 'killer-app' do diff --git a/doc/quick_start.textile b/doc/quick_start.textile index e0831ce..87b0802 100644 --- a/doc/quick_start.textile +++ b/doc/quick_start.textile @@ -67,7 +67,7 @@ h2(#dependencies). Dependencies So far, we have seen how Buildr can automatically infer what amounts to dozens of lines of @build.xml@ contents, all based on a buildfile and a directory structure. However, the best is yet to come. Buildr also provides Maven-style dependency management (but without the long loading times!). In other words, you specify each dependent library using a string descriptor and Buildr figures out how to download and configure your classpath (the library descriptors are just a Ruby array, the [...] {% highlight ruby %} -repositories.remote << 'http://www.ibiblio.org/maven2' +repositories.remote << 'https://repo1.maven.org/maven2' define 'killer-app' do project.version = '0.1.0' @@ -83,7 +83,7 @@ p(tip). You can search the global repository of artifacts at sites like "MvnBrow Unfortunately, not all libraries are quite as simple as Commons CLI. Many libraries (such as Apache Wicket) have dependencies of their own. While we may be able to _compile_ against Apache Wicket without these extra libraries on our classpath, we cannot actually _run_ our application without its transitive dependencies. To avoid tracking down each of these dependencies and adding them manually, we can simply use the @transitive@ directive (this is how Maven behaves by default): {% highlight ruby %} -repositories.remote << 'http://www.ibiblio.org/maven2' +repositories.remote << 'https://repo1.maven.org/maven2' define 'killer-app' do project.version = '0.1.0' @@ -95,7 +95,7 @@ end The @compile.with@ property accepts a full array of comma-separated artifacts, making it possible to specify any number of dependencies as necessary. Of course, such a long list of verbose string descriptors could get very tiresome and messy. For this reason, it is conventional to assign each dependency to a constant (e.g. @WICKET@) which is declared just above the project in the buildfile and passed to @compile.with@ in a clean, easy-to-read style: {% highlight ruby %} -repositories.remote << 'http://www.ibiblio.org/maven2' +repositories.remote << 'https://repo1.maven.org/maven2' WICKET = transitive('org.apache.wicket:wicket:jar:1.4-rc6') SLF4J = 'org.slf4j:slf4j-jdk14:jar:1.5.8' diff --git a/lib/buildr/packaging/artifact_search.rb b/lib/buildr/packaging/artifact_search.rb index fc96e18..0abef26 100644 --- a/lib/buildr/packaging/artifact_search.rb +++ b/lib/buildr/packaging/artifact_search.rb @@ -96,7 +96,7 @@ module Buildr #:nodoc: def remote_versions(art, base, from = :metadata, fallback = true) path = (art[:group].split(/\./) + [art[:id]]).flatten.join('/') - base ||= "http://mirrors.ibiblio.org/pub/mirrors/maven2"; + base ||= "https://repo1.maven.org/maven2"; uris = {:metadata => "#{base}/#{path}/maven-metadata.xml"} uris[:listing] = "#{base}/#{path}/" if base =~ /^https?:/ xml = nil diff --git a/spec/ide/idea_spec.rb b/spec/ide/idea_spec.rb index 35c7a12..61eb506 100644 --- a/spec/ide/idea_spec.rb +++ b/spec/ide/idea_spec.rb @@ -1419,7 +1419,7 @@ describe Buildr::IntellijIdea do touch 'foo/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project artifact('group:id:jar:1.0') { |t| write t.to_s } define "root" do - repositories.remote << 'http://mirrors.ibiblio.org/pub/mirrors/maven2/' + repositories.remote << 'https://repo1.maven.org/maven2' project.version = "2.5.2" define 'foo' do resources.from _(:source, :main, :resources) diff --git a/spec/packaging/artifact_spec.rb b/spec/packaging/artifact_spec.rb index 8a654d9..54abe3d 100644 --- a/spec/packaging/artifact_spec.rb +++ b/spec/packaging/artifact_spec.rb @@ -215,7 +215,7 @@ describe Repositories, 'remote_uri' do @local = @remote = @release_to = nil end - @repos = [ 'https://oss.sonatype.org/', 'http://www.ibiblio.org/maven2', { :url => 'https://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ] + @repos = [ 'https://oss.sonatype.org/', { :url => 'https://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ] end it 'should convert remote to array of uri' do @@ -223,7 +223,7 @@ describe Repositories, 'remote_uri' do uri.user = 'user' uri.password = 'password' - uris = [ URI.parse( 'https://oss.sonatype.org/'), URI.parse( 'http://www.ibiblio.org/maven2' ), uri ] + uris = [ URI.parse( 'https://oss.sonatype.org/'), uri ] repositories.remote = @repos repositories.remote_uri.should eql(uris) @@ -236,7 +236,7 @@ describe Repositories, 'mirrors' do @local = @remote = @release_to = @mirrors = nil end - @repos = [ 'http://www.ibiblio.org/maven2', 'https://repo1.maven.org/maven2' ] + @repos = %w(http://www.ibiblio.org/maven2 https://repo1.maven.org/maven2) end it 'should be empty initially' do @@ -310,7 +310,7 @@ describe Repositories, 'remote' do @local = @remote = @release_to = nil end - @repos = [ 'http://www.ibiblio.org/maven2', 'https://repo1.maven.org/maven2' ] + @repos = %w(http://www.ibiblio.org/maven2 https://repo1.maven.org/maven2) end it 'should be empty initially' do
