natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mechanically replace URIs so TLS is used by default for Maven Central

This commit is contained in:
Stefan Bodewig 2014-08-12 12:29:18 +02:00 committed by Nicolas Lalevée
parent 453a134066
commit 53d5beee60
22 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/install.html
View File

@ -64,7 +64,7 @@ If you want to use Ivy only in your ant build scripts, and have an internet conn
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without any special installation -->
<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
<get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>

2
doc/principle.html
View File

@ -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 <a href="resolver/ibiblio.html">ibiblio resolver</a> 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 <a href="resolver/ibiblio.html">ibiblio resolver</a> pointing to https://repo1.maven.org/maven2/ to resolve all modules.
<h1>Resolve</h1>
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.

2
doc/resolver/ibiblio.html
View File

@ -37,7 +37,7 @@
<span class="since">since 1.4</span> 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:
<code type="xml">
<url name="test" m2compatible="true">
<artifact pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
<artifact pattern="https://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</url>
</code>

2
doc/resolver/mirrored.html
View File

@ -65,7 +65,7 @@ This resolver shares the <a href="../settings/resolvers.html#common">common attr
Having the file mavenrepolist.txt content:
<code>
http://repo1.maven.org/maven2/
https://repo1.maven.org/maven2/
http://repo2.maven.org/maven2/
</code>
And the piece of settings:

2
doc/resolver/packager.html
View File

@ -338,7 +338,7 @@ The m2resource XML tag supports the following attributes:
<tr>
<td>repo</td>
<td>Maven repository URL</td>
<td>No; defaults to http://repo1.maven.org/maven2/ </td>
<td>No; defaults to https://repo1.maven.org/maven2/ </td>
</tr>
</tbody>
</table>

2
doc/samples/build-install.xml
View File

@ -48,7 +48,7 @@
<url name="public">
<ivy pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/ivy-[revision].xml"/>
<artifact pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/[revision]/[artifact].[ext]"/>
<artifact pattern="http://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
<artifact pattern="https://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
</url>
</resolvers>
</ivysettings>

2
doc/samples/build.xml
View File

@ -50,7 +50,7 @@
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without any special installation -->
<echo message="installing ivy..."/>
<get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
<get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>

2
src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
View File

@ -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
-->
<property name="ibiblio-maven2-root" value="http://repo1.maven.org/maven2/" override="false" />
<property name="ibiblio-maven2-root" value="https://repo1.maven.org/maven2/" override="false" />
<namespaces>
<namespace name="maven2">

2
src/example/go-ivy/build.xml
View File

@ -50,7 +50,7 @@
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without any special installation -->
<echo message="installing ivy..."/>
<get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
<get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>

4
src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
View File

@ -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)) {

2
src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
View File

@ -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;

2
src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl
View File

@ -24,7 +24,7 @@
<xsl:param name="restricted"/>
<xsl:param name="quiet"/>
<xsl:variable name="maven2repo" select="'http://repo1.maven.org/maven2/'"/>
<xsl:variable name="maven2repo" select="'https://repo1.maven.org/maven2/'"/>
<xsl:template match="/packager-module">
<xsl:comment> GENERATED FILE - DO NOT EDIT </xsl:comment>

2
src/java/org/apache/ivy/util/ChecksumHelper.java
View File

@ -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();

2
test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
View File

@ -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";

2
test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
View File

@ -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);

4
test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
View File

@ -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;

2
test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
View File

@ -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");

4
test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt
View File

@ -1,2 +1,2 @@
http://repo1.maven.org/_this_should_not_exist/
http://repo1.maven.org/_this_should_not_exist_either/
https://repo1.maven.org/_this_should_not_exist/
https://repo1.maven.org/_this_should_not_exist_either/

4
test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt
View File

@ -1,2 +1,2 @@
http://repo1.maven.org/_this_should_not_exist/
http://repo1.maven.org/maven2/
https://repo1.maven.org/_this_should_not_exist/
https://repo1.maven.org/maven2/

2
test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt
View File

@ -1 +1 @@
http://repo1.maven.org/maven2/
https://repo1.maven.org/maven2/

2
test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
View File

@ -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);
}

6
test/test-obr/sources.xml
View File

@ -17,7 +17,7 @@
under the License.
-->
<repository name='Felix-Releases' lastmodified='20120203022437.168'>
<resource id='org.apache.felix.bundlerepository/1.0.3' symbolicname='org.apache.felix.bundlerepository' presentationname='Apache Felix Bundle Repository' uri='http://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar' version='1.0.3'>
<resource id='org.apache.felix.bundlerepository/1.0.3' symbolicname='org.apache.felix.bundlerepository' presentationname='Apache Felix Bundle Repository' uri='https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar' version='1.0.3'>
<description>Bundle repository service.</description>
<size>130451</size>
<documentation>http://oscar-osgi.sf.net/obr2/org.apache.felix.bundlerepository/</documentation>
@ -41,7 +41,7 @@
<require name='package' filter='(&amp;(package=org.osgi.framework)(version&gt;=1.3.0))' extend='false' multiple='false' optional='false'>Import package org.osgi.framework ;version=1.3.0</require>
<require name='package' filter='(&amp;(package=org.osgi.service.obr)(version&gt;=1.0.0))' extend='false' multiple='false' optional='false'>Import package org.osgi.service.obr ;version=1.0.0</require>
</resource>
<resource id='org.apache.felix.eventadmin/1.0.0' symbolicname='org.apache.felix.eventadmin' presentationname='Apache Felix EventAdmin' uri='http://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar' version='1.0.0'>
<resource id='org.apache.felix.eventadmin/1.0.0' symbolicname='org.apache.felix.eventadmin' presentationname='Apache Felix EventAdmin' uri='https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar' version='1.0.0'>
<description>This bundle provides an implementation of the OSGi R4 EventAdmin service.</description>
<size>73643</size>
<source>http://felix.apache.org/site/downloads.cgi</source>
@ -68,4 +68,4 @@
<require name='package' filter='(&amp;(package=org.osgi.framework)(version&gt;=1.3.0))' extend='false' multiple='false' optional='false'>Import package org.osgi.framework ;version=1.3.0</require>
<require name='package' filter='(&amp;(package=org.osgi.service.event)(version&gt;=1.1.0))' extend='false' multiple='false' optional='false'>Import package org.osgi.service.event ;version=1.1.0</require>
</resource>
</repository>
</repository>