This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ant-ivy.git
commit b73fc55a25cee58ef0a2bcc0d5fa75f0013028fa Merge: bead264c 2927c79f Author: Stefan Bodewig <[email protected]> AuthorDate: Wed Jul 15 17:27:11 2026 +0200 Merge tag 'rel/2.6.0' Tagging version 2.6.0 of Ivy # -----BEGIN PGP SIGNATURE----- # # iIkEABYKADEWIQRqkxYesZkOg0bnuisjc439fEDeQwUCalembRMcYm9kZXdpZ0Bh # cGFjaGUub3JnAAoJECNzjf18QN5DEZMA/jvWXUr1JjjazdAC84Vls/ASCncIzK6e # ACOpc/0RITPmAP49B9HwvdCzRb1zGLxPfjfAFQ8iBsfciVb3pCvOd3aPAg== # =sJGc # -----END PGP SIGNATURE----- # gpg: Signatur vom Mi 15 Jul 2026 17:25:33 CEST # gpg: mittels EDDSA-Schlüssel 6A93161EB1990E8346E7BA2B23738DFD7C40DE43 # gpg: Aussteller "[email protected]" # gpg: Korrekte Signatur von "Stefan Bodewig <[email protected]>" [ultimativ] asciidoc/release-notes.adoc | 28 ++++------------------ .../resolver/packager/PackagerCacheEntry.java | 4 ++-- version.properties | 4 ++-- 3 files changed, 8 insertions(+), 28 deletions(-) diff --cc asciidoc/release-notes.adoc index f3f6bd61,9bede4b8..f5006e0e --- a/asciidoc/release-notes.adoc +++ b/asciidoc/release-notes.adoc @@@ -19,7 -19,7 +19,7 @@@ = Ivy Release Announcement - XXXX Date XXXX - The Apache Ivy project is pleased to announce its 2.6.0 release. -15 July 2026 - The Apache Ivy project is pleased to announce its 2.6.0 release. ++XXXX Date XXXX - The Apache Ivy project is pleased to announce its 2.6.1 release. == What is Ivy? Apache Ivy is a tool for managing (recording, tracking, resolving and reporting) project dependencies, characterized by flexibility, @@@ -34,15 -34,15 +34,15 @@@ More information about the project can == Key features in this release --Key features of this 2.6.0 release are: ++Key features of this 2.6.1 release are: == List of Changes in this Release For details about the following changes, check our JIRA install at link:https://issues.apache.org/jira/browse/IVY[] --*List of changes since Ivy 2.6.0:* ++*List of changes since Ivy 2.6.1:* --Note, if you have resolved dependencies with version of Ivy prior to 2.6.0, you may need to remove your Ivy cache for some fixes to have any effect. ++Note, if you have resolved dependencies with version of Ivy prior to 2.6.1, you may need to remove your Ivy cache for some fixes to have any effect. //// Samples : @@@ -52,26 -52,27 +52,6 @@@ - DOCUMENTATION: bla bla bla (jira:IVY-1234[]) (Thanks to Jane Doe) //// --- NEW: added a new `nearest` conflict manager, which handles conflicts in the same way that Maven does. (IVY-813) (Thanks to Eric Milles) --- IMPROVEMENT: use Apache Commons Compress for pack200 handling to avoid issues on Java 14 and later. If pack200 is needed, make sure to add Apache Commons Compress to your classpath. (IVY-1652) --- IMPROVEMENT: `ivy:retrieve` and the 'post resolve tasks' now support the `override` child element. (IVY-1664) --- IMPROVEMENT: `ivy:makepom` will now add `override` elements of the `ivy.xml` to the `dependencyManagement` section of the -- generated pom. (IVY-1663) (Thanks to Eric Milles) --- IMPROVEMENT: `ivy:deliver` and `ivy:publish` now writes inherited dependencies first to preserve resolve order (IVY-1656) (Thanks to Eric Milles) --- IMPROVEMENT: `ModuleRevisionId.encodeToString` now returns a deterministic string that doesn't rely on a implmentation of `HashMap` (Thanks to Arnout Engelen) --- FIX: improved Maven dependencyManagement matching for dependencies with a non-default type or classifier (IVY-1654) (Thanks to Mark Kittisopikul) --- FIX: the `ivy:retrieve` task failed when the retrieve pattern contained some text in parentheses before the first token, for instance: `/jobs/lib (JDK 17)/[artifact].[ext]` (IVY-1660) --- FIX: when the `ivy:deliver` task is configured to replace dynamic revisions, it now replaces these revisions to the resolved revision before any conflict resolution was done, which was the original behavior before Ivy 2.3.0. --This way, the delivered ivy.xml can be used to have reproducible dependency resolution, especially when multiple configurations are used. --It also fixes issues where the dynamic revisions were replaced by versions from other configurations. (IVY-1485, IVY-1661) --- FIX: the `ivy:deliver` task didn't replace dynamic revision from inherited dependencies. (IVY-1410) (Thanks to Eric Milles) --- FIX: the `ivy:install` task didn't take the `from` resolver into account when resolving Maven parent modules or source/javadoc artifacts. (Thanks to Colin Chambers) --- FIX: the `ivy:checkdepsupdate` task could suggest a lesser version as update. (IVY-1665) (Thanks to Eric Milles) --- FIX: the `ivy:makepom` task no longer adds a dependency to the <dependencyManagement> section. (IVY-1667) (Thanks to Eric Milles) --- FIX: the `ivy:deliver` task didn't include XML namespaces from a parent ivy module when merging the descriptors. (IVY-1658) -- (Thanks to Eric Milles) --- FIX: the `ivy:checkdepsupdate` task no longer shows evicted versions. (IVY-1662) (Thanks to Eric Milles) -- FIX: CVE-2026-26032: Apache Ivy: PackagerResolver path traversal vulnerability -- == Committers and Contributors Here is the list of people who have contributed source code and documentation up to this release. Many thanks to all of them, and also to the whole IvyDE community contributing ideas and feedback, and promoting the use of Apache Ivy ! diff --cc version.properties index 699727af,491c47d2..65341c01 --- a/version.properties +++ b/version.properties @@@ -16,9 -16,9 +16,9 @@@ # * specific language governing permissions and limitations # * under the License. # *************************************************************** --target.ivy.version=2.6.0 ++target.ivy.version=2.6.1 # Following OSGi spec: have to be 3 numbers separated by dots --target.ivy.bundle.version=2.6.0 ++target.ivy.bundle.version=2.6.1 # in case we want to add a qualifier such as alpha, beta, etc... # if non empty, add a '_' at the end of the qualifier, so the version would look like 1.2.3.alpha_200901011200 # NB: be careful with naming, OSGi orders version alphabetically. Suggested values: alpha_, beta_, cr1_ (for RC-1), final_
