mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noël Rouvignac
04.07.2016 249dcc4890d220c7aeccb5b905d33da355cd0608
refs
author Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Monday, January 4, 2016 14:07 +0100
committer Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Tuesday, January 5, 2016 14:59 +0100
commit249dcc4890d220c7aeccb5b905d33da355cd0608
tree 5a11bf30f2be2574c948f477ff049aa94b1dfacd tree | zip | gz
parent 3c64e2dd5fdb72bbc12b99ac385d5f69438732b9 view | diff
OPENDJ-2583 Upgrade from 2.5.0 express to 3.0.0 does not work

This problem is a side effect of the git migration.
After the git migration, all revision numbers were removed from the upgrade tasks (commit 412ad6b800c1fbd15661110e21d836b888231cce).
However, in the case of upgrade from 2.5.0 Xpress1 to 3.0, the tasks labelled with 2.5.0,
and which had a SVN revision number less than the 2.5.0 Xpress1 SVN revision number (r8087),
are now not selected because 2.5.0 < 2.5.0.8087 .
The fix is to stop using the revision number during the comparison
and introduce a fake 2.5.1 version for all changes post 2.5.0 Xpress1 but before 2.6.0.
I am wondering if we should get rid of never released version numbers (2.5.1, 2.7.0) and replace them with actual released version numbers.

BuildVersion.java:
Now ignore the revision number, so

Upgrade.java:
Changed all post 2.5.0 Xpress1 changes to version 2.5.1.
2 files modified
44 ■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java 23 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java 21 ●●●●● diff | view | raw | blame | history