Merge branch 'master' of https://gitbox.apache.org/repos/asf/ant-antlibs-dotnet
diff --git a/NOTICE b/NOTICE
index 8e72d5b..4176896 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,5 +2,5 @@
Copyright 2000-2011 The Apache Software Foundation
This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
+ The Apache Software Foundation (https://www.apache.org/).
diff --git a/README b/README
index af5f0c5..2d495a3 100644
--- a/README
+++ b/README
@@ -11,14 +11,14 @@
The documentation is included in the docs subdirectory of this
distribution. The home of this library is
-<http://ant.apache.org/antlibs/dotnet/index.html>.
+<https://ant.apache.org/antlibs/dotnet/index.html>.
Building
========
This Ant Library requires Ant 1.7.0 to build, the tests use the sister
Antlib AntUnit (see
-<http://ant.apache.org/antlibs/antunit/index.html>).
+<https://ant.apache.org/antlibs/antunit/index.html>).
It should work with any Java(TM) Runtime (and compile with any Java(TM)
Developer Kit) starting with version 1.2.
diff --git a/common b/common
index 0a4d365..a715465 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0a4d3650f72e8ec0a27f2f9e41287d96c23136b2
+Subproject commit a715465514e3aaa5e6e06a91345c0292c3642539
diff --git a/docs/dotnetexec.html b/docs/dotnetexec.html
index 5577332..f0d954c 100644
--- a/docs/dotnetexec.html
+++ b/docs/dotnetexec.html
@@ -32,7 +32,7 @@
directly by the executable attribute.</p>
<p>This task is an extension of Ant's <a
- href="http://ant.apache.org/manual/CoreTasks/exec.html">exec</a>
+ href="https://ant.apache.org/manual/CoreTasks/exec.html">exec</a>
task and supports all attributes and nested child elements of that
task. Use the executable attribute to specify the name of the
assembly (including the extension).</p>
@@ -43,7 +43,7 @@
name that means "run the assembly as executable directly" - this
may also work for Mono on Linux systems with the binfmt feature
described in the <a
- href="http://www.go-mono.org/faq.html#q86">Mono FAQ</a>.</p>
+ href="https://www.go-mono.org/faq.html#q86">Mono FAQ</a>.</p>
<p class="copyright">
Apache Ant, Apache .NET Ant Library, Ant, .NET Ant Library, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
diff --git a/docs/index.html b/docs/index.html
index fa7470c..a5ef05e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -27,12 +27,12 @@
<h2>Introduction</h2>
<p>The Apache .NET Ant Library™ is a library of Apache
- Ant™ tasks developed by <a href="http://www.apache.org/">The
+ Ant™ tasks developed by <a href="https://www.apache.org/">The
Apache Software Foundation</a> that support using .NET
executables accross different platforms and in particular support
using common .NET development tools like <a
- href="http://nant.sourceforge.net/">NAnt</a> or <a
- href="http://www.nunit.org/">NUnit</a> from within Ant.</p>
+ href="https://nant.sourceforge.net/">NAnt</a> or <a
+ href="https://www.nunit.org/">NUnit</a> from within Ant.</p>
<p>The original .NET support from Ant's core has also been moved
to this library.</p>
@@ -43,24 +43,24 @@
<h2>Where is it?</h2>
- <p>The source code for the library lives in Ant's SVN - <a
- href="http://svn.apache.org/repos/asf/ant/antlibs/dotnet/trunk/">http://svn.apache.org/repos/asf/ant/antlibs/dotnet/trunk/</a>,
+ <p>The source code for the library lives in Ant's git - <a
+ href="https://gitbox.apache.org/repos/asf?p=ant-antlibs-dotnet.git">https://gitbox.apache.org/repos/asf?p=ant-antlibs-dotnet.git</a>,
binary and source distributions are available available from the
Ant website: <a
- href="http://ant.apache.org/antlibs/srcdownload.cgi">source</a>
+ href="https://ant.apache.org/antlibs/srcdownload.cgi">source</a>
and <a
- href="http://ant.apache.org/antlibs/bindownload.cgi">binary</a>.</p>
+ href="https://ant.apache.org/antlibs/bindownload.cgi">binary</a>.</p>
<h2>Feedback</h2>
- <p>Please use <a href="http://issues.apache.org/bugzilla/">Ant's
+ <p>Please use <a href="https://issues.apache.org/bugzilla/">Ant's
issue tracker</a> for bug reports, choose "Ant" as the product and
".NET Antlib" as the category. The <a
- href="http://ant.apache.org/bugs.html">hints</a> about reporting
+ href="https://ant.apache.org/bugs.html">hints</a> about reporting
bugs certainly apply to this Ant library as well.</p>
<p>For questions about this Ant library use the user or dev <a
- href="http://ant.apache.org/mail.html">mailing list</a> of the Ant
+ href="https://ant.apache.org/mail.html">mailing list</a> of the Ant
project. You must be subscribed to the list in order to post a
question.</p>
@@ -168,7 +168,7 @@
toolset.</li>
<li><a href="nunit.html">nunit</a> - execute the
- nunit-console.exe <a href="http://www.nunit.org/">NUnit</a>
+ nunit-console.exe <a href="https://www.nunit.org/">NUnit</a>
test runner.</li>
</ul>
diff --git a/docs/nant.html b/docs/nant.html
index aec42ba..4a44c67 100644
--- a/docs/nant.html
+++ b/docs/nant.html
@@ -28,7 +28,7 @@
<h3>Description</h3>
- <p>Runs the <a href="http://nant.sourceforge.net/">NAnt</a> build
+ <p>Runs the <a href="https://nant.sourceforge.net/">NAnt</a> build
tool.</p>
<p>You can either use an existing build file or nest a build file
diff --git a/docs/nunit.html b/docs/nunit.html
index 7de7420..818cebe 100644
--- a/docs/nunit.html
+++ b/docs/nunit.html
@@ -28,7 +28,7 @@
<h3>Description</h3>
- <p>Runs the <a href="http://www.nunit.org/">NUnit</a> console
+ <p>Runs the <a href="https://www.nunit.org/">NUnit</a> console
test runner.</p>
<h3>Parameters</h3>
@@ -133,16 +133,16 @@
<h4>redirector</h4>
<p>A nested <a
- href="http://ant.apache.org/manual/CoreTypes/redirector.html">I/O
+ href="https://ant.apache.org/manual/CoreTypes/redirector.html">I/O
Redirector</a> can be specified. Any file mapping is done using a
<code>null</code> sourcefile; therefore not all <a
- href="http://ant.apache.org/manual/CoreTypes/mapper.html">Mapper</a>
+ href="https://ant.apache.org/manual/CoreTypes/mapper.html">Mapper</a>
types will return results.</p>
<h4>env</h4> <p>It is possible to specify environment variables to
pass to the system command via nested <code><env></code>
elements. They support the same attributes as the nested <a
- href="http://ant.apache.org/manual/CoreTasks/exec.html#env"><code>env</code>
+ href="https://ant.apache.org/manual/CoreTasks/exec.html#env"><code>env</code>
element of the <code><exec></code> task</a>.</p>
<h3>Examples</h3>
diff --git a/docs/old-core.html b/docs/old-core.html
index 19d38c8..5e722f7 100644
--- a/docs/old-core.html
+++ b/docs/old-core.html
@@ -29,9 +29,9 @@
Ant support for .NET goes back to before .NET was released, and
continues to be expanded based on user demand. Users writing nothing but
a .NET application, may want to look at the .NET-based
-<A href="http://nant.sourceforge.net/">NAnt</A> project, that supports
+<A href="https://nant.sourceforge.net/">NAnt</A> project, that supports
both the Microsoft and the Ximian managed <A
-href="http://go-mono.com/">Mono</A> project's implementation of the
+href="https://go-mono.com/">Mono</A> project's implementation of the
.NET framework.
<p>
@@ -70,11 +70,11 @@
</ol>
Needless to say, possible does not mean easy.
-<A href="http://www.manning.com/hatcher/chap15.pdf">Chapter 15</A> of
+<A href="https://www.manning.com/hatcher/chap15.pdf">Chapter 15</A> of
Java Development with Ant covers the first of these, using the Ant1.5
version of the tasks. Going the other way -generating Java client
code and JUnit testcases is covered in
-<A href="http://www.iseran.com/Steve/papers/interop/">The Wondrous curse
+<A href="https://www.iseran.com/Steve/papers/interop/">The Wondrous curse
of Interop</A>. The final trick, IDL and Typelib abuse, is not
documented as we do not want to encourage such an ugly practise. It,
can, however, be done if absolutely necessary.
diff --git a/docs/tallow.html b/docs/tallow.html
index 0b226fb..d96b40e 100644
--- a/docs/tallow.html
+++ b/docs/tallow.html
@@ -29,7 +29,7 @@
<h3>Description</h3>
<p>Runs tallow from the <a
- href="http://sourceforge.net/projects/wix">Wix</a> toolset
+ href="https://sourceforge.net/projects/wix">Wix</a> toolset
</p>
<h3>Parameters</h3>
@@ -71,14 +71,14 @@
<p>Specify source directories that shall be passed on the command line.
This is a <a
- href="http://ant.apache.org/manual/CoreTypes/dirset.html">dirset</a>.</p>
+ href="https://ant.apache.org/manual/CoreTypes/dirset.html">dirset</a>.</p>
<h4>arg</h4>
<p>Specifies additional arguments for talow</p>
<p><code>arg</code> is
- a <a href="http://ant.apache.org/manual/using.html#arg">command
+ a <a href="https://ant.apache.org/manual/using.html#arg">command
line argument</a>.</p>
<h3>Examples</h3>
diff --git a/docs/wix.html b/docs/wix.html
index 7763e69..24c928c 100644
--- a/docs/wix.html
+++ b/docs/wix.html
@@ -29,7 +29,7 @@
<h3>Description</h3>
<p>Runs candle or light/lit from the
- <a href="http://wixtoolset.org/">Wix</a> toolset - or
+ <a href="https://wixtoolset.org/">Wix</a> toolset - or
both of them in sequence.</p>
<h3>Parameters</h3>
@@ -91,13 +91,13 @@
<p>Specify source files that shall be passed on the command line.
This is a <a
- href="http://ant.apache.org/manual/CoreTypes/fileset.html">fileset</a>.</p>
+ href="https://ant.apache.org/manual/CoreTypes/fileset.html">fileset</a>.</p>
<h4>moresources</h4>
<p>Specify source files that shall not be passed on the command
line. This is a <a
- href="http://ant.apache.org/manual/CoreTypes/fileset.html">fileset</a>.</p>
+ href="https://ant.apache.org/manual/CoreTypes/fileset.html">fileset</a>.</p>
<p>Typically this would list include files when running candle or
the files that become part of the MSI file when running light.</p>
@@ -119,7 +119,7 @@
<p>Specifies additional arguments for candle</p>
<p><code>candleArg</code> is
- a <a href="http://ant.apache.org/manual/using.html#arg">command
+ a <a href="https://ant.apache.org/manual/using.html#arg">command
line argument</a>.</p>
<h4>lightParameter</h4>
@@ -134,7 +134,7 @@
<p>Specifies additional arguments for light</p>
<p><code>lightArg</code> is
- a <a href="http://ant.apache.org/manual/using.html#arg">command
+ a <a href="https://ant.apache.org/manual/using.html#arg">command
line argument</a>.</p>
<h3>Examples</h3>
diff --git a/prepare.xml b/prepare.xml
index 0995174..cd9385e 100644
--- a/prepare.xml
+++ b/prepare.xml
@@ -27,7 +27,7 @@
<!-- Which released version of AntUnit to use, where to download, where to store. -->
<property name="antunit.version" value="1.3"/>
- <property name="antunit.url" value="http://repo1.maven.org/maven2/org/apache/ant/ant-antunit/${antunit.version}/ant-antunit-${antunit.version}.jar"/>
+ <property name="antunit.url" value="https://repo1.maven.org/maven2/org/apache/ant/ant-antunit/${antunit.version}/ant-antunit-${antunit.version}.jar"/>
<property name="antunit.file" value="ant-antunit.jar"/>
<!-- Skip unnecessary tasks. -->
diff --git a/src/main/org/apache/ant/dotnet/NUnitTask.java b/src/main/org/apache/ant/dotnet/NUnitTask.java
index 13fee51..b51c404 100644
--- a/src/main/org/apache/ant/dotnet/NUnitTask.java
+++ b/src/main/org/apache/ant/dotnet/NUnitTask.java
@@ -31,7 +31,7 @@
/**
* Task to run the NUnit Console test runner.
*
- * @see http://www.nunit.org/
+ * @see https://www.nunit.org/
*/
public class NUnitTask extends Task {
diff --git a/src/main/org/apache/ant/dotnet/wix/TallowTask.java b/src/main/org/apache/ant/dotnet/wix/TallowTask.java
index ba29039..b1bbf1e 100644
--- a/src/main/org/apache/ant/dotnet/wix/TallowTask.java
+++ b/src/main/org/apache/ant/dotnet/wix/TallowTask.java
@@ -36,7 +36,7 @@
/**
* Task to run the tallow on packaging content to create a wxs file
*
- * @see http://sf.net/projects/wix
+ * @see https://sf.net/projects/wix
*/
public class TallowTask extends Task {
diff --git a/src/main/org/apache/ant/dotnet/wix/WixTask.java b/src/main/org/apache/ant/dotnet/wix/WixTask.java
index 9e3bd0a..e67af1a 100644
--- a/src/main/org/apache/ant/dotnet/wix/WixTask.java
+++ b/src/main/org/apache/ant/dotnet/wix/WixTask.java
@@ -39,7 +39,7 @@
/**
* Task to run the WiX utility to create MSI files from an XML description.
*
- * @see http://sf.net/projects/wix
+ * @see https://sf.net/projects/wix
*/
public class WixTask extends Task {
@@ -458,4 +458,4 @@
return new String[] {CANDLE, LIGHT, BOTH,};
}
}
-}
\ No newline at end of file
+}
