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 2019/02/25 23:15:44 UTC
[buildr] 01/05: Changed references to
`https://repo1.maven.org/maven2` to use https where possible
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 5511baec59f3ec2395adf709bddbe3834b0fec5a
Author: Peter Donald <pe...@realityforge.org>
AuthorDate: Tue Feb 26 10:00:17 2019 +1100
Changed references to `https://repo1.maven.org/maven2` to use https where possible
---
CHANGELOG | 1 +
buildr.buildfile | 2 +-
lib/buildr/core/generate.rb | 4 ++--
spec/java/ecj_spec.rb | 4 ++--
spec/packaging/artifact_spec.rb | 8 ++++----
spec/sandbox.rb | 2 +-
tests/compile_with_parent/Buildfile | 2 +-
tests/generateFromPom/pom.xml | 2 +-
tests/include_as/Buildfile | 2 +-
tests/include_path/Buildfile | 2 +-
tests/junit3/Buildfile | 2 +-
11 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index a4d325c..c2c06d5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.8 (Pending)
+* Fixed: Changed references to `https://repo1.maven.org/maven2` to use https where possible.
1.5.7 (2019-02-16)
* Fixed: The fix that allowed special characters in usernames and passwords was only partially applied
diff --git a/buildr.buildfile b/buildr.buildfile
index b91cce0..aa4d101 100644
--- a/buildr.buildfile
+++ b/buildr.buildfile
@@ -19,7 +19,7 @@ require 'buildr/jetty6'
require 'buildr/nailgun'
require 'buildr/scala'
require 'buildr/kotlin'
-repositories.remote << 'http://repo1.maven.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
diff --git a/lib/buildr/core/generate.rb b/lib/buildr/core/generate.rb
index 9f21fbe..ac66ccc 100644
--- a/lib/buildr/core/generate.rb
+++ b/lib/buildr/core/generate.rb
@@ -81,7 +81,7 @@ GROUP = "#{name}"
COPYRIGHT = ""
# Specify Maven 2.0 remote repositories here, like this:
-repositories.remote << "http://repo1.maven.org/maven2"
+repositories.remote << "https://repo1.maven.org/maven2"
desc "The #{name.capitalize} project"
define "#{name}" do
@@ -267,7 +267,7 @@ EOF
legacy = repository["layout"].to_s =~ /legacy/
!legacy
} rescue nil
- repositories = [{"name" => "Standard maven2 repository", "url" => "http://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
+ repositories = [{"name" => "Standard maven2 repository", "url" => "https://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
repositories.each do |repository|
name, url = repository["name"], repository["url"]
script << "# #{name}"
diff --git a/spec/java/ecj_spec.rb b/spec/java/ecj_spec.rb
index 41150cd..fbcfaa3 100644
--- a/spec/java/ecj_spec.rb
+++ b/spec/java/ecj_spec.rb
@@ -77,7 +77,7 @@ describe 'ecj compiler' do
end
it 'should include tools.jar dependency' do
- repositories.remote << "http://repo1.maven.org/maven2/"
+ repositories.remote << "https://repo1.maven.org/maven2/"
write 'src/main/java/UseJarSigner.java', <<-JAVA
import sun.tools.jar.Manifest;
public class UseJarSigner { }
@@ -229,7 +229,7 @@ describe 'ecj compiler options' do
end
it 'should complain about options it doesn\'t know' do
- repositories.remote << "http://repo1.maven.org/maven2/"
+ repositories.remote << "https://repo1.maven.org/maven2/"
write 'source/Test.java', 'class Test {}'
compile_task.using(:unknown=>'option')
lambda { compile_task.from('source').invoke }.should raise_error(ArgumentError, /no such option/i)
diff --git a/spec/packaging/artifact_spec.rb b/spec/packaging/artifact_spec.rb
index 594c83d..8a654d9 100644
--- a/spec/packaging/artifact_spec.rb
+++ b/spec/packaging/artifact_spec.rb
@@ -215,11 +215,11 @@ describe Repositories, 'remote_uri' do
@local = @remote = @release_to = nil
end
- @repos = [ 'https://oss.sonatype.org/', 'http://www.ibiblio.org/maven2', { :url => 'http://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
+ @repos = [ 'https://oss.sonatype.org/', 'http://www.ibiblio.org/maven2', { :url => 'https://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
end
it 'should convert remote to array of uri' do
- uri = URI.parse( 'http://repo1.maven.org/maven2' )
+ uri = URI.parse( 'https://repo1.maven.org/maven2' )
uri.user = 'user'
uri.password = 'password'
@@ -236,7 +236,7 @@ describe Repositories, 'mirrors' do
@local = @remote = @release_to = @mirrors = nil
end
- @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
+ @repos = [ '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', 'http://repo1.maven.org/maven2' ]
+ @repos = [ 'http://www.ibiblio.org/maven2', 'https://repo1.maven.org/maven2' ]
end
it 'should be empty initially' do
diff --git a/spec/sandbox.rb b/spec/sandbox.rb
index 6c3aa94..7ba7cd5 100644
--- a/spec/sandbox.rb
+++ b/spec/sandbox.rb
@@ -18,7 +18,7 @@
# that the code requires several artifacts. So we establish them first using the real local
# 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 << 'https://repo1.maven.org/maven2'
repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
diff --git a/tests/compile_with_parent/Buildfile b/tests/compile_with_parent/Buildfile
index d1646d0..0a2f085 100644
--- a/tests/compile_with_parent/Buildfile
+++ b/tests/compile_with_parent/Buildfile
@@ -1,5 +1,5 @@
-repositories.remote << "http://repo1.maven.org/maven2"
+repositories.remote << "https://repo1.maven.org/maven2"
LOG4J = artifact("log4j:log4j:jar:1.2.16")
unless File.exist? File.join("lib", File.basename(LOG4J.to_s))
diff --git a/tests/generateFromPom/pom.xml b/tests/generateFromPom/pom.xml
index af29d4e..9e24209 100644
--- a/tests/generateFromPom/pom.xml
+++ b/tests/generateFromPom/pom.xml
@@ -276,7 +276,7 @@
<pluginRepository>
<id>maven-repo</id>
<name>maven repo</name>
- <url>http://repo1.maven.org/maven2/</url>
+ <url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
<pluginRepository>
<id>atlassian-m2-repository</id>
diff --git a/tests/include_as/Buildfile b/tests/include_as/Buildfile
index 6a43272..67c1c8e 100644
--- a/tests/include_as/Buildfile
+++ b/tests/include_as/Buildfile
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-repositories.remote = ["http://repo1.maven.org/maven2"]
+repositories.remote = ["https://repo1.maven.org/maven2"]
SLF4J_API = "org.slf4j:slf4j-api:jar:1.6.1"
define "proj" do
diff --git a/tests/include_path/Buildfile b/tests/include_path/Buildfile
index 98ebe52..701fb44 100644
--- a/tests/include_path/Buildfile
+++ b/tests/include_path/Buildfile
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-repositories.remote = ["http://repo1.maven.org/maven2"]
+repositories.remote = ["https://repo1.maven.org/maven2"]
SLF4J_API = "org.slf4j:slf4j-api:jar:1.6.1"
define "proj" do
diff --git a/tests/junit3/Buildfile b/tests/junit3/Buildfile
index a9a40ad..f3adf0a 100644
--- a/tests/junit3/Buildfile
+++ b/tests/junit3/Buildfile
@@ -1,5 +1,5 @@
-repositories.remote << "http://repo1.maven.org/maven2"
+repositories.remote << "https://repo1.maven.org/maven2"
Buildr.settings.build['junit'] = '3.8.1'
define "foo" do