diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 48b341e7..94ffa9ca 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -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, diff --git a/README.adoc b/README.adoc index 783e2bab..c8883bd3 100644 --- a/README.adoc +++ b/README.adoc @@ -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. diff --git a/ReleaseInstructions b/ReleaseInstructions index 27729f65..ec716fcb 100644 --- a/ReleaseInstructions +++ b/ReleaseInstructions @@ -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 diff --git a/build.xml b/build.xml index 246da932..f9141796 100644 --- a/build.xml +++ b/build.xml @@ -661,7 +661,7 @@ value="${findbugs.download.name}.zip" description="The filename of the ZIP."/> - + diff --git a/src/etc/checkstyle/checkstyle-frames.xsl b/src/etc/checkstyle/checkstyle-frames.xsl index da6d9f0a..d9020fe4 100644 --- a/src/etc/checkstyle/checkstyle-frames.xsl +++ b/src/etc/checkstyle/checkstyle-frames.xsl @@ -78,7 +78,7 @@ Designed for use with CheckStyle and - Ant. + Ant.
diff --git a/src/etc/makepom/pom.template b/src/etc/makepom/pom.template index cae5744d..3b161043 100644 --- a/src/etc/makepom/pom.template +++ b/src/etc/makepom/pom.template @@ -32,9 +32,9 @@ Apache Ivy ${ivy.pom.url} - scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/ + scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk/ scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk - http://svn.apache.org/repos/asf/ant/ivy/core/trunk + https://svn.apache.org/repos/asf/ant/ivy/core/trunk @@ -42,18 +42,18 @@ dev-subscribe@ant.apache.org dev-unsubscribe@ant.apache.org dev@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-dev + https://mail-archives.apache.org/mod_mbox/ant-dev Ivy Users List ivy-user-subscribe@ant.apache.org ivy-user-unsubscribe@ant.apache.org ivy-user@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-ivy-user + https://mail-archives.apache.org/mod_mbox/ant-ivy-user jira - http://issues.apache.org/jira/browse/IVY + https://issues.apache.org/jira/browse/IVY diff --git a/src/java/org/apache/ivy/Ivy.java b/src/java/org/apache/ivy/Ivy.java index c981b87b..1c539f9c 100644 --- a/src/java/org/apache/ivy/Ivy.java +++ b/src/java/org/apache/ivy/Ivy.java @@ -73,7 +73,7 @@ import org.apache.ivy.util.Message; import org.apache.ivy.util.MessageLoggerEngine; /** - * Ivy is a free java based dependency manager. + * Ivy is a free java based dependency manager. *

* This class is the main class of Ivy, which acts as a Facade to all services offered by Ivy: *

@@ -192,7 +192,7 @@ public class Ivy { * @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() { diff --git a/src/java/org/apache/ivy/core/settings/IvySettings.java b/src/java/org/apache/ivy/core/settings/IvySettings.java index 1d6db8ca..20d8a556 100644 --- a/src/java/org/apache/ivy/core/settings/IvySettings.java +++ b/src/java/org/apache/ivy/core/settings/IvySettings.java @@ -323,7 +323,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P 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; diff --git a/src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml b/src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml index 495d3973..0ac67942 100644 --- a/src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml +++ b/src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml @@ -19,7 +19,8 @@ - + + diff --git a/src/java/org/apache/ivy/core/settings/repository.properties b/src/java/org/apache/ivy/core/settings/repository.properties index 891b2425..ddab1911 100644 --- a/src/java/org/apache/ivy/core/settings/repository.properties +++ b/src/java/org/apache/ivy/core/settings/repository.properties @@ -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 diff --git a/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java b/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java index 2dc7a197..82136281 100644 --- a/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java @@ -32,11 +32,11 @@ import org.apache.oro.text.regex.Perl5Matcher; * *

* NOTE: this matcher is available only with - * Apache Jakarta ORO 2.0.8 + * Apache Jakarta ORO 2.0.8 * in your classpath. *

* - * @see GlobCompiler + * @see GlobCompiler */ public/* @Immutable */final class GlobPatternMatcher extends AbstractPatternMatcher { diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java index 56ad7a95..11964f54 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java @@ -70,7 +70,7 @@ import static org.apache.ivy.plugins.parser.m2.PomModuleDescriptorBuilder.getPlu *

* The configurations used in the generated module descriptor mimics the behavior defined by Maven 2 * scopes, as documented here. + * "https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">here. * 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. diff --git a/src/java/org/apache/ivy/plugins/report/ivy-report.xsl b/src/java/org/apache/ivy/plugins/report/ivy-report.xsl index 3101e151..15e8562e 100644 --- a/src/java/org/apache/ivy/plugins/report/ivy-report.xsl +++ b/src/java/org/apache/ivy/plugins/report/ivy-report.xsl @@ -160,21 +160,21 @@ - searched + searched - downloaded + downloaded - http://ant.apache.org/ivy/images/evicted.gif + https://ant.apache.org/ivy/images/evicted.gif evicted evicted by - http://ant.apache.org/ivy/images/error.gif + https://ant.apache.org/ivy/images/error.gif error error: @@ -259,7 +259,7 @@ -

+

- @@ -289,10 +289,10 @@ + ( searched searched, + downloaded downloaded, + evicted evicted, + errors error) diff --git a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java index b325faa0..bdf8e1b1 100644 --- a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java @@ -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/"; diff --git a/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java b/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java index d62ed467..c8ae2fe4 100644 --- a/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java @@ -56,7 +56,6 @@ import org.xml.sax.helpers.DefaultHandler; 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; diff --git a/src/java/org/apache/ivy/util/Configurator.java b/src/java/org/apache/ivy/util/Configurator.java index 42575f23..86614e67 100644 --- a/src/java/org/apache/ivy/util/Configurator.java +++ b/src/java/org/apache/ivy/util/Configurator.java @@ -37,7 +37,7 @@ import org.apache.ivy.core.IvyPatternHelper; * This configurator is used to configure elements (initialised with setRoot) using the behaviour * defined by ant for its tasks. *

- * Example (based on Ant + * Example (based on Ant * Example): * * 

diff --git a/src/java/org/apache/ivy/util/filter/FilterHelper.java b/src/java/org/apache/ivy/util/filter/FilterHelper.java
index adb5fc83..bc51952a 100644
--- a/src/java/org/apache/ivy/util/filter/FilterHelper.java
+++ b/src/java/org/apache/ivy/util/filter/FilterHelper.java
@@ -64,7 +64,7 @@ public final class FilterHelper {
      *
      * 

      * Comment: We could have used
-     * Commons Collections facility for
+     * Commons Collections facility for
      * this, if we accepted additional dependencies on third party jars.
      * 

      */
Modules
Revisions - ( searched searched, - downloaded downloaded, - evicted evicted, - errors error)
Artifacts ( downloaded, failed)