Skip to content
Permalink
Browse files
Use https instead of http
  • Loading branch information
jaikiran committed May 31, 2019
1 parent 309dba8 commit 0114c604b69b7ccec0d1ef7d34e94007f19e37bd
Showing 18 changed files with 36 additions and 33 deletions.
@@ -6,7 +6,7 @@ Bundle-Name: Ivy
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.ivy
Bundle-Vendor: Apache Software Foundation
Bundle-DocURL: http://ant.apache.org/ivy/
Bundle-DocURL: https://ant.apache.org/ivy/
Import-Package: com.jcraft.jsch;resolution:=optional,
javax.crypto;resolution:=optional,
javax.swing;resolution:=optional,
@@ -68,7 +68,7 @@ possession, use, and/or re-export to another country, of
encryption software. BEFORE using any encryption software, please
check your country's laws, regulations and policies concerning the
import, possession, or use, and re-export of encryption software, to
see if this is permitted. See http://www.wassenaar.org/ for more
see if this is permitted. See https://www.wassenaar.org/ for more
information.
The U.S. Government Department of Commerce, Bureau of Industry and
@@ -87,7 +87,7 @@ software:
The Ivy ssh resolver requires the JSch library
http://www.jcraft.com/jsch/index.html. +
The sftp and https resolvers requires the Java Cryptography extensions
http://java.sun.com/javase/technologies/security/. +
https://java.sun.com/javase/technologies/security/. +
The PGP signature generator requires the BouncyCastle Java cryptography APIs
https://www.bouncycastle.org/java.html.
@@ -1,3 +1,3 @@
Release instructions are in asciidoc/dev/makerelease.adoc

You can see the last version online here: http://ant.apache.org/ivy/history/master/dev/makerelease.html
You can see the last version online here: https://ant.apache.org/ivy/history/master/dev/makerelease.html
@@ -661,7 +661,7 @@
value="${findbugs.download.name}.zip"
description="The filename of the ZIP."/>
<property name="findbugs.download.url"
value="http://downloads.sourceforge.net/project/findbugs/findbugs/${findbugs.version}/findbugs-${findbugs.version}.zip"
value="https://downloads.sourceforge.net/project/findbugs/findbugs/${findbugs.version}/findbugs-${findbugs.version}.zip"
description="The download adress at a mirror of Sourceforge."/>
<property name="findbugs.download.to"
value="${build.dir}/.downloads"
@@ -29,7 +29,7 @@
<resolvers>
<chain name="default">
<ibiblio name="public" m2compatible="true" />
<ibiblio name="snapshot" m2compatible="true" root="http://people.apache.org/repo/m2-snapshot-repository" />
<ibiblio name="snapshot" m2compatible="true" root="https://repository.apache.org/content/repositories/snapshots/" />
</chain>
<url name="nexus" m2compatible="true" signer="apache-sig">
<artifact pattern="${upload.url}/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
@@ -78,7 +78,7 @@
<tr>
<td class="text-align:right">Designed for use with
<a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and
<a href='http://ant.apache.org/'>Ant</a>.</td>
<a href='https://ant.apache.org/'>Ant</a>.</td>
</tr>
</table>
<hr size="1"/>
@@ -32,28 +32,28 @@
<name>Apache Ivy</name>
<url>${ivy.pom.url}</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/</connection>
<connection>scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk</developerConnection>
<url>http://svn.apache.org/repos/asf/ant/ivy/core/trunk</url>
<url>https://svn.apache.org/repos/asf/ant/ivy/core/trunk</url>
</scm>
<mailingLists>
<mailingList>
<name>Ant/Ivy Developers List</name>
<subscribe>dev-subscribe@ant.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@ant.apache.org</unsubscribe>
<post>dev@ant.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive>
<archive>https://mail-archives.apache.org/mod_mbox/ant-dev</archive>
</mailingList>
<mailingList>
<name>Ivy Users List</name>
<subscribe>ivy-user-subscribe@ant.apache.org</subscribe>
<unsubscribe>ivy-user-unsubscribe@ant.apache.org</unsubscribe>
<post>ivy-user@ant.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive>
<archive>https://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive>
</mailingList>
</mailingLists>
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/IVY</url>
<url>https://issues.apache.org/jira/browse/IVY</url>
</issueManagement>
</project>
@@ -73,7 +73,7 @@
import org.apache.ivy.util.MessageLoggerEngine;

/**
* <a href="http://ant.apache.org/ivy/">Ivy</a> is a free java based dependency manager.
* <a href="https://ant.apache.org/ivy/">Ivy</a> is a free java based dependency manager.
* <p>
* This class is the main class of Ivy, which acts as a Facade to all services offered by Ivy:
* </p>
@@ -192,7 +192,7 @@ public static String getIvyDate() {
* @return the URL at which Ivy web site can be found
*/
public static String getIvyHomeURL() {
return "http://ant.apache.org/ivy/";
return "https://ant.apache.org/ivy/";
}

public static Ivy newInstance() {
@@ -323,7 +323,7 @@ public synchronized void configureRepositories(boolean remote) {
boolean configured = false;
if (useRemoteConfig && remote) {
try {
URL url = new URL("http://ant.apache.org/ivy/repository.properties");
URL url = new URL("https://ant.apache.org/ivy/repository.properties");
Message.verbose("configuring repositories with " + url);
props.load(URLHandlerRegistry.getDefault().openStream(url));
configured = true;
@@ -19,7 +19,8 @@
<ivysettings>
<settings defaultResolver="default"/>
<resolvers>
<ivyrep name="public" ivyroot="http://ivyrep.jayasoft.org/"/>
<!-- TODO: This repo is no longer relevant and must be removed -->
<ivyrep name="public" ivyroot="https://ivyrep.jayasoft.org/"/>

This comment has been minimized.

Copy link
@twogee

twogee May 31, 2019

Contributor

This may cause problems due to invalid certificate

This comment has been minimized.

Copy link
@jaikiran

jaikiran Jun 1, 2019

Author Member

Yes, that's correct. That repo/site is no longer functional, so I decided that it's probably better if it fails with a connection issue (due to the https cert) instead of establishing a successful connection to it (via http) and then potentially failing.

</resolvers>
<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
@@ -16,7 +16,7 @@
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
ivy.ibiblio.default.artifact.root = http://www.ibiblio.org/maven/
ivy.ibiblio.default.artifact.root = https://repo1.maven.org/maven2/
ivy.ibiblio.default.artifact.pattern = [module]/[type]s/[artifact]-[revision].[ext]

ivy.ivyrep.default.ivy.pattern = [organisation]/[module]/ivy-[revision].xml
@@ -32,11 +32,11 @@
* </ul>
* <p>
* NOTE: this matcher is available only with
* <a href="http://jakarta.apache.org/oro">Apache Jakarta ORO 2.0.8</a>
* <a href="https://jakarta.apache.org/oro">Apache Jakarta ORO 2.0.8</a>
* in your classpath.
* </p>
*
* @see <a href="http://jakarta.apache.org/oro/api/org/apache/oro/text/GlobCompiler.html">GlobCompiler</a>
* @see <a href="https://jakarta.apache.org/oro/api/org/apache/oro/text/GlobCompiler.html">GlobCompiler</a>

This comment has been minimized.

Copy link
@twogee

twogee May 31, 2019

Contributor

This URL is invalid

This comment has been minimized.

Copy link
@jaikiran

jaikiran Jun 1, 2019

Author Member

Looks like it. Going to remove this reference in a next commit

*/
public/* @Immutable */final class GlobPatternMatcher extends AbstractPatternMatcher {

@@ -70,7 +70,7 @@
* <p>
* The configurations used in the generated module descriptor mimics the behavior defined by Maven 2
* scopes, as documented <a href=
* "http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">here</a>.
* "https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">here</a>.
* The PomModuleDescriptorParser use a PomDomReader to read the pom, and the
* PomModuleDescriptorBuilder to write the ivy module descriptor using the info read by the
* PomDomReader.
@@ -160,21 +160,21 @@
<xsl:template name="icons">
<xsl:param name="revision"/>
<xsl:if test="$revision/@searched = 'true'">
<img src="http://ant.apache.org/ivy/images/searched.gif" alt="searched" title="required a search in repository"/>
<img src="https://ant.apache.org/ivy/images/searched.gif" alt="searched" title="required a search in repository"/>
</xsl:if>
<xsl:if test="$revision/@downloaded = 'true'">
<img src="http://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="downloaded from repository"/>
<img src="https://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="downloaded from repository"/>
</xsl:if>
<xsl:if test="$revision/@evicted">
<xsl:element name="img">
<xsl:attribute name="src">http://ant.apache.org/ivy/images/evicted.gif</xsl:attribute>
<xsl:attribute name="src">https://ant.apache.org/ivy/images/evicted.gif</xsl:attribute>
<xsl:attribute name="alt">evicted</xsl:attribute>
<xsl:attribute name="title">evicted by <xsl:for-each select="$revision/evicted-by"><xsl:value-of select="@rev"/> </xsl:for-each></xsl:attribute>
</xsl:element>
</xsl:if>
<xsl:if test="$revision/@error">
<xsl:element name="img">
<xsl:attribute name="src">http://ant.apache.org/ivy/images/error.gif</xsl:attribute>
<xsl:attribute name="src">https://ant.apache.org/ivy/images/error.gif</xsl:attribute>
<xsl:attribute name="alt">error</xsl:attribute>
<xsl:attribute name="title">error: <xsl:value-of select="$revision/@error"/></xsl:attribute>
</xsl:element>
@@ -259,7 +259,7 @@
<link rel="stylesheet" type="text/css" href="ivy-report.css"/>
</head>
<body>
<div id="logo"><a href="http://ant.apache.org/ivy/"><img src="http://ant.apache.org/ivy/images/logo.png"/></a></div>
<div id="logo"><a href="https://ant.apache.org/ivy/"><img src="https://ant.apache.org/ivy/images/logo.png"/></a></div>
<h1>
<xsl:element name="a">
<xsl:attribute name="name"><xsl:value-of select="info/@organisation"/>-<xsl:value-of select="info/@module"/></xsl:attribute>
@@ -289,10 +289,10 @@
<table class="header">
<tr><td class="title">Modules</td><td class="value"><xsl:value-of select="count($modules)"/></td></tr>
<tr><td class="title">Revisions</td><td class="value"><xsl:value-of select="count($revisions)"/>
(<xsl:value-of select="count($searcheds)"/> searched <img src="http://ant.apache.org/ivy/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved"/>,
<xsl:value-of select="count($downloadeds)"/> downloaded <img src="http://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver"/>,
<xsl:value-of select="count($evicteds)"/> evicted <img src="http://ant.apache.org/ivy/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others"/>,
<xsl:value-of select="count($errors)"/> errors <img src="http://ant.apache.org/ivy/images/error.gif" alt="error" title="module revisions on which error occurred"/>)</td></tr>
(<xsl:value-of select="count($searcheds)"/> searched <img src="https://ant.apache.org/ivy/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved"/>,
<xsl:value-of select="count($downloadeds)"/> downloaded <img src="https://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver"/>,
<xsl:value-of select="count($evicteds)"/> evicted <img src="https://ant.apache.org/ivy/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others"/>,
<xsl:value-of select="count($errors)"/> errors <img src="https://ant.apache.org/ivy/images/error.gif" alt="error" title="module revisions on which error occurred"/>)</td></tr>
<tr><td class="title">Artifacts</td><td class="value"><xsl:value-of select="count($artifacts)"/>
(<xsl:value-of select="count($dlartifacts)"/> downloaded,
<xsl:value-of select="count($faileds)"/> failed)</td></tr>
@@ -68,7 +68,10 @@ public class IBiblioResolver extends URLResolver {
public static final String DEFAULT_PATTERN = "[module]/[type]s/[artifact]-[revision].[ext]";

@Deprecated
public static final String DEFAULT_ROOT = "http://www.ibiblio.org/maven/";
/**
* @deprecated This root URL is no longer valid. Use {@link #DEFAULT_M2_ROOT} instead
*/
public static final String DEFAULT_ROOT = "https://www.ibiblio.org/maven/";

public static final String DEFAULT_M2_ROOT = "https://repo1.maven.org/maven2/";

@@ -56,7 +56,6 @@
public class IvyRepResolver extends URLResolver {
public static final String DEFAULT_IVYPATTERN = "[organisation]/[module]/ivy-[revision].xml";

public static final String DEFAULT_IVYROOT = "http://ivyrep.jayasoft.org/";

private String ivyroot = null;

@@ -37,7 +37,7 @@
* This configurator is used to configure elements (initialised with setRoot) using the behaviour
* defined by ant for its tasks.
* <p>
* Example (based on <a href="http://ant.apache.org/manual/develop.html#writingowntask">Ant
* Example (based on <a href="https://ant.apache.org/manual/develop.html#writingowntask">Ant
* Example</a>):
*
* <pre>
@@ -64,7 +64,7 @@ public static Filter<Artifact> getArtifactTypeFilter(String[] types) {
*
* <p>
* Comment: We could have used
* <a href="http://jakarta.apache.org/commons/collections/">Commons Collections</a> facility for
* <a href="https://jakarta.apache.org/commons/collections/">Commons Collections</a> facility for

This comment has been minimized.

* this, if we accepted additional dependencies on third party jars.
* </p>
*/

0 comments on commit 0114c60

Please sign in to comment.