mirror of https://github.com/apache/ant-ivy
Compare commits
No commits in common. "master" and "2.6.0-rc1" have entirely different histories.
33
LICENSE
33
LICENSE
|
|
@ -256,39 +256,6 @@ 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
|
||||
------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -95,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', '.xml', '.json'].include?(File.extname(f))
|
||||
`gpg --armor --output #{f}.asc --detach-sig #{f}` if File.file?(f) && ['.zip', '.gz', '.jar', '.pom'].include?(File.extname(f))
|
||||
end
|
||||
----
|
||||
|
||||
|
|
@ -129,8 +129,6 @@ 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.
|
||||
|
|
@ -288,23 +286,15 @@ 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
|
||||
==== 17. 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.
|
||||
|
||||
==== 19. Merge your modifications back to the master if necessary.
|
||||
==== 18. 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.
|
||||
|
||||
==== 20. Prepare next release
|
||||
==== 19. 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.
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
= Ivy Release Announcement
|
||||
|
||||
XXXX Date XXXX - The Apache Ivy project is pleased to announce its 2.6.1 release.
|
||||
15 July 2026 - The Apache Ivy project is pleased to announce its 2.6.0 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 @@ More information about the project can be found on the website link:https://ant.
|
|||
|
||||
== Key features in this release
|
||||
|
||||
Key features of this 2.6.1 release are:
|
||||
Key features of this 2.6.0 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.1:*
|
||||
*List of changes since Ivy 2.6.0:*
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
////
|
||||
Samples :
|
||||
|
|
@ -52,6 +52,27 @@ Note, if you have resolved dependencies with version of Ivy prior to 2.6.1, you
|
|||
- 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 !
|
||||
|
|
|
|||
|
|
@ -655,7 +655,7 @@
|
|||
</generate-tagsdoc>
|
||||
</target>
|
||||
|
||||
<target name="define-cyclonedx-components" if="jdk9+">
|
||||
<target name="define-cyclonedx-components">
|
||||
<ivy:cachepath organisation="org.apache.ant"
|
||||
module="ant-cyclonedx"
|
||||
revision="${ant-cyclonedx.version}"
|
||||
|
|
@ -698,6 +698,9 @@
|
|||
<externalReference
|
||||
type="VCS"
|
||||
url="https://gitbox.apache.org/repos/asf/ant-ivy.git"/>
|
||||
<externalReference
|
||||
type="BUILD_SYSTEM"
|
||||
url="https://ci-builds.apache.org/job/Ant/job/Ivy/"/>
|
||||
<externalReference
|
||||
type="ISSUE_TRACKER"
|
||||
url="http://issues.apache.org/jira/browse/IVY"/>
|
||||
|
|
@ -723,6 +726,9 @@
|
|||
<externalReference
|
||||
type="VCS"
|
||||
url="https://gitbox.apache.org/repos/asf/ant.git"/>
|
||||
<externalReference
|
||||
type="BUILD_SYSTEM"
|
||||
url="https://ci-builds.apache.org/job/Ant/"/>
|
||||
<externalReference
|
||||
type="ISSUE_TRACKER"
|
||||
url="https://bz.apache.org/bugzilla/buglist.cgi?product=Ant"/>
|
||||
|
|
@ -744,7 +750,7 @@
|
|||
</cdx:externalreferenceset>
|
||||
</target>
|
||||
|
||||
<target name="jar-sbom" depends="define-cyclonedx-components,jar" if="jdk9+">
|
||||
<target name="jar-sbom" depends="define-cyclonedx-components,jar">
|
||||
<cdx:componentbom
|
||||
bomName="ivy-${build.version}.cdx"
|
||||
outputdirectory="${artifacts.build.dir}/jars"
|
||||
|
|
@ -937,9 +943,7 @@
|
|||
</cdx:componentbom>
|
||||
</target>
|
||||
|
||||
<target name="prepare-distribution-sboms"
|
||||
depends="define-cyclonedx-components"
|
||||
if="jdk9+">
|
||||
<target name="prepare-distribution-sboms" depends="define-cyclonedx-components">
|
||||
<macrodef name="create-tarball-bom">
|
||||
<attribute name="binsrc"/>
|
||||
<attribute name="binarysource"/>
|
||||
|
|
@ -1012,14 +1016,12 @@
|
|||
</target>
|
||||
|
||||
<target name="src-tarball-sboms"
|
||||
depends="snapshot-src,prepare-distribution-sboms"
|
||||
if="jdk9+">
|
||||
depends="snapshot-src,prepare-distribution-sboms">
|
||||
<create-tarball-boms binsrc="src" binarysource="Source Distribution"/>
|
||||
</target>
|
||||
|
||||
<target name="bin-tarball-sboms"
|
||||
depends="snapshot-bin,prepare-distribution-sboms"
|
||||
if="jdk9+">
|
||||
depends="snapshot-bin,prepare-distribution-sboms">
|
||||
<create-tarball-boms binsrc="bin"
|
||||
binarysource="Binary Distribution">
|
||||
<component>
|
||||
|
|
|
|||
|
|
@ -24,10 +24,6 @@
|
|||
|
||||
<property name="final.name" value="ivy.jar"/>
|
||||
|
||||
<condition property="jdk9+">
|
||||
<javaversion atleast="9"/>
|
||||
</condition>
|
||||
|
||||
<target name="init-ivy-user-home" unless="ivy.use.local.home">
|
||||
<condition property="ivy.home" value="${env.IVY_HOME}">
|
||||
<isset property="env.IVY_HOME"/>
|
||||
|
|
|
|||
|
|
@ -34,13 +34,6 @@
|
|||
<download-page rdf:resource="http://ant.apache.org/ivy/download.cgi" />
|
||||
<programming-language>Java</programming-language>
|
||||
<category rdf:resource="http://projects.apache.org/category/build-management" />
|
||||
<release>
|
||||
<Version>
|
||||
<name>Apache Ivy 2.6.0</name>
|
||||
<created>2026-07-15</created>
|
||||
<revision>2.6.0</revision>
|
||||
</Version>
|
||||
</release>
|
||||
<release>
|
||||
<Version>
|
||||
<name>Apache Ivy 2.5.3</name>
|
||||
|
|
|
|||
10
ivy.xml
10
ivy.xml
|
|
@ -21,7 +21,7 @@
|
|||
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
|
||||
<info organisation="org.apache.ivy"
|
||||
module="ivy"
|
||||
status="integration">
|
||||
status="release">
|
||||
<description homepage="http://ant.apache.org/ivy/">
|
||||
Apache Ivy is a tool for managing (recording, tracking, resolving and reporting) project dependencies.
|
||||
</description>
|
||||
|
|
@ -47,13 +47,7 @@
|
|||
<dependencies>
|
||||
<dependency org="org.apache.ant" name="ant" rev="${apache-ant.version}" conf="default,ant"/>
|
||||
<dependency org="org.apache.httpcomponents" name="httpclient" rev="${httpclient.version}" conf="default,httpclient->runtime,master"/>
|
||||
<dependency org="org.apache.commons" name="commons-compress"
|
||||
rev="${commons-compress.version}"
|
||||
conf="default,pack200->default,optional">
|
||||
<exclude org="com.github.luben"/>
|
||||
<exclude org="org.brotli"/>
|
||||
<exclude org="org.tukaani"/>
|
||||
</dependency>
|
||||
<dependency org="org.apache.commons" name="commons-compress" rev="${commons-compress.version}" conf="default,pack200"/>
|
||||
<dependency org="org.apache.commons" name="commons-vfs2" rev="${commons-vfs2.version}" conf="default,vfs"/>
|
||||
<dependency org="oro" name="oro" rev="${oro.version}" conf="default,oro"/>
|
||||
<dependency org="com.jcraft" name="jsch" rev="${jsch.version}" conf="default,sftp"/>
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
# * specific language governing permissions and limitations
|
||||
# * under the License.
|
||||
# ***************************************************************
|
||||
target.ivy.version=2.6.1
|
||||
target.ivy.version=2.6.0
|
||||
# Following OSGi spec: have to be 3 numbers separated by dots
|
||||
target.ivy.bundle.version=2.6.1
|
||||
target.ivy.bundle.version=2.6.0
|
||||
# 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_
|
||||
target.ivy.bundle.version.qualifier=alpha_
|
||||
target.ivy.bundle.version.qualifier=final
|
||||
|
||||
|
||||
# Versions of dependencies
|
||||
|
|
|
|||
Loading…
Reference in New Issue