No, I'm not going to talk about the new stuff that's been added to master ;)
Rather, I'd like to point out that there are schemaSpecs with the same version
number that have different contents in master and in release-3.0.0, which is
going to cause problems and disasters once we release code based on master and
people will want to upgrade their release-3.0.0-based RHQs/JONs to that
version.
You can view the diff by issuing:
git diff origin/release-3.0.0..origin/master
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
I think that diff should only show additions at the very end of the file (i.e.
the new stuff in master) but unfortunately that's not the case.
I'm not sure if this is an exceptional case or how such differences were
handled in the past but I think this should be fixed before we make any more
releases from either branch. Obviously, this is going to break the upgrades
for people using the master dev builds, but they've been warned.. ;)
On the other hand all we need to care about is that everything up to 2.91
(which is the db version in release-3.0.0) matches between release-3.0.0 and
master even if the schemaSpec versions differ a bit.
Unfortunately I don't believe that is the case with version 2.88 in master
containing "stuff" that is not present in r3 at all and version 2.91 in r3
being 2.92 in master, which is going to cause errors during upgrade.
Bug
https://bugzilla.redhat.com/show_bug.cgi?id=655156 already deals with a
need to add an upgrade step to release-3.0.0 which I think is an ideal
opportunity to sync up the upgrade in r3 and master.
Obviously, we can only sync like this before we release master. After that,
things are going to get very messy if there is going to be another release
based on release-3.0.0 branch with a new db upgrade step, which is yet another
plus point for our migration to liquibase which, therefore, should happen
before we release master imho.
Cheers,
Lukas