building SBOMs requires Java 9+

typo
pack200 now requires asm which is marked optional in commons-compress
2026-07-26 18:16:49 +02:00 · 2026-07-26 18:11:41 +02:00 · 2026-07-19 11:32:30 +02:00 · 2026-07-19 10:48:37 +02:00 · 2026-07-15 17:38:01 +02:00 · 2026-07-15 17:31:40 +02:00
2020 changed files with 11247 additions and 5648 deletions
--- a/.asf.yaml
+++ b/.asf.yaml
@ -0,0 +1,14 @@
+github:
+  rulesets:
+    - name: "Default Branch Protection"
+      type: branch
+      branches:
+        includes:
+          - "~DEFAULT_BRANCH"
+          - "release/*"
+          - "rel/*"
+        excludes: []
+      bypass_teams:
+        - root
+      restrict_deletion: true
+      restrict_force_push: true
--- a/.checkstyle
+++ b/.checkstyle
@ -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
--- a/.classpath.default
+++ b/.classpath.default
@ -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
@ -20,7 +20,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="src" path="test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="lib" path="lib/ant.jar"/>
 	<classpathentry kind="lib" path="lib/ant-testutil.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec.jar"/>
--- a/.classpath.ivyde
+++ b/.classpath.ivyde
@ -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
@ -20,7 +20,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="src" path="test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ivy&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=&amp;propertyFiles=version.properties"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/.project
+++ b/.project
@ -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
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@ -1,4 +1,3 @@
-#Thu Mar 13 22:45:49 CET 2014
 # ***************************************************************
 # * Licensed to the Apache Software Foundation (ASF) under one
 # * or more contributor license agreements.  See the NOTICE file
@ -7,9 +6,9 @@
 # * to you under the Apache License, Version 2.0 (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, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -20,15 +19,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
--- a/.settings/org.jayasoft.ivyde.eclipse.prefs
+++ b/.settings/org.jayasoft.ivyde.eclipse.prefs
@ -1,23 +0,0 @@
-#Sun Sep 03 16:43:34 PDT 2006
-# ***************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (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
-# * 
-# * Unless required by applicable law or agreed to in writing,
-# * software distributed under the License is distributed on an
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# * KIND, either express or implied.  See the License for the
-# * specific language governing permissions and limitations
-# * under the License.
-# ***************************************************************
-acceptedTypes=[inherited]
-eclipse.preferences.version=1
-ivy_conf_path=file\:///./ivysettings.xml
-retreive.pattern=none
--- a/69
+++ b/69
@ -192,7 +192,7 @@
   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,
@ -255,4 +255,69 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
+
+------------------------------------------------------------------------------
+License for jQuery Treeview
+------------------------------------------------------------------------------
+
+Treeview 1.2 - jQuery plugin to hide and show branches of a tree
+
+Copyright (c) 2006 Jörn Zaefferer, Myles Angell
+
+Dual licensed under the MIT and GPL licenses:
+  http://www.opensource.org/licenses/mit-license.php
+  http://www.gnu.org/licenses/gpl.html
+
+MIT Option:
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+“Software”), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------------
+License for ganymed ssh library
+------------------------------------------------------------------------------
+
+Copyright (c) 2005 - 2006 Swiss Federal Institute of Technology (ETH Zurich),
+  Department of Computer Science (http://www.inf.ethz.ch),
+  Christian Plattner. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+a.) Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+b.) Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+c.) Neither the name of ETH Zurich nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.ivy.Main
 Automatic-Module-Name: org.apache.ivy
-Bundle-Version: 2.4.0
+Bundle-Version: 2.6.0
 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,
@ -15,6 +15,7 @@ Import-Package: com.jcraft.jsch;resolution:=optional,
 javax.xml.transform,
 javax.xml.transform.sax,
 javax.xml.transform.stream,
+ org.apache.commons.compress.compressors.pack200;resolution:=optional,
 org.apache.commons.httpclient;resolution:=optional,
 org.apache.commons.httpclient.auth;resolution:=optional,
 org.apache.commons.httpclient.methods;resolution:=optional,
@ -44,70 +45,71 @@ Import-Package: com.jcraft.jsch;resolution:=optional,
 org.xml.sax,
 org.xml.sax.ext,
 org.xml.sax.helpers
-Export-Package: org.apache.ivy;version="2.0.0",
- org.apache.ivy.ant;version="2.0.0",
- org.apache.ivy.core;version="2.0.0",
- org.apache.ivy.core.cache;version="2.0.0",
- org.apache.ivy.core.check;version="2.0.0",
- org.apache.ivy.core.deliver;version="2.0.0",
- org.apache.ivy.core.event;version="2.0.0",
- org.apache.ivy.core.event.download;version="2.0.0",
- org.apache.ivy.core.event.publish;version="2.0.0",
- org.apache.ivy.core.event.resolve;version="2.0.0",
- org.apache.ivy.core.event.retrieve;version="2.0.0",
- org.apache.ivy.core.install;version="2.0.0",
- org.apache.ivy.core.module.descriptor;version="2.0.0",
- org.apache.ivy.core.module.id;version="2.0.0",
- org.apache.ivy.core.module.status;version="2.0.0",
- org.apache.ivy.core.pack;version="2.4.0",
- org.apache.ivy.core.publish;version="2.0.0",
- org.apache.ivy.core.report;version="2.0.0",
- org.apache.ivy.core.repository;version="2.0.0",
- org.apache.ivy.core.resolve;version="2.0.0",
- org.apache.ivy.core.retrieve;version="2.0.0",
- org.apache.ivy.core.search;version="2.0.0",
- org.apache.ivy.core.settings;version="2.0.0",
- org.apache.ivy.core.sort;version="2.0.0",
- org.apache.ivy.osgi.core;version="2.3.0",
- org.apache.ivy.osgi.filter;version="2.3.0",
- org.apache.ivy.osgi.obr;version="2.3.0",
- org.apache.ivy.osgi.obr.xml;version="2.3.0",
- org.apache.ivy.osgi.p2;version="2.3.0",
- org.apache.ivy.osgi.repo;version="2.3.0",
- org.apache.ivy.osgi.updatesite;version="2.3.0",
- org.apache.ivy.osgi.updatesite.xml;version="2.3.0",
- org.apache.ivy.osgi.util;version="2.3.0",
- org.apache.ivy.plugins;version="2.0.0",
- org.apache.ivy.plugins.circular;version="2.0.0",
- org.apache.ivy.plugins.conflict;version="2.0.0",
- org.apache.ivy.plugins.latest;version="2.0.0",
- org.apache.ivy.plugins.lock;version="2.0.0",
- org.apache.ivy.plugins.matcher;version="2.0.0",
- org.apache.ivy.plugins.namespace;version="2.0.0",
- org.apache.ivy.plugins.parser;version="2.0.0",
- org.apache.ivy.plugins.parser.m2;version="2.0.0",
- org.apache.ivy.plugins.parser.xml;version="2.0.0",
- org.apache.ivy.plugins.report;version="2.0.0",
- org.apache.ivy.plugins.repository;version="2.0.0",
- org.apache.ivy.plugins.repository.file;version="2.0.0",
- org.apache.ivy.plugins.repository.jar;version="2.3.0",
- org.apache.ivy.plugins.repository.sftp;version="2.0.0",
- org.apache.ivy.plugins.repository.ssh;version="2.0.0",
- org.apache.ivy.plugins.repository.url;version="2.0.0",
- org.apache.ivy.plugins.repository.vfs;version="2.0.0",
- org.apache.ivy.plugins.repository.vsftp;version="2.0.0",
- org.apache.ivy.plugins.resolver;version="2.0.0",
- org.apache.ivy.plugins.resolver.packager;version="2.0.0",
- org.apache.ivy.plugins.resolver.util;version="2.0.0",
- org.apache.ivy.plugins.signer;version="2.2.0",
- org.apache.ivy.plugins.signer.bouncycastle;version="2.2.0",
- org.apache.ivy.plugins.trigger;version="2.0.0",
- org.apache.ivy.plugins.version;version="2.0.0",
- org.apache.ivy.tools.analyser;version="2.0.0",
- org.apache.ivy.util;version="2.0.0",
- org.apache.ivy.util.cli;version="2.0.0",
- org.apache.ivy.util.extendable;version="2.0.0",
- org.apache.ivy.util.filter;version="2.0.0",
- org.apache.ivy.util.url;version="2.0.0"
+Export-Package: org.apache.ivy;version="2.6.0",
+ org.apache.ivy.ant;version="2.6.0",
+ org.apache.ivy.core;version="2.6.0",
+ org.apache.ivy.core.cache;version="2.6.0",
+ org.apache.ivy.core.check;version="2.6.0",
+ org.apache.ivy.core.deliver;version="2.6.0",
+ org.apache.ivy.core.event;version="2.6.0",
+ org.apache.ivy.core.event.download;version="2.6.0",
+ org.apache.ivy.core.event.publish;version="2.6.0",
+ org.apache.ivy.core.event.resolve;version="2.6.0",
+ org.apache.ivy.core.event.retrieve;version="2.6.0",
+ org.apache.ivy.core.install;version="2.6.0",
+ org.apache.ivy.core.module.descriptor;version="2.6.0",
+ org.apache.ivy.core.module.id;version="2.6.0",
+ org.apache.ivy.core.module.status;version="2.6.0",
+ org.apache.ivy.core.pack;version="2.6.0",
+ org.apache.ivy.core.publish;version="2.6.0",
+ org.apache.ivy.core.report;version="2.6.0",
+ org.apache.ivy.core.repository;version="2.6.0",
+ org.apache.ivy.core.resolve;version="2.6.0",
+ org.apache.ivy.core.retrieve;version="2.6.0",
+ org.apache.ivy.core.search;version="2.6.0",
+ org.apache.ivy.core.settings;version="2.6.0",
+ org.apache.ivy.core.sort;version="2.6.0",
+ org.apache.ivy.osgi.core;version="2.6.0",
+ org.apache.ivy.osgi.filter;version="2.6.0",
+ org.apache.ivy.osgi.obr;version="2.6.0",
+ org.apache.ivy.osgi.obr.xml;version="2.6.0",
+ org.apache.ivy.osgi.p2;version="2.6.0",
+ org.apache.ivy.osgi.repo;version="2.6.0",
+ org.apache.ivy.osgi.updatesite;version="2.6.0",
+ org.apache.ivy.osgi.updatesite.xml;version="2.6.0",
+ org.apache.ivy.osgi.util;version="2.6.0",
+ org.apache.ivy.plugins;version="2.6.0",
+ org.apache.ivy.plugins.circular;version="2.6.0",
+ org.apache.ivy.plugins.conflict;version="2.6.0",
+ org.apache.ivy.plugins.latest;version="2.6.0",
+ org.apache.ivy.plugins.lock;version="2.6.0",
+ org.apache.ivy.plugins.matcher;version="2.6.0",
+ org.apache.ivy.plugins.namespace;version="2.6.0",
+ org.apache.ivy.plugins.pack;version="2.6.0",
+ org.apache.ivy.plugins.parser;version="2.6.0",
+ org.apache.ivy.plugins.parser.m2;version="2.6.0",
+ org.apache.ivy.plugins.parser.xml;version="2.6.0",
+ org.apache.ivy.plugins.report;version="2.6.0",
+ org.apache.ivy.plugins.repository;version="2.6.0",
+ org.apache.ivy.plugins.repository.file;version="2.6.0",
+ org.apache.ivy.plugins.repository.jar;version="2.6.0",
+ org.apache.ivy.plugins.repository.sftp;version="2.6.0",
+ org.apache.ivy.plugins.repository.ssh;version="2.6.0",
+ org.apache.ivy.plugins.repository.url;version="2.6.0",
+ org.apache.ivy.plugins.repository.vfs;version="2.6.0",
+ org.apache.ivy.plugins.repository.vsftp;version="2.6.0",
+ org.apache.ivy.plugins.resolver;version="2.6.0",
+ org.apache.ivy.plugins.resolver.packager;version="2.6.0",
+ org.apache.ivy.plugins.resolver.util;version="2.6.0",
+ org.apache.ivy.plugins.signer;version="2.6.0",
+ org.apache.ivy.plugins.signer.bouncycastle;version="2.6.0",
+ org.apache.ivy.plugins.trigger;version="2.6.0",
+ org.apache.ivy.plugins.version;version="2.6.0",
+ org.apache.ivy.tools.analyser;version="2.6.0",
+ org.apache.ivy.util;version="2.6.0",
+ org.apache.ivy.util.cli;version="2.6.0",
+ org.apache.ivy.util.extendable;version="2.6.0",
+ org.apache.ivy.util.filter;version="2.6.0",
+ org.apache.ivy.util.url;version="2.6.0"
 Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
--- a/6
+++ b/6
@ -1,5 +1,5 @@
 Apache Ivy (TM)
-Copyright 2007-2018 The Apache Software Foundation
+Copyright 2007-2026 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@ -14,3 +14,7 @@ which is open source software, available under
 the terms of a BSD style license.  
 The original software and related information is available
 at http://www.jcraft.com/jsch/.
+
+The Scp class is based on the SCPClient from the ganymed ssh
+library. Which has been distributed under the BSD style license
+included in the LICENSE file.
--- a/README.adoc
+++ b/README.adoc
@ -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
@ -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.

--- a/2
+++ b/2
@ -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
--- a/ant.patterns
+++ b/ant.patterns
@ -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
--- a/asciidoc/ant.adoc
+++ b/asciidoc/ant.adoc
@ -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
@ -45,7 +45,7 @@ If you use Ant *1.5.1* or superior, you have to define the tasks you use in your
  <taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/>
 ----

-_Note_: the tasks listed above are non exhaustive. For a complete list of tasks with the corresponding classes, see the link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/ant/antlib.xml[antlib.xml] file in Git repository or the jar file you use.
+_Note_: the tasks listed above are non exhaustive. For a complete list of tasks with the corresponding classes, see the link:https://gitbox.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/ant/antlib.xml[antlib.xml] file in Git repository or the jar file you use.

 Then you can use the tasks, but check their name, following samples assume you use the Ivy namespace (ivy:xxx tasks), whereas with Ant 1.5 you cannot use namespace, and should therefore use ivy-xxx tasks if you have added the taskdefs as above.

@ -107,7 +107,7 @@ ivy.buildlist.ivyfilepath = ivy.xml
 ivy.checksums=sha1,md5
 ----

-_For the latest version of these properties, you can check the link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/core/settings/ivy.properties[Git version]._
+_For the latest version of these properties, you can check the link:https://gitbox.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/core/settings/ivy.properties[Git version]._

 (*__since 2.0__*) After calling the first Ivy task, the property `ivy.version` will be available and contains the version of the used Ivy library.

--- a/asciidoc/bestpractices.adoc
+++ b/asciidoc/bestpractices.adoc
@ -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
--- a/asciidoc/compatibility.adoc
+++ b/asciidoc/compatibility.adoc
@ -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
@ -25,6 +25,8 @@ For Ivy 2.4.0, a minimum of Java 5 is required.

 Since Ivy 2.5.0, a minimum of Java 7 is required.

+Since Ivy 2.5.1, a minimum of Java 8 is required.
+
 == Apache Ant

 Ivy doesn't require a specific version of Ant as long as the Ant being used complies with the JVM compatibility requirements noted above.
--- a/asciidoc/concept.adoc
+++ b/asciidoc/concept.adoc
@ -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
@ -115,7 +115,11 @@ the configuration name

 `[originalname]`::
 (*__since 1.4__*) +
-the original artifact name (including the extension)
+the original artifact name (not including the extension)
+
+`[classifier]`::
+(*__since 1.4__*) +
+the artifact classifier for Maven dependencies

 The difference between type and extension is explained in the Ivy file documentation.

--- a/asciidoc/configuration.adoc
+++ b/asciidoc/configuration.adoc
@ -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
--- a/asciidoc/configuration/caches.adoc
+++ b/asciidoc/configuration/caches.adoc
@ -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
--- a/asciidoc/configuration/caches/cache.adoc
+++ b/asciidoc/configuration/caches/cache.adoc
@ -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
--- a/asciidoc/configuration/caches/ttl.adoc
+++ b/asciidoc/configuration/caches/ttl.adoc
@ -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
--- a/asciidoc/configuration/classpath.adoc
+++ b/asciidoc/configuration/classpath.adoc
@ -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
--- a/asciidoc/configuration/conf.adoc
+++ b/asciidoc/configuration/conf.adoc
@ -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
--- a/asciidoc/configuration/conflict-managers.adoc
+++ b/asciidoc/configuration/conflict-managers.adoc
@ -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
--- a/asciidoc/configuration/include.adoc
+++ b/asciidoc/configuration/include.adoc
@ -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
--- a/asciidoc/configuration/latest-strategies.adoc
+++ b/asciidoc/configuration/latest-strategies.adoc
@ -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
--- a/asciidoc/configuration/lock-strategies.adoc
+++ b/asciidoc/configuration/lock-strategies.adoc
@ -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
--- a/asciidoc/configuration/macrodef.adoc
+++ b/asciidoc/configuration/macrodef.adoc
@ -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
--- a/asciidoc/configuration/macrodef/attribute.adoc
+++ b/asciidoc/configuration/macrodef/attribute.adoc
@ -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
--- a/asciidoc/configuration/module.adoc
+++ b/asciidoc/configuration/module.adoc
@ -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
--- a/asciidoc/configuration/modules.adoc
+++ b/asciidoc/configuration/modules.adoc
@ -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
--- a/asciidoc/configuration/namespace.adoc
+++ b/asciidoc/configuration/namespace.adoc
@ -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
--- a/asciidoc/configuration/namespace/dest.adoc
+++ b/asciidoc/configuration/namespace/dest.adoc
@ -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
--- a/asciidoc/configuration/namespace/fromtosystem.adoc
+++ b/asciidoc/configuration/namespace/fromtosystem.adoc
@ -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
--- a/asciidoc/configuration/namespace/rule.adoc
+++ b/asciidoc/configuration/namespace/rule.adoc
@ -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
--- a/asciidoc/configuration/namespace/src.adoc
+++ b/asciidoc/configuration/namespace/src.adoc
@ -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
--- a/asciidoc/configuration/namespaces.adoc
+++ b/asciidoc/configuration/namespaces.adoc
@ -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
--- a/asciidoc/configuration/outputters.adoc
+++ b/asciidoc/configuration/outputters.adoc
@ -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
--- a/asciidoc/configuration/parsers.adoc
+++ b/asciidoc/configuration/parsers.adoc
@ -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
--- a/asciidoc/configuration/properties.adoc
+++ b/asciidoc/configuration/properties.adoc
@ -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
--- a/asciidoc/configuration/property.adoc
+++ b/asciidoc/configuration/property.adoc
@ -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
--- a/asciidoc/configuration/resolvers.adoc
+++ b/asciidoc/configuration/resolvers.adoc
@ -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
--- a/asciidoc/configuration/status.adoc
+++ b/asciidoc/configuration/status.adoc
@ -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
--- a/asciidoc/configuration/statuses.adoc
+++ b/asciidoc/configuration/statuses.adoc
@ -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
--- a/asciidoc/configuration/triggers.adoc
+++ b/asciidoc/configuration/triggers.adoc
@ -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
--- a/asciidoc/configuration/typedef.adoc
+++ b/asciidoc/configuration/typedef.adoc
@ -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
--- a/asciidoc/configuration/version-matchers.adoc
+++ b/asciidoc/configuration/version-matchers.adoc
@ -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
--- a/asciidoc/dev.adoc
+++ b/asciidoc/dev.adoc
@ -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
@ -28,11 +28,14 @@ All you need is
 * a link:https://git-scm.com/downloads[Git] client +
 _to check out Ivy sources from Apache Git, not required if you build from sources packaged in a release_

-* link:https://ant.apache.org/[Apache Ant] 1.9.0 or greater +
+* link:https://ant.apache.org/[Apache Ant] 1.10.0 or greater +
 _We recommend the latest version of Ant_

 * a link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[JDK] 7 or greater +
-_Build instructions have been successfully tested with Oracle JDK 7 and 8_
+_Build instructions have been successfully tested with OpenJDK 8 and 11_
+
+Some of the targets used during the release process generate CycloneDX
+SBOMs and require Java 9 or greater in order to build.

 === Procedure

@ -42,7 +45,7 @@ You can either get the sources from a release, or get them directly from Git:

 [source,shell]
 ----
-git clone git://git.apache.org/ant-ivy.git
+git clone https://gitbox.apache.org/repos/asf/ant-ivy.git
 ----

 ==== Build
--- a/asciidoc/dev/apache-proposal.adoc
+++ b/asciidoc/dev/apache-proposal.adoc
@ -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
--- a/asciidoc/dev/conflict-solving-algo.adoc
+++ b/asciidoc/dev/conflict-solving-algo.adoc
@ -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
--- a/asciidoc/dev/ideas.adoc
+++ b/asciidoc/dev/ideas.adoc
@ -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
--- a/asciidoc/dev/makerelease.adoc
+++ b/asciidoc/dev/makerelease.adoc
@ -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
@ -29,7 +29,10 @@ Requirements for making a release are similar to the requirements for building f

 On the master, check that files which require update for the release are up to date.
 This includes particularly:
-`asciidoc/release-notes.adoc`
+
+- `asciidoc/release-notes.adoc`
+- `version.properties` (`target.ivy.bundle.version.qualifier` shoud be `final`)
+- `ivy.xml` (`status` should be `release`)

 ==== 2. Check out a clean copy of the branch

@ -92,7 +95,7 @@ Here is a ruby script you can use to sign the files:
 require 'find'

 Find.find('build/distrib') do |f|
-    `gpg --armor --output #{f}.asc --detach-sig #{f}` if File.file?(f) && ['.zip', '.gz', '.jar', '.pom'].include?(File.extname(f))
+    `gpg --armor --output #{f}.asc --detach-sig #{f}` if File.file?(f) && ['.zip', '.gz', '.jar', '.pom', '.xml', '.json'].include?(File.extname(f))
 end
 ----

@ -126,6 +129,8 @@ Having your GPG key ID, its password, your apache ID and the associated password
 ant -f build-release.xml upload-nexus
 ----

+NOTE: the openpgp library used doesn't seem to support modern algorithms. The step failed for Stefan using an ECC key. The workaround is to manually sign all artifacts and using Nexus "upload bundle" feature to uplad a zip of all artifacts and signatures.
+
 Once uploaded, log in https://repository.apache.org/ with your preferred web browser (use your Apache ID).

 You should find there an __open__ repository with the name of the form `orgapacheant-XXXX`. It should contain the Maven artifacts: the pom, the jar, the sources, the javadocs and the sha and asc files.
@ -164,13 +169,13 @@ Subject: [VOTE] Ivy ${version} Release

 I have built a release candidate for Ivy ${version}

-The svn tag of this release is: https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=tag;h=refs/tags/${version}
+The git tag of this release is: https://gitbox.apache.org/repos/asf?p=ant-ivy.git;a=tag;h=refs/tags/${version} with the sha1 ${githash-of-tag}

 The artifacts has been published to: https://dist.apache.org/repos/dist/dev/ant/ivy/${version} at revision ${svn-rev-of-the-check-in}

 The staging Maven repository is available there: https://repository.apache.org/content/repositories/orgapacheant-XXXX

-The Eclipse updatesite has been build there: https://dist.apache.org/repos/dist/dev/ant/ivyde/updatesite/ivy-2.0.0.beta1_20141213170938/
+The Eclipse updatesite has been build there: https://dist.apache.org/repos/dist/dev/ant/ivyde/updatesite/ivy-${version}/

 Do you vote for the release of these binaries?

@ -215,19 +220,11 @@ The just release documentation should be added to the site. To do so, you need t
 }
 ----

-. generate the part of the site for the new version:
+. from the distribution just released, install the doc into the site
 +
 [source, shell]
 ----
-ant checkout-history -Dhistory.version=2.0.0-beta1
-ant generate-history -Dhistory.version=2.0.0-beta1
----
-
-. if the 'latest-milestone' needs to be update too, run:
-+
-[source,shell]
----
-ant checkout-history -Dhistory.version=2.0.0-beta1 -Dtarget.history.folder=latest-milestone
+ant install-doc -Dhistory.version=2.5.0-rc1 -Divy-dist.zip.url=https://dist.apache.org/repos/dist/release/ant/ivy/2.5.0-rc1/apache-ivy-2.5.0-rc1-bin.zip
 ----

 Now let's generate the website with the new toc:
@ -255,15 +252,59 @@ If the Eclipse update site has already been prepared to include that new Ivy rel

 Announce the release on the dev@ant.apache.org, ivy-user@ant.apache.org, user@ant.apache.org and announce@apache.org mailing lists. Note that announce@apache.org only accepts emails sent with an @apache.org address.

-==== 17. Update this doc
+Suggested template:
+
+[source]
+----
+Subject: [Announce] Release of Apache Ivy ${version}
+
+The Apache Ivy project is pleased to announce its ${version} release.
+
+Apache Ivy is a tool for managing (recording, tracking, resolving and
+reporting) project dependencies, characterized by flexibility,
+configurability, and tight integration with Apache Ant.
+
+Key features of this ${version} release are:
+
+XXXX INCLUDE THE PARAGRAPH FROM THE RELEASE NOTES XXXX
+
+XXXX SUGGESTED PARAGRAPH FOR RC
+As a release candidate version, we strongly encourage the use of this version for
+testing and validation. From now on, features are frozen until final ${version} version,
+only bug fixes will be applied before ${version}. If no outstanding bugs are reported
+with this release candidate, it will promoted to ${version} about three weeks after this
+release candidate.
+
+Issues should be reported to:
+https://issues.apache.org/jira/browse/IVY
+
+Download the release at:
+https://ant.apache.org/ivy/download.cgi
+
+More information can be found on the Ivy website:
+https://ant.apache.org/ivy/
+
+Regards,
+${me}
+----
+
+==== 17. Some Housekeeping
+
+- update `doap_Ivy.rdf` in this repository and add the release.
+- log in to https://reporter.apache.org/addrelease.html?ant and add the release information
+- mark the version as released and a newr elease version to Jira https://issues.apache.org/jira/projects/IVY?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page
+- update Ant's homepage and the news page to anounce the release
+- After a few days "svn rm" the older release artifacts from https://dist.apache.org/repos/dist/release/ant/ivy
+
+==== 18. Update this doc

 If you feel like anything is missing or misleading in this release doc, update it as soon as you encounter the problem.

-==== 18. Merge your modifications back to the master if necessary.
+==== 19. Merge your modifications back to the master if necessary.

 Modifications on the template files do not need to be merged, but if you had troubles during your release you may want to merge your fixes back to the trunk.

-==== 19. Prepare next release
+==== 20. Prepare next release

 In the master branch, update the file version.properties with the version of the next release so that anyone building from the trunk will obtain jar with the correct version number.

--- a/asciidoc/extend.adoc
+++ b/asciidoc/extend.adoc
@ -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
@ -37,6 +37,6 @@ If you still don't find what you need, then you'll have to develop your own plug

 All Ivy plug-ins use the same code patterns as Ant specific tasks for parameters. This means that if you want to have a `myattribute` of type `String`, you just have to declare a method called `setMyattribute(String val)` on your plug-in. The same applies to child tags, you just have to follow Ant specifications.

-All pluggable code in Ivy is located in the link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=tree;f=src/java/org/apache/ivy/plugins[org.apache.ivy.plugins] package. In each package you will find an interface that you must implement to provide a new plugin. We usually also provide an abstract class easing the implementation and making your code more independent of interface changes. We heavily recommend using these abstract classes as a base class.
+All pluggable code in Ivy is located in the link:https://gitbox.apache.org/repos/asf?p=ant-ivy.git;a=tree;f=src/java/org/apache/ivy/plugins[org.apache.ivy.plugins] package. In each package you will find an interface that you must implement to provide a new plugin. We usually also provide an abstract class easing the implementation and making your code more independent of interface changes. We heavily recommend using these abstract classes as a base class.

 To understand how your implementation can be done, we suggest looking at existing implementations we provide, it's the best way to get started.
--- a/asciidoc/images/ant-project-logo.svg
+++ b/asciidoc/images/ant-project-logo.svg
@ -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
--- a/asciidoc/images/apache-incubator.svg
+++ b/asciidoc/images/apache-incubator.svg
@ -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
--- a/asciidoc/images/group-logo.png
+++ b/asciidoc/images/group-logo.png
--- a/asciidoc/images/hibgraph.svg
+++ b/asciidoc/images/hibgraph.svg
@ -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
--- a/asciidoc/images/ivy-publish-fc.svg
+++ b/asciidoc/images/ivy-publish-fc.svg
@ -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
--- a/asciidoc/images/ivy-terminology.svg
+++ b/asciidoc/images/ivy-terminology.svg
@ -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
--- a/asciidoc/images/main-tasks.svg
+++ b/asciidoc/images/main-tasks.svg
@ -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
--- a/asciidoc/images/warning.svg
+++ b/asciidoc/images/warning.svg
@ -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
--- a/asciidoc/index.adoc
+++ b/asciidoc/index.adoc
@ -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
--- a/asciidoc/install.adoc
+++ b/asciidoc/install.adoc
@ -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
@ -54,7 +54,7 @@ If you want to use Ivy only in your Ant build scripts, and have an internet conn
 [source,xml]
 ----
 <project xmlns:ivy="antlib:org.apache.ivy.ant">
-    <property name="ivy.install.version" value="2.1.0-rc2"/>
+    <property name="ivy.install.version" value="2.5.0"/>
    <condition property="ivy.home" value="${env.IVY_HOME}">
      <isset property="env.IVY_HOME"/>
    </condition>
@ -85,4 +85,4 @@ If you want to use Ivy only in your Ant build scripts, and have an internet conn
 </project>
 ----

-Then the only thing to do is to add the init-ivy target in the depends attribute of your targets using Ivy, and add the ivy namespace to your build script. See the self contained link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/go-ivy/build.xml[go-ivy] example for details about this.
+Then the only thing to do is to add the init-ivy target in the depends attribute of your targets using Ivy, and add the ivy namespace to your build script. See the self contained link:https://gitbox.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/go-ivy/build.xml[go-ivy] example for details about this.
--- a/asciidoc/ivy.xsd
+++ b/asciidoc/ivy.xsd
@ -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
--- a/asciidoc/ivyfile.adoc
+++ b/asciidoc/ivyfile.adoc
@ -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
@ -47,6 +47,8 @@ For those familiar with XML schema, the schema used to validate Ivy files can be
 </ivy-module>
 ----

+Ivy expects to use the "no namespace" namespace, so you can't use an XML namespace to identify Ivy elements or attributes or use any namespace prefix for Ivy's built-in elements/attributes.
+
 == Dynamic and [[resolved]]resolved Ivy files

 A module descriptor (Ivy file) is needed both before and after the publication of each revision of the module. Depending on the case, a module descriptor can be either _dynamic_ or _resolved_.
--- a/asciidoc/ivyfile/artifact-conf.adoc
+++ b/asciidoc/ivyfile/artifact-conf.adoc
@ -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
--- a/asciidoc/ivyfile/artifact-exclude-conf.adoc
+++ b/asciidoc/ivyfile/artifact-exclude-conf.adoc
@ -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
--- a/asciidoc/ivyfile/artifact-exclude.adoc
+++ b/asciidoc/ivyfile/artifact-exclude.adoc
@ -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
--- a/asciidoc/ivyfile/artifact.adoc
+++ b/asciidoc/ivyfile/artifact.adoc
@ -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
--- a/asciidoc/ivyfile/conf.adoc
+++ b/asciidoc/ivyfile/conf.adoc
@ -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
--- a/asciidoc/ivyfile/configurations.adoc
+++ b/asciidoc/ivyfile/configurations.adoc
@ -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
--- a/asciidoc/ivyfile/conflict.adoc
+++ b/asciidoc/ivyfile/conflict.adoc
@ -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
--- a/asciidoc/ivyfile/conflicts.adoc
+++ b/asciidoc/ivyfile/conflicts.adoc
@ -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
--- a/asciidoc/ivyfile/dependencies.adoc
+++ b/asciidoc/ivyfile/dependencies.adoc
@ -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
--- a/asciidoc/ivyfile/dependency-artifact-conf.adoc
+++ b/asciidoc/ivyfile/dependency-artifact-conf.adoc
@ -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
--- a/asciidoc/ivyfile/dependency-artifact.adoc
+++ b/asciidoc/ivyfile/dependency-artifact.adoc
@ -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
--- a/asciidoc/ivyfile/dependency-conf.adoc
+++ b/asciidoc/ivyfile/dependency-conf.adoc
@ -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
--- a/asciidoc/ivyfile/dependency-include-conf.adoc
+++ b/asciidoc/ivyfile/dependency-include-conf.adoc
@ -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
--- a/asciidoc/ivyfile/dependency-include.adoc
+++ b/asciidoc/ivyfile/dependency-include.adoc
@ -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
--- a/asciidoc/ivyfile/dependency.adoc
+++ b/asciidoc/ivyfile/dependency.adoc
@ -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
--- a/asciidoc/ivyfile/description.adoc
+++ b/asciidoc/ivyfile/description.adoc
@ -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
--- a/asciidoc/ivyfile/exclude.adoc
+++ b/asciidoc/ivyfile/exclude.adoc
@ -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
--- a/asciidoc/ivyfile/extends.adoc
+++ b/asciidoc/ivyfile/extends.adoc
@ -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
--- a/asciidoc/ivyfile/include.adoc
+++ b/asciidoc/ivyfile/include.adoc
@ -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
--- a/asciidoc/ivyfile/info.adoc
+++ b/asciidoc/ivyfile/info.adoc
@ -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
--- a/asciidoc/ivyfile/ivyauthor.adoc
+++ b/asciidoc/ivyfile/ivyauthor.adoc
@ -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
--- a/asciidoc/ivyfile/license.adoc
+++ b/asciidoc/ivyfile/license.adoc
@ -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
--- a/asciidoc/ivyfile/manager.adoc
+++ b/asciidoc/ivyfile/manager.adoc
@ -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
--- a/asciidoc/ivyfile/mapped.adoc
+++ b/asciidoc/ivyfile/mapped.adoc
@ -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
--- a/asciidoc/ivyfile/override.adoc
+++ b/asciidoc/ivyfile/override.adoc
@ -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
--- a/asciidoc/ivyfile/publications.adoc
+++ b/asciidoc/ivyfile/publications.adoc
@ -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
--- a/asciidoc/ivyfile/repository.adoc
+++ b/asciidoc/ivyfile/repository.adoc
@ -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
--- a/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java
+++ b/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.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,
@ -15,26 +15,11 @@
 *  limitations under the License.
 *
 */
-package org.apache.ivy.util.url;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.net.URL;
-import java.util.List;
-
-import org.junit.Test;
-
-public class ArtifactoryListingTest {
-    // remote.test
-
-    @Test
-    public void testWicketListing() throws Exception {
-        ApacheURLLister lister = new ApacheURLLister();
-
-        List<URL> content = lister.listAll(new URL(
-                "http://repo.jfrog.org/artifactory/libs-releases-local/org/apache/wicket/wicket/"));
-        assertNotNull(content);
-        assertEquals(3, content.size());
+function highlightActiveMenuItem() {
+    var pageId = document.body.dataset.pageId;
+    if (pageId) {
+        var id = CSS.escape('xooki-' + pageId);
+        document.querySelector('#' + id + ' a')?.classList.add('active-menu-item');
    }
 }
--- a/asciidoc/moreexamples.adoc
+++ b/asciidoc/moreexamples.adoc
@ -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
--- a/asciidoc/osgi.adoc
+++ b/asciidoc/osgi.adoc
@ -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
--- a/asciidoc/osgi/eclipse-plugin.adoc
+++ b/asciidoc/osgi/eclipse-plugin.adoc
@ -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
--- a/asciidoc/osgi/osgi-mapping.adoc
+++ b/asciidoc/osgi/osgi-mapping.adoc
@ -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
@ -155,7 +155,11 @@ If there is the OSGi `resolution` parameter specified to `optional`, then the de
 a|
 [source, xml]
 ----
-<dependency osgi="bundle" org="" name="com.acme.product.plugin" rev="[3.2.1,)" conf="default->default"/>
+<dependency osgi="bundle"
+            org=""
+            name="com.acme.product.plugin"
+            rev="[3.2.1,)"
+            conf="default->default"/>
 ----


@ -163,7 +167,10 @@ a|
 a|
 [source, xml]
 ----
-<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional"/>
+<dependency org="bundle"
+            name="com.acme.product.plugin"
+            rev="[3.2.1,)"
+            conf="optional->default;transitive-optional->transitive-optional"/>
 ----


@ -188,7 +195,10 @@ As it is an import package, the configuration of the dependency will be the `use
 a|
 [source, xml]
 ----
-<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="default->default;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils"/>
+<dependency org="package"
+            name="com.acme.product.plugin.utils"
+            rev="[3.2.1,)"
+            conf="default->default;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils"/>
 ----


@ -196,7 +206,10 @@ a|
 a|
 [source, xml]
 ----
-<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils"/>
+<dependency org="package"
+            name="com.acme.product.plugin.utils"
+            rev="[3.2.1,)"
+            conf="optional->default;transitive-optional->transitive-optional;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils"/>
 ----


--- a/asciidoc/osgi/sigil.adoc
+++ b/asciidoc/osgi/sigil.adoc
@ -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
--- a/asciidoc/osgi/standard-osgi.adoc
+++ b/asciidoc/osgi/standard-osgi.adoc
@ -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
--- a/Show More
+++ b/Show More