Merge branch 'master' of https://gitbox.apache.org/repos/asf/ant-antlibs-dotnet
diff --git a/build.xml b/build.xml
index dda5c4a..19ebf1a 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
  
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
  
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/changes.xml b/changes.xml
index 6eea0bf..3be8a6b 100644
--- a/changes.xml
+++ b/changes.xml
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/contributors.xml b/contributors.xml
index 61e7771..5bb60d3 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/docs/csc.html b/docs/csc.html
index b715389..780600c 100644
--- a/docs/csc.html
+++ b/docs/csc.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/dotnetexec.html b/docs/dotnetexec.html
index e1dce54..f0d954c 100644
--- a/docs/dotnetexec.html
+++ b/docs/dotnetexec.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/fsc.html b/docs/fsc.html
index fe35d67..795b708 100644
--- a/docs/fsc.html
+++ b/docs/fsc.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/ilasm.html b/docs/ilasm.html
index c0666b0..211ed4d 100644
--- a/docs/ilasm.html
+++ b/docs/ilasm.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/ildasm.html b/docs/ildasm.html
index 96df325..958dff9 100644
--- a/docs/ildasm.html
+++ b/docs/ildasm.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/importtypelib.html b/docs/importtypelib.html
index 0033f7d..84e94e6 100644
--- a/docs/importtypelib.html
+++ b/docs/importtypelib.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/index.html b/docs/index.html
index ce0d3d3..a5ef05e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/jsharpc.html b/docs/jsharpc.html
index 58273ed..f8ad17d 100644
--- a/docs/jsharpc.html
+++ b/docs/jsharpc.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/msbuild.html b/docs/msbuild.html
index d9ed555..6deba1a 100644
--- a/docs/msbuild.html
+++ b/docs/msbuild.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/nant.html b/docs/nant.html
index ffd0ce3..4a44c67 100644
--- a/docs/nant.html
+++ b/docs/nant.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/nunit.html b/docs/nunit.html
index 1d4dc5c..818cebe 100644
--- a/docs/nunit.html
+++ b/docs/nunit.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/old-core.html b/docs/old-core.html
index 64ba422..5e722f7 100644
--- a/docs/old-core.html
+++ b/docs/old-core.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/tallow.html b/docs/tallow.html
index 8df0075..d96b40e 100644
--- a/docs/tallow.html
+++ b/docs/tallow.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/vbc.html b/docs/vbc.html
index 939592b..58db238 100644
--- a/docs/vbc.html
+++ b/docs/vbc.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/wix.html b/docs/wix.html
index ef077ee..24c928c 100644
--- a/docs/wix.html
+++ b/docs/wix.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/docs/wsdltodotnet.html b/docs/wsdltodotnet.html
index 52aa62d..a344ff9 100644
--- a/docs/wsdltodotnet.html
+++ b/docs/wsdltodotnet.html
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
  
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
diff --git a/prepare.xml b/prepare.xml
index b3a64f4..cd9385e 100644
--- a/prepare.xml
+++ b/prepare.xml
@@ -8,7 +8,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
diff --git a/src/main/org/apache/ant/dotnet/DotNetExecTask.java b/src/main/org/apache/ant/dotnet/DotNetExecTask.java
index a907aad..72d15da 100644
--- a/src/main/org/apache/ant/dotnet/DotNetExecTask.java
+++ b/src/main/org/apache/ant/dotnet/DotNetExecTask.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/Ildasm.java b/src/main/org/apache/ant/dotnet/Ildasm.java
index e9cba01..4be7868 100644
--- a/src/main/org/apache/ant/dotnet/Ildasm.java
+++ b/src/main/org/apache/ant/dotnet/Ildasm.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/ImportTypelib.java b/src/main/org/apache/ant/dotnet/ImportTypelib.java
index bbc611b..489a255 100644
--- a/src/main/org/apache/ant/dotnet/ImportTypelib.java
+++ b/src/main/org/apache/ant/dotnet/ImportTypelib.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/NUnitTask.java b/src/main/org/apache/ant/dotnet/NUnitTask.java
index 79d3ad1..b51c404 100644
--- a/src/main/org/apache/ant/dotnet/NUnitTask.java
+++ b/src/main/org/apache/ant/dotnet/NUnitTask.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/NetCommand.java b/src/main/org/apache/ant/dotnet/NetCommand.java
index 4258958..cbca167 100644
--- a/src/main/org/apache/ant/dotnet/NetCommand.java
+++ b/src/main/org/apache/ant/dotnet/NetCommand.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/antlib.xml b/src/main/org/apache/ant/dotnet/antlib.xml
index b4dcb30..131f25d 100644
--- a/src/main/org/apache/ant/dotnet/antlib.xml
+++ b/src/main/org/apache/ant/dotnet/antlib.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/build/AbstractBuildTask.java b/src/main/org/apache/ant/dotnet/build/AbstractBuildTask.java
index dd15337..c7acd1b 100644
--- a/src/main/org/apache/ant/dotnet/build/AbstractBuildTask.java
+++ b/src/main/org/apache/ant/dotnet/build/AbstractBuildTask.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/build/MSBuildTask.java b/src/main/org/apache/ant/dotnet/build/MSBuildTask.java
index bd5cf6d..3aa49b2 100644
--- a/src/main/org/apache/ant/dotnet/build/MSBuildTask.java
+++ b/src/main/org/apache/ant/dotnet/build/MSBuildTask.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/build/NAntTask.java b/src/main/org/apache/ant/dotnet/build/NAntTask.java
index 8589f5a..ae40197 100644
--- a/src/main/org/apache/ant/dotnet/build/NAntTask.java
+++ b/src/main/org/apache/ant/dotnet/build/NAntTask.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/CSharp.java b/src/main/org/apache/ant/dotnet/compile/CSharp.java
index 332699c..dae8322 100644
--- a/src/main/org/apache/ant/dotnet/compile/CSharp.java
+++ b/src/main/org/apache/ant/dotnet/compile/CSharp.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java b/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java
index dc15516..8dc98af 100644
--- a/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java
+++ b/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java b/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java
index 47d4206..801a190 100644
--- a/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java
+++ b/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java b/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java
index f8caa96..3ca8743 100644
--- a/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java
+++ b/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/DotnetResource.java b/src/main/org/apache/ant/dotnet/compile/DotnetResource.java
index ea22fc5..70432c1 100644
--- a/src/main/org/apache/ant/dotnet/compile/DotnetResource.java
+++ b/src/main/org/apache/ant/dotnet/compile/DotnetResource.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/FSharp.java b/src/main/org/apache/ant/dotnet/compile/FSharp.java
index 0b45e27..499d33a 100644
--- a/src/main/org/apache/ant/dotnet/compile/FSharp.java
+++ b/src/main/org/apache/ant/dotnet/compile/FSharp.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/Ilasm.java b/src/main/org/apache/ant/dotnet/compile/Ilasm.java
index 7e98540..1d4a8c1 100644
--- a/src/main/org/apache/ant/dotnet/compile/Ilasm.java
+++ b/src/main/org/apache/ant/dotnet/compile/Ilasm.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/JSharp.java b/src/main/org/apache/ant/dotnet/compile/JSharp.java
index f36ec86..0e1ebeb 100644
--- a/src/main/org/apache/ant/dotnet/compile/JSharp.java
+++ b/src/main/org/apache/ant/dotnet/compile/JSharp.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java b/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java
index 44eabb1..b894db1 100644
--- a/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java
+++ b/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java b/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java
index 6225109..8d0d149 100644
--- a/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java
+++ b/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/util/CollectionUtils.java b/src/main/org/apache/ant/dotnet/util/CollectionUtils.java
index 6bddab2..b8d7864 100644
--- a/src/main/org/apache/ant/dotnet/util/CollectionUtils.java
+++ b/src/main/org/apache/ant/dotnet/util/CollectionUtils.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/wix/TallowTask.java b/src/main/org/apache/ant/dotnet/wix/TallowTask.java
index 86bef74..b1bbf1e 100644
--- a/src/main/org/apache/ant/dotnet/wix/TallowTask.java
+++ b/src/main/org/apache/ant/dotnet/wix/TallowTask.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/org/apache/ant/dotnet/wix/WixTask.java b/src/main/org/apache/ant/dotnet/wix/WixTask.java
index 040aa43..e67af1a 100644
--- a/src/main/org/apache/ant/dotnet/wix/WixTask.java
+++ b/src/main/org/apache/ant/dotnet/wix/WixTask.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/augment-path.xml b/src/tests/antunit/augment-path.xml
index d2be9a5..ad8d944 100755
--- a/src/tests/antunit/augment-path.xml
+++ b/src/tests/antunit/augment-path.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/build-tasks/msbuild-test.xml b/src/tests/antunit/build-tasks/msbuild-test.xml
index fd485fb..b2508b3 100644
--- a/src/tests/antunit/build-tasks/msbuild-test.xml
+++ b/src/tests/antunit/build-tasks/msbuild-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/build-tasks/nant-test.xml b/src/tests/antunit/build-tasks/nant-test.xml
index f698ca1..c15c3fd 100644
--- a/src/tests/antunit/build-tasks/nant-test.xml
+++ b/src/tests/antunit/build-tasks/nant-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/build-tasks/src/msbuild.proj b/src/tests/antunit/build-tasks/src/msbuild.proj
index 8ef9362..301c8fb 100644
--- a/src/tests/antunit/build-tasks/src/msbuild.proj
+++ b/src/tests/antunit/build-tasks/src/msbuild.proj
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/build-tasks/src/nant.build b/src/tests/antunit/build-tasks/src/nant.build
index c7612dd..db86415 100644
--- a/src/tests/antunit/build-tasks/src/nant.build
+++ b/src/tests/antunit/build-tasks/src/nant.build
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/dir with spaces/compilation-test.xml b/src/tests/antunit/dir with spaces/compilation-test.xml
index 5a11bc1..9ceb574 100644
--- a/src/tests/antunit/dir with spaces/compilation-test.xml
+++ b/src/tests/antunit/dir with spaces/compilation-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/dir with spaces/msbuild-test.xml b/src/tests/antunit/dir with spaces/msbuild-test.xml
index 3dc1969..3a1ac87 100644
--- a/src/tests/antunit/dir with spaces/msbuild-test.xml
+++ b/src/tests/antunit/dir with spaces/msbuild-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/dir with spaces/nant-test.xml b/src/tests/antunit/dir with spaces/nant-test.xml
index d6a88fc..24e0476 100644
--- a/src/tests/antunit/dir with spaces/nant-test.xml
+++ b/src/tests/antunit/dir with spaces/nant-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/dir with spaces/nunit-test.xml b/src/tests/antunit/dir with spaces/nunit-test.xml
index a1af373..bc9c005 100644
--- a/src/tests/antunit/dir with spaces/nunit-test.xml
+++ b/src/tests/antunit/dir with spaces/nunit-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/dir with spaces/wsdl-test.xml b/src/tests/antunit/dir with spaces/wsdl-test.xml
index 30f13f4..3cbbf4b 100644
--- a/src/tests/antunit/dir with spaces/wsdl-test.xml
+++ b/src/tests/antunit/dir with spaces/wsdl-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/dotnetexec-test.xml b/src/tests/antunit/dotnetexec-test.xml
index f2514f0..c28b39b 100755
--- a/src/tests/antunit/dotnetexec-test.xml
+++ b/src/tests/antunit/dotnetexec-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/fsc-test.xml b/src/tests/antunit/fsc-test.xml
index ff886ad..c017648 100644
--- a/src/tests/antunit/fsc-test.xml
+++ b/src/tests/antunit/fsc-test.xml
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with

    the License.  You may obtain a copy of the License at

 

-       http://www.apache.org/licenses/LICENSE-2.0

+       https://www.apache.org/licenses/LICENSE-2.0

 

    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/src/tests/antunit/nunit/nunit-test.xml b/src/tests/antunit/nunit/nunit-test.xml
index 74877bc..dac2b34 100644
--- a/src/tests/antunit/nunit/nunit-test.xml
+++ b/src/tests/antunit/nunit/nunit-test.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/nunit/src/fail.cs b/src/tests/antunit/nunit/src/fail.cs
index 0607040..7383d9e 100644
--- a/src/tests/antunit/nunit/src/fail.cs
+++ b/src/tests/antunit/nunit/src/fail.cs
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/nunit/src/pass.cs b/src/tests/antunit/nunit/src/pass.cs
index ef5d031..d585b1a 100644
--- a/src/tests/antunit/nunit/src/pass.cs
+++ b/src/tests/antunit/nunit/src/pass.cs
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/old-core-test.xml b/src/tests/antunit/old-core-test.xml
index 23009a0..d4728e0 100644
--- a/src/tests/antunit/old-core-test.xml
+++ b/src/tests/antunit/old-core-test.xml
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/HelloWorld.wsdl b/src/tests/antunit/src/HelloWorld.wsdl
index 2c56a66..af6adc6 100644
--- a/src/tests/antunit/src/HelloWorld.wsdl
+++ b/src/tests/antunit/src/HelloWorld.wsdl
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/example.cs b/src/tests/antunit/src/example.cs
index 90531cb..bd20aff 100644
--- a/src/tests/antunit/src/example.cs
+++ b/src/tests/antunit/src/example.cs
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/example.fs b/src/tests/antunit/src/example.fs
index 594aff0..044210c 100644
--- a/src/tests/antunit/src/example.fs
+++ b/src/tests/antunit/src/example.fs
@@ -8,7 +8,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/example.il b/src/tests/antunit/src/example.il
index e5786d6..a866b22 100644
--- a/src/tests/antunit/src/example.il
+++ b/src/tests/antunit/src/example.il
@@ -6,7 +6,7 @@
 //  (the "License"); you may not use this file except in compliance with
 //  the License.  You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+//      https://www.apache.org/licenses/LICENSE-2.0
 //
 //  Unless required by applicable law or agreed to in writing, software
 //  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/example.vb b/src/tests/antunit/src/example.vb
index e54ef77..c2d050b 100644
--- a/src/tests/antunit/src/example.vb
+++ b/src/tests/antunit/src/example.vb
@@ -5,7 +5,7 @@
 REM  (the "License"); you may not use this file except in compliance with
 REM  the License.  You may obtain a copy of the License at
 REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
+REM      https://www.apache.org/licenses/LICENSE-2.0
 REM
 REM  Unless required by applicable law or agreed to in writing, software
 REM  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/example2.cs b/src/tests/antunit/src/example2.cs
index 0f45971..a217d46 100644
--- a/src/tests/antunit/src/example2.cs
+++ b/src/tests/antunit/src/example2.cs
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/example2.il b/src/tests/antunit/src/example2.il
index afbfd4f..07346bb 100644
--- a/src/tests/antunit/src/example2.il
+++ b/src/tests/antunit/src/example2.il
@@ -5,7 +5,7 @@
 //  (the "License"); you may not use this file except in compliance with
 //  the License.  You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+//      https://www.apache.org/licenses/LICENSE-2.0
 //
 //  Unless required by applicable law or agreed to in writing, software
 //  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/example3.cs b/src/tests/antunit/src/example3.cs
index 95f6981..0fdacf2 100644
--- a/src/tests/antunit/src/example3.cs
+++ b/src/tests/antunit/src/example3.cs
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/src/jsharp.java b/src/tests/antunit/src/jsharp.java
index e237034..642f62e 100644
--- a/src/tests/antunit/src/jsharp.java
+++ b/src/tests/antunit/src/jsharp.java
@@ -6,7 +6,7 @@
  *  (the "License"); you may not use this file except in compliance with
  *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/wsdl/StockQuoteService.wsdl b/src/tests/antunit/wsdl/StockQuoteService.wsdl
index dd1292a..9fa1aca 100644
--- a/src/tests/antunit/wsdl/StockQuoteService.wsdl
+++ b/src/tests/antunit/wsdl/StockQuoteService.wsdl
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/tests/antunit/wsdl2dotnet-test.xml b/src/tests/antunit/wsdl2dotnet-test.xml
index cb82c4c..eb72d80 100644
--- a/src/tests/antunit/wsdl2dotnet-test.xml
+++ b/src/tests/antunit/wsdl2dotnet-test.xml
@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/version.properties b/version.properties
index cce379b..15a399b 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 #  (the "License"); you may not use this file except in compliance with
 #  the License.  You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,