Skip to content

Commit f4ae87c

Browse files
committed
Merge pull request apache#1654 from shapeblue/jsb/4.8.2.0-version
Updating pom.xml version numbers for release 4.8.2.0-SNAPSHOTOften, patch and security releases do not require schema migrations or data migrations. However, if an empty upgrade class and associated scripts are not defined, the upgrade process will break. With this change, if a release does not have an upgrade, a noop DbUpgrade is added to the upgrade path. This approach allows the upgrade to proceed and for the database to properly reflect the installed version. This change should make the release process simpler as RMs no longer need to rememeber to create this boilerplate code when starting a new release. Beginning with the 4.8.2.0 and 4.9.1.0 releases, the project will formally adopt a four (4) position release number to properly accomodate rekeases that contain only CVE fixes. The DatabaseUpgradeChecker and Version classes made assumptions that they would always parse and compare three (3) position version numbers. This change adds the CloudStackVersion value object that supports both three (3) and four (4) version numbers. It encapsulates version comparsion logic, as well as, the rules to allow three (3) and four (4) to interoperate. * Modifies DatabaseUpgradeChecker to handle derive an upgrade path for a version that was not explicitly specified. It determines the releases the first release before it with database migrations and uses that list as the basis for the list for version being calculated. A noop upgrade is then added to the list which causes no schema changes or data migrations, but will update the database to the version. * Adds unit tests for the upgrade path calculation logic in DatabaseUpgradeChecker * Removes dummy upgrade logic for the 4.8.2.0 introduced in previous versions of this patch * Introduces the CloudStackVersion value object which parses and compares three (3) and four (4) position version numbers. This class is intended to replace com.cloud.maint.Version. * Adds the junit-dataprovider dependency -- allowing test data to be concisely generated separately from the execution of a test case. Used extensively in the CloudStackVersionTest. Signed-off-by: John Burwell <meaux@cockamamy.net> /cc @rhtyd @karuturi * pr/1654: Adds support for four position versions and optional db upgrades Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2 parents 19f159a + 8d11511 commit f4ae87c

File tree

131 files changed

+895
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+895
-288
lines changed

agent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cloudstack</groupId>
2525
<artifactId>cloudstack</artifactId>
26-
<version>4.8.2-SNAPSHOT</version>
26+
<version>4.8.2.0-SNAPSHOT</version>
2727
</parent>
2828
<dependencies>
2929
<dependency>

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cloudstack</groupId>
2525
<artifactId>cloudstack</artifactId>
26-
<version>4.8.2-SNAPSHOT</version>
26+
<version>4.8.2.0-SNAPSHOT</version>
2727
</parent>
2828
<dependencies>
2929
<dependency>

client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>org.apache.cloudstack</groupId>
1919
<artifactId>cloudstack</artifactId>
20-
<version>4.8.2-SNAPSHOT</version>
20+
<version>4.8.2.0-SNAPSHOT</version>
2121
</parent>
2222

2323
<dependencies>

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.apache.cloudstack</groupId>
2727
<artifactId>cloudstack</artifactId>
28-
<version>4.8.2-SNAPSHOT</version>
28+
<version>4.8.2.0-SNAPSHOT</version>
2929
</parent>
3030
<dependencies>
3131
<dependency>

debian/changelog

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
cloudstack (4.8.2-SNAPSHOT) unstable; urgency=low
1+
cloudstack (4.8.2.0-SNAPSHOT) unstable; urgency=low
22

3-
* Update the version to 4.8.2-SNAPSHOT
3+
* Update the version to 4.8.2.0-SNAPSHOT
44

55
-- the Apache CloudStack project <dev@cloudstack.apache.org> Mon, 08 Aug 2016 10:06:20 -0400
66

7-
cloudstack (4.8.2-SNAPSHOT-SNAPSHOT) unstable; urgency=low
7+
cloudstack (4.8.2.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low
88

99
[ Remi Bergsma ]
10-
* Update the version to 4.8.2-SNAPSHOT-SNAPSHOT
10+
* Update the version to 4.8.2.0-SNAPSHOT-SNAPSHOT
1111

1212
-- the Apache CloudStack project <dev@cloudstack.apache.org> Wed, 20 Jan 2016 23:43:35 +0100
1313

1414
cloudstack (4.8.0-SNAPSHOT) unstable; urgency=low
1515

1616
[ Remi Bergsma ]
17-
* Update the version to 4.8.2-SNAPSHOT.snapshot
17+
* Update the version to 4.8.2.0-SNAPSHOT.snapshot
1818

1919
-- the Apache CloudStack project <dev@cloudstack.apache.org> Sun, 21 Dec 2015 22:11:55 +0100
2020

developer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>org.apache.cloudstack</groupId>
2020
<artifactId>cloudstack</artifactId>
21-
<version>4.8.2-SNAPSHOT</version>
21+
<version>4.8.2.0-SNAPSHOT</version>
2222
</parent>
2323
<dependencies>
2424
<dependency>

engine/api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.apache.cloudstack</groupId>
1818
<artifactId>cloud-engine</artifactId>
19-
<version>4.8.2-SNAPSHOT</version>
19+
<version>4.8.2.0-SNAPSHOT</version>
2020
<relativePath>../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

engine/components-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloud-engine</artifactId>
27-
<version>4.8.2-SNAPSHOT</version>
27+
<version>4.8.2.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

engine/network/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloud-engine</artifactId>
27-
<version>4.8.2-SNAPSHOT</version>
27+
<version>4.8.2.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

engine/orchestration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloud-engine</artifactId>
27-
<version>4.8.2-SNAPSHOT</version>
27+
<version>4.8.2.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

0 commit comments

Comments
 (0)