This is an automated email from the ASF dual-hosted git repository.
maartenc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-ivy.git
The following commit(s) were added to refs/heads/master by this push:
new a26e706d Prepare for next development iteration
a26e706d is described below
commit a26e706dbdacc2b672bbf16cfde388d604045147
Author: Maarten Coene <[email protected]>
AuthorDate: Tue Jan 7 16:42:06 2025 +0100
Prepare for next development iteration
---
NOTICE | 2 +-
asciidoc/release-notes.adoc | 11 +++--------
ivy.xml | 2 +-
version.properties | 6 +++---
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/NOTICE b/NOTICE
index 0648b817..ca421a2c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Ivy (TM)
-Copyright 2007-2024 The Apache Software Foundation
+Copyright 2007-2025 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index c03bc31b..8bd55271 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -19,7 +19,7 @@
= Ivy Release Announcement
-December 23 2024 - The Apache Ivy project is pleased to announce its 2.5.3
release.
+XXXX Date XXXX - 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,18 +34,13 @@ More information about the project can be found on the
website link:https://ant.
== Key features in this release
-This 2.5.3 release is a bugfix release, no new features have been added.
+Key features of this 2.5.2 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.5.2:*
-
-- FIX: trying to set safe XML features causes SAXExceptions when used with
certain XML parsers (jira:IVY-1647[])
-- FIX: some unit tests failed on Java 8 (jira:IVY-1648[]) (Thanks to Adrien
Piquerez)
-- FIX: cached Ivy files were not valid in some scenarios (jira:IVY-1649[],
jira:IVY-1650[]) (Thanks to Moritz Baumann)
-- DOCUMENTATION: improved to the documentation regarding the use of patterns
in the resolvers and retrieve task (jira:IVY-1651[]) (Thanks to Lewis John
McGibbney)
+*List of changes since Ivy 2.6.0:*
////
Samples :
diff --git a/ivy.xml b/ivy.xml
index 47a21578..c3dac27e 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -21,7 +21,7 @@
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="org.apache.ivy"
module="ivy"
- status="release">
+ status="integration">
<description homepage="http://ant.apache.org/ivy/">
Apache Ivy is a tool for managing (recording, tracking, resolving and
reporting) project dependencies.
</description>
diff --git a/version.properties b/version.properties
index ac377bec..57a04932 100644
--- a/version.properties
+++ b/version.properties
@@ -16,13 +16,13 @@
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
-target.ivy.version=2.5.3
+target.ivy.version=2.6.0
# Following OSGi spec: have to be 3 numbers separated by dots
-target.ivy.bundle.version=2.5.3
+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=final_
+target.ivy.bundle.version.qualifier=alpha_
# Versions of dependencies