Skip to content

Commit 9555492

Browse files
rohityadavcloudrohityadavcloud
committed
Merge branch '4.9'
2 parents b175364 + e49ca1e commit 9555492

File tree

135 files changed

+308
-193
lines changed

Some content is hidden

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

135 files changed

+308
-193
lines changed

‎agent/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
26+
<version>4.10.0.0-SNAPSHOT</version>
2727
</parent>
2828
<dependencies>
2929
<dependency>

‎api/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
26+
<version>4.10.0.0-SNAPSHOT</version>
2727
</parent>
2828
<dependencies>
2929
<dependency>

‎client/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
20+
<version>4.10.0.0-SNAPSHOT</version>
2121
</parent>
2222

2323
<dependencies>

‎core/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
28+
<version>4.10.0.0-SNAPSHOT</version>
2929
</parent>
3030
<dependencies>
3131
<dependency>

‎debian/changelog

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cloudstack (4.10.0-SNAPSHOT) unstable; urgency=low
1+
cloudstack (4.10.0.0-SNAPSHOT) unstable; urgency=low
22

33
* Update the version to 4.10.0.snapshot
44

‎developer/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
21+
<version>4.10.0.0-SNAPSHOT</version>
2222
</parent>
2323
<dependencies>
2424
<dependency>

‎engine/api/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

‎engine/components-api/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
27+
<version>4.10.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

‎engine/network/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
27+
<version>4.10.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

‎engine/orchestration/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
27+
<version>4.10.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

‎engine/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.10.0-SNAPSHOT</version>
27+
<version>4.10.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<build>

‎engine/schema/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
27+
<version>4.10.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

‎engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java

+58-55
Large diffs are not rendered by default.

‎engine/schema/src/com/cloud/upgrade/dao/Upgrade490to491.java

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
package com.cloud.upgrade.dao;
19+
20+
import com.cloud.utils.exception.CloudRuntimeException;
21+
import com.cloud.utils.script.Script;
22+
import org.apache.log4j.Logger;
23+
24+
import java.io.File;
25+
import java.sql.Connection;
26+
27+
public class Upgrade490to491 implements DbUpgrade {
28+
final static Logger s_logger = Logger.getLogger(Upgrade490to491.class);
29+
30+
@Override
31+
public String[] getUpgradableVersionRange() {
32+
return new String[] {"4.9.0", "4.9.1"};
33+
}
34+
35+
@Override
36+
public String getUpgradedVersion() {
37+
return "4.9.1";
38+
}
39+
40+
@Override
41+
public boolean supportsRollingUpgrade() {
42+
return false;
43+
}
44+
45+
@Override
46+
public File[] getPrepareScripts() {
47+
String script = Script.findScript("", "db/schema-490to491.sql");
48+
if (script == null) {
49+
throw new CloudRuntimeException("Unable to find db/schema-490to491.sql");
50+
}
51+
return new File[] {new File(script)};
52+
}
53+
54+
@Override
55+
public void performDataMigration(Connection conn) {
56+
}
57+
58+
@Override
59+
public File[] getCleanupScripts() {
60+
String script = Script.findScript("", "db/schema-490to491-cleanup.sql");
61+
if (script == null) {
62+
throw new CloudRuntimeException("Unable to find db/schema-490to491-cleanup.sql");
63+
}
64+
return new File[] {new File(script)};
65+
}
66+
}

‎engine/schema/src/com/cloud/upgrade/dao/Upgrade490to4100.java renamed to ‎engine/schema/src/com/cloud/upgrade/dao/Upgrade491to4100.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import java.io.File;
2525
import java.sql.Connection;
2626

27-
public class Upgrade490to4100 implements DbUpgrade {
28-
final static Logger LOG = Logger.getLogger(Upgrade490to4100.class);
27+
public class Upgrade491to4100 implements DbUpgrade {
28+
final static Logger LOG = Logger.getLogger(Upgrade491to4100.class);
2929

3030
@Override
3131
public String[] getUpgradableVersionRange() {
32-
return new String[] {"4.9.0", "4.10.0"};
32+
return new String[] {"4.9.1", "4.10.0"};
3333
}
3434

3535
@Override
@@ -44,9 +44,9 @@ public boolean supportsRollingUpgrade() {
4444

4545
@Override
4646
public File[] getPrepareScripts() {
47-
String script = Script.findScript("", "db/schema-490to4100.sql");
47+
String script = Script.findScript("", "db/schema-491to4100.sql");
4848
if (script == null) {
49-
throw new CloudRuntimeException("Unable to find db/schema-490to4100.sql");
49+
throw new CloudRuntimeException("Unable to find db/schema-491to4100.sql");
5050
}
5151
return new File[] {new File(script)};
5252
}
@@ -57,9 +57,9 @@ public void performDataMigration(Connection conn) {
5757

5858
@Override
5959
public File[] getCleanupScripts() {
60-
String script = Script.findScript("", "db/schema-490to4100-cleanup.sql");
60+
String script = Script.findScript("", "db/schema-491to4100-cleanup.sql");
6161
if (script == null) {
62-
throw new CloudRuntimeException("Unable to find db/schema-490to4100-cleanup.sql");
62+
throw new CloudRuntimeException("Unable to find db/schema-491to4100-cleanup.sql");
6363
}
6464
return new File[] {new File(script)};
6565
}

‎engine/service/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cloudstack</groupId>
2525
<artifactId>cloud-engine</artifactId>
26-
<version>4.10.0-SNAPSHOT</version>
26+
<version>4.10.0.0-SNAPSHOT</version>
2727
</parent>
2828
<artifactId>cloud-engine-service</artifactId>
2929
<packaging>war</packaging>

‎engine/storage/cache/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.apache.cloudstack</groupId>
1717
<artifactId>cloud-engine</artifactId>
18-
<version>4.10.0-SNAPSHOT</version>
18+
<version>4.10.0.0-SNAPSHOT</version>
1919
<relativePath>../../pom.xml</relativePath>
2020
</parent>
2121
<dependencies>

‎engine/storage/datamotion/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

‎engine/storage/image/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

‎engine/storage/integration-test/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

‎engine/storage/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

‎engine/storage/snapshot/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

‎engine/storage/volume/pom.xml

+1-1
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.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

‎framework/cluster/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.apache.cloudstack</groupId>
1717
<artifactId>cloudstack-framework</artifactId>
18-
<version>4.10.0-SNAPSHOT</version>
18+
<version>4.10.0.0-SNAPSHOT</version>
1919
<relativePath>../pom.xml</relativePath>
2020
</parent>
2121
<dependencies>

‎framework/config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.apache.cloudstack</groupId>
1717
<artifactId>cloudstack-framework</artifactId>
18-
<version>4.10.0-SNAPSHOT</version>
18+
<version>4.10.0.0-SNAPSHOT</version>
1919
<relativePath>../pom.xml</relativePath>
2020
</parent>
2121
<dependencies>

‎framework/db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.apache.cloudstack</groupId>
1717
<artifactId>cloudstack-framework</artifactId>
18-
<version>4.10.0-SNAPSHOT</version>
18+
<version>4.10.0.0-SNAPSHOT</version>
1919
<relativePath>../pom.xml</relativePath>
2020
</parent>
2121
<dependencies>

‎framework/events/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.apache.cloudstack</groupId>
1717
<artifactId>cloudstack-framework</artifactId>
18-
<version>4.10.0-SNAPSHOT</version>
18+
<version>4.10.0.0-SNAPSHOT</version>
1919
<relativePath>../pom.xml</relativePath>
2020
</parent>
2121
<dependencies>

‎framework/ipc/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.apache.cloudstack</groupId>
1818
<artifactId>cloudstack-framework</artifactId>
19-
<version>4.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

‎framework/jobs/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cloudstack</groupId>
2525
<artifactId>cloudstack-framework</artifactId>
26-
<version>4.10.0-SNAPSHOT</version>
26+
<version>4.10.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<dependencies>

‎framework/managed-context/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloud-maven-standard</artifactId>
27-
<version>4.10.0-SNAPSHOT</version>
27+
<version>4.10.0.0-SNAPSHOT</version>
2828
<relativePath>../../maven-standard/pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

‎framework/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.10.0-SNAPSHOT</version>
27+
<version>4.10.0.0-SNAPSHOT</version>
2828
</parent>
2929
<build>
3030
<defaultGoal>install</defaultGoal>

‎framework/quota/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cloudstack</groupId>
2525
<artifactId>cloudstack-framework</artifactId>
26-
<version>4.10.0-SNAPSHOT</version>
26+
<version>4.10.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<dependencies>

‎framework/rest/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.cloudstack</groupId>
2424
<artifactId>cloudstack-framework</artifactId>
25-
<version>4.10.0-SNAPSHOT</version>
25+
<version>4.10.0.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>cloud-framework-rest</artifactId>

‎framework/security/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cloudstack</groupId>
2525
<artifactId>cloudstack-framework</artifactId>
26-
<version>4.10.0-SNAPSHOT</version>
26+
<version>4.10.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<dependencies>

‎framework/spring/lifecycle/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.apache.cloudstack</groupId>
1818
<artifactId>cloud-maven-standard</artifactId>
19-
<version>4.10.0-SNAPSHOT</version>
19+
<version>4.10.0.0-SNAPSHOT</version>
2020
<relativePath>../../../maven-standard/pom.xml</relativePath>
2121
</parent>
2222
<dependencies>

0 commit comments

Comments
 (0)