diff --git a/doc/install.html b/doc/install.html index 162332b3..34f69e5f 100644 --- a/doc/install.html +++ b/doc/install.html @@ -64,7 +64,7 @@ If you want to use Ivy only in your ant build scripts, and have an internet conn - diff --git a/doc/principle.html b/doc/principle.html index 31881725..14e95e2e 100644 --- a/doc/principle.html +++ b/doc/principle.html @@ -36,7 +36,7 @@ Ivy needs to be configured to be able to resolve your dependencies. This configu The configuration is also responsible for indicating which resolver should be used to resolve which module. This configuration is dependent only on your environment, i.e. where the modules and artifacts can be found. -A default configuration is used by ivy when none is given. This configuration uses an ibiblio resolver pointing to http://repo1.maven.org/maven2/ to resolve all modules. +A default configuration is used by ivy when none is given. This configuration uses an ibiblio resolver pointing to https://repo1.maven.org/maven2/ to resolve all modules.

Resolve

The resolve time is the moment when ivy actually resolves the dependencies of one module. It first needs to access the ivy file of the module for which it resolves the dependencies. diff --git a/doc/resolver/ibiblio.html b/doc/resolver/ibiblio.html index f38e1b15..80057c48 100644 --- a/doc/resolver/ibiblio.html +++ b/doc/resolver/ibiblio.html @@ -37,7 +37,7 @@ since 1.4 When using the m2compatible flag, you can disable the use of poms by setting the usepoms flag to false. It is then roughly equivalent to a url resolver configured like this: - + diff --git a/doc/resolver/mirrored.html b/doc/resolver/mirrored.html index 27ac6b79..f8bfb196 100644 --- a/doc/resolver/mirrored.html +++ b/doc/resolver/mirrored.html @@ -65,7 +65,7 @@ This resolver shares the common attr Having the file mavenrepolist.txt content: -http://repo1.maven.org/maven2/ +https://repo1.maven.org/maven2/ http://repo2.maven.org/maven2/ And the piece of settings: diff --git a/doc/resolver/packager.html b/doc/resolver/packager.html index e8a4cbf1..abe3ffe6 100644 --- a/doc/resolver/packager.html +++ b/doc/resolver/packager.html @@ -338,7 +338,7 @@ The m2resource XML tag supports the following attributes: repo Maven repository URL - No; defaults to http://repo1.maven.org/maven2/ + No; defaults to https://repo1.maven.org/maven2/ diff --git a/doc/samples/build-install.xml b/doc/samples/build-install.xml index ab36c488..8f7183a2 100644 --- a/doc/samples/build-install.xml +++ b/doc/samples/build-install.xml @@ -48,7 +48,7 @@ - + diff --git a/doc/samples/build.xml b/doc/samples/build.xml index 1f5f5675..a7dbbcdb 100644 --- a/doc/samples/build.xml +++ b/doc/samples/build.xml @@ -50,7 +50,7 @@ - diff --git a/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml b/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml index f20f53a3..09ca0d44 100644 --- a/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml +++ b/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml @@ -25,7 +25,7 @@ You can override this property to use one of the mirrors listed on http://docs.codehaus.org/display/MAVENUSER/Mirrors+Repositories --> - + diff --git a/src/example/go-ivy/build.xml b/src/example/go-ivy/build.xml index de52c295..d92b11fa 100644 --- a/src/example/go-ivy/build.xml +++ b/src/example/go-ivy/build.xml @@ -50,7 +50,7 @@ - diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java index 0eebff82..bbce2b4a 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java @@ -285,7 +285,7 @@ public class PomModuleDescriptorBuilder { dep.getArtifactId(), version); // Some POMs depend on theirselfves, don't add this dependency: Ivy doesn't allow this! - // Example: http://repo2.maven.org/maven2/net/jini/jsk-platform/2.1/jsk-platform-2.1.pom + // Example: https://repo1.maven.org/maven2/net/jini/jsk-platform/2.1/jsk-platform-2.1.pom ModuleRevisionId mRevId = ivyModuleDescriptor.getModuleRevisionId(); if ((mRevId != null) && mRevId.getModuleId().equals(moduleRevId.getModuleId())) { return; @@ -353,7 +353,7 @@ public class PomModuleDescriptorBuilder { // Some POMs depend on themselves through their parent pom, don't add this dependency // since Ivy doesn't allow this! // Example: - // http://repo2.maven.org/maven2/com/atomikos/atomikos-util/3.6.4/atomikos-util-3.6.4.pom + // https://repo1.maven.org/maven2/com/atomikos/atomikos-util/3.6.4/atomikos-util-3.6.4.pom ModuleId dependencyId = descriptor.getDependencyId(); ModuleRevisionId mRevId = ivyModuleDescriptor.getModuleRevisionId(); if ((mRevId != null) && mRevId.getModuleId().equals(dependencyId)) { diff --git a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java index b746a1ce..8072e3f3 100644 --- a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java @@ -69,7 +69,7 @@ public class IBiblioResolver extends URLResolver { public static final String DEFAULT_ROOT = "http://www.ibiblio.org/maven/"; - public static final String DEFAULT_M2_ROOT = "http://repo1.maven.org/maven2/"; + public static final String DEFAULT_M2_ROOT = "https://repo1.maven.org/maven2/"; private String root = null; diff --git a/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl b/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl index 2f7d58e7..f42e7d39 100644 --- a/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl +++ b/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl @@ -24,7 +24,7 @@ - + GENERATED FILE - DO NOT EDIT diff --git a/src/java/org/apache/ivy/util/ChecksumHelper.java b/src/java/org/apache/ivy/util/ChecksumHelper.java index cddfdb8b..56aa9362 100644 --- a/src/java/org/apache/ivy/util/ChecksumHelper.java +++ b/src/java/org/apache/ivy/util/ChecksumHelper.java @@ -67,7 +67,7 @@ public final class ChecksumHelper { expected = csFileContent.substring(0, spaceIndex); // IVY-1155: support some strange formats like this one: - // http://repo2.maven.org/maven2/org/apache/pdfbox/fontbox/0.8.0-incubator/fontbox-0.8.0-incubator.jar.md5 + // https://repo1.maven.org/maven2/org/apache/pdfbox/fontbox/0.8.0-incubator/fontbox-0.8.0-incubator.jar.md5 if (expected.endsWith(":")) { StringBuffer result = new StringBuffer(); char[] chars = csFileContent.substring(spaceIndex + 1).toCharArray(); diff --git a/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java b/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java index 345a8463..56dbac51 100644 --- a/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java +++ b/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java @@ -59,7 +59,7 @@ public class OBRParserTest extends TestCase { String url0 = md.getAllArtifacts()[0].getUrl().toExternalForm(); String type1 = md.getAllArtifacts()[1].getType(); String url1 = md.getAllArtifacts()[1].getUrl().toExternalForm(); - String jarUrl = "http://repo1.maven.org/maven2/org/apache/felix/" + String jarUrl = "https://repo1.maven.org/maven2/org/apache/felix/" + "org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar"; String srcUrl = "http://oscar-osgi.sf.net/obr2/org.apache.felix.bundlerepository/" + "org.apache.felix.bundlerepository-1.0.3-src.jar"; diff --git a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java index fd111760..0d839100 100644 --- a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java +++ b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java @@ -65,7 +65,7 @@ public class UpdateSiteAndIbiblioResolverTest extends TestCase { resolver2 = new IBiblioResolver(); resolver2.setName("maven2"); - settings.setVariable("ivy.ibiblio.default.artifact.root", "http://repo1.maven.org/maven2/"); + settings.setVariable("ivy.ibiblio.default.artifact.root", "https://repo1.maven.org/maven2/"); settings.setVariable("ivy.ibiblio.default.artifact.pattern", "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"); resolver2.setSettings(settings); diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java index e96bfbd4..131de90d 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java +++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java @@ -34,9 +34,9 @@ public class IBiblioHelper { public static String getIBiblioMirror() throws Exception { if (!_checked) { - String[] mirrors = new String[] {"http://repo1.maven.org/maven/REPOSITORY-V1.txt", + String[] mirrors = new String[] {"https://repo1.maven.org/maven/REPOSITORY-V1.txt", "http://www.ibiblio.org/maven"}; - String[] mirrorsRoot = new String[] {"http://repo1.maven.org/maven", + String[] mirrorsRoot = new String[] {"https://repo1.maven.org/maven", "http://www.ibiblio.org/maven"}; long best = -1; diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java index 5166c044..de79421d 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java @@ -124,7 +124,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { assertNotNull(l); assertEquals(1, l.size()); assertEquals( - "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]", + "https://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]", l.get(0)); resolver = (IBiblioResolver) _settings.getResolver("ibiblioD"); diff --git a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt index 68062ae6..d33fc2ca 100644 --- a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt +++ b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt @@ -1,2 +1,2 @@ -http://repo1.maven.org/_this_should_not_exist/ -http://repo1.maven.org/_this_should_not_exist_either/ \ No newline at end of file +https://repo1.maven.org/_this_should_not_exist/ +https://repo1.maven.org/_this_should_not_exist_either/ diff --git a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt index 2ad245f4..69447350 100644 --- a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt +++ b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt @@ -1,2 +1,2 @@ -http://repo1.maven.org/_this_should_not_exist/ -http://repo1.maven.org/maven2/ \ No newline at end of file +https://repo1.maven.org/_this_should_not_exist/ +https://repo1.maven.org/maven2/ diff --git a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt index 75c67b27..ad4a8a9f 100644 --- a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt +++ b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt @@ -1 +1 @@ -http://repo1.maven.org/maven2/ \ No newline at end of file +https://repo1.maven.org/maven2/ diff --git a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java index 1a8adc57..630a9735 100644 --- a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java @@ -55,7 +55,7 @@ public class HttpclientURLHandlerTest extends TestCase { URLHandler handler = new HttpClientHandler(); URLInfo info = handler .getURLInfo(new URL( - "http://repo1.maven.org/maven2/commons-lang/commons-lang/[1.0,3.0[/commons-lang-[1.0,3.0[.pom")); + "https://repo1.maven.org/maven2/commons-lang/commons-lang/[1.0,3.0[/commons-lang-[1.0,3.0[.pom")); assertEquals(URLHandler.UNAVAILABLE, info); } diff --git a/test/test-obr/sources.xml b/test/test-obr/sources.xml index e4ddcc57..7bb94aca 100644 --- a/test/test-obr/sources.xml +++ b/test/test-obr/sources.xml @@ -17,7 +17,7 @@ under the License. --> - + Bundle repository service. 130451 http://oscar-osgi.sf.net/obr2/org.apache.felix.bundlerepository/ @@ -41,7 +41,7 @@ Import package org.osgi.framework ;version=1.3.0 Import package org.osgi.service.obr ;version=1.0.0 - + This bundle provides an implementation of the OSGi R4 EventAdmin service. 73643 http://felix.apache.org/site/downloads.cgi @@ -68,4 +68,4 @@ Import package org.osgi.framework ;version=1.3.0 Import package org.osgi.service.event ;version=1.1.0 - \ No newline at end of file +