prepare for next development iteration
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index 653fa9a..7de155a 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -19,7 +19,7 @@
= Ivy Release Announcement
-August 20 2023 - The Apache Ivy project is pleased to announce its 2.5.2 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,17 +34,13 @@
== Key features in this release
-Key features of this 2.5.2 release are:
-
-- FIX: reading POMs may loose dependencies when multiple Maven
- dependencies only differ in `classifier` (jira:IVY-1642[])
-- Fixes a Security Vulnerability, see link:https://ant.apache.org/ivy/security.html[the scurity page] for details.
+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.5.1:*
+*List of changes since Ivy 2.5.2:*
////
Samples :
@@ -54,12 +50,6 @@
- DOCUMENTATION: bla bla bla (jira:IVY-1234[]) (Thanks to Jane Doe)
////
-- FIX: ivy:retrieve could fail because of a `NullPointerException` (jira:IVY-1641[])
-- FIX: reading POMs may loose dependencies when multiple Maven
- dependencies only differ in `classifier` (jira:IVY-1642[])
-- IMPROVEMENT: Upgrade Apache HttpClient to 4.5.13 (jira:IVY-1644[])
-- FIX: CVE-2022-46751: Apache Ivy Is Vulnerable to XML External Entity Injections
-
== 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 --git a/doap_Ivy.rdf b/doap_Ivy.rdf
index 21a5de3..2fe7b5f 100644
--- a/doap_Ivy.rdf
+++ b/doap_Ivy.rdf
@@ -36,6 +36,13 @@
<category rdf:resource="http://projects.apache.org/category/build-management" />
<release>
<Version>
+ <name>Apache Ivy 2.5.2</name>
+ <created>2023-08-20</created>
+ <revision>2.5.2</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
<name>Apache Ivy 2.5.1</name>
<created>2022-11-04</created>
<revision>2.5.1</revision>
diff --git a/ivy.xml b/ivy.xml
index 47a2157..c3dac27 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 f90a3e3..57a0493 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.2
+target.ivy.version=2.6.0
# Following OSGi spec: have to be 3 numbers separated by dots
-target.ivy.bundle.version=2.5.2
+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
